diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-07 16:21:52 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-07 16:21:52 -0700 |
| commit | 19cb0fa9e457c18b36944c2691c7491ee6eb9cd2 (patch) | |
| tree | a4df65368ef07284257ce5267e5849d550c7f637 | |
| parent | cf616b90a236f88058dbad74b568b4d4379d2829 (diff) | |
| parent | 9be9fc776825cf7625d4c814711ca0e230283c23 (diff) | |
| download | servo-19cb0fa9e457c18b36944c2691c7491ee6eb9cd2.tar.gz servo-19cb0fa9e457c18b36944c2691c7491ee6eb9cd2.zip | |
auto merge of #4565 : michaelwu/servo/fix-gonk-20150107, r=larsbergstrom
| -rw-r--r-- | ports/gonk/Cargo.lock | 1 | ||||
| -rw-r--r-- | ports/gonk/src/lib.rs | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6be4f9e4535..7d646b2b8ec 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -645,6 +645,7 @@ dependencies = [ "cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", + "plugins 0.0.1", "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "task_info 0.0.1", diff --git a/ports/gonk/src/lib.rs b/ports/gonk/src/lib.rs index 468ae25938c..2d2f636445c 100644 --- a/ports/gonk/src/lib.rs +++ b/ports/gonk/src/lib.rs @@ -29,7 +29,9 @@ use compositing::windowing::{WindowEvent, WindowMethods}; #[cfg(not(test))] use compositing::{CompositorProxy, CompositorTask, Constellation}; #[cfg(not(test))] -use servo_msg::constellation_msg::{ConstellationChan, InitLoadUrlMsg}; +use servo_msg::constellation_msg::Msg as ConstellationMsg; +#[cfg(not(test))] +use servo_msg::constellation_msg::ConstellationChan; #[cfg(not(test))] use script::dom::bindings::codegen::RegisterBindings; @@ -119,7 +121,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static { }; let ConstellationChan(ref chan) = constellation_chan; - chan.send(InitLoadUrlMsg(url)); + chan.send(ConstellationMsg::InitLoadUrl(url)); } // Send the constallation Chan as the result |