diff options
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.lock | 5 | ||||
| -rw-r--r-- | components/servo/lib.rs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7f7d7a4226b..94b8ada8efd 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -648,7 +648,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#f59c04795c84b82e00fdbd694bed90c56fa6567a" +source = "git+https://github.com/servo/rust-mozjs#9509978ed1e767c6cbf3da1886ab618f3fa58585" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -821,7 +821,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#2c918d1fb803673f5e5aca230034f77e85455448" +source = "git+https://github.com/servo/mozjs#065c9a4268ae51288e946b9dbf1c233f1dcf5ca3" [[package]] name = "msg" @@ -1178,6 +1178,7 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", + "profile_traits 0.0.1", "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 6f45a17578f..9d3176a78d6 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -111,8 +111,8 @@ impl Browser { let constellation_chan = create_constellation(opts.clone(), compositor_proxy.clone_compositor_proxy(), time_profiler_chan.clone(), - devtools_chan, mem_profiler_chan.clone(), + devtools_chan, supports_clipboard); if let Some(port) = opts.webdriver_port { @@ -157,8 +157,8 @@ impl Browser { fn create_constellation(opts: opts::Opts, compositor_proxy: Box<CompositorProxy+Send>, time_profiler_chan: time::ProfilerChan, - devtools_chan: Option<Sender<devtools_traits::DevtoolsControlMsg>>, mem_profiler_chan: mem::ProfilerChan, + devtools_chan: Option<Sender<devtools_traits::DevtoolsControlMsg>>, supports_clipboard: bool) -> ConstellationChan { let resource_task = new_resource_task(opts.user_agent.clone(), devtools_chan.clone()); |