mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
auto merge of #4565 : michaelwu/servo/fix-gonk-20150107, r=larsbergstrom
This commit is contained in:
commit
19cb0fa9e4
2 changed files with 5 additions and 2 deletions
1
ports/gonk/Cargo.lock
generated
1
ports/gonk/Cargo.lock
generated
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue