Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move the remainder of layout_interface into script_layout_interface.

Browse source
This commit is contained in:
Ms2ger 2016-06-16 12:28:43 +01:00
parent 2c50318ee7
commit 9e2e0ff98c
16 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/Cargo.lock generated
View file

@ -33,6 +33,7 @@ dependencies = [
"profile_tests 0.0.1",
"profile_traits 0.0.1",
"script 0.0.1",
"script_layout_interface 0.0.1",
"script_tests 0.0.1",
"script_traits 0.0.1",
"style 0.0.1",
@ -1941,13 +1942,16 @@ dependencies = [
"ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
"plugins 0.0.1",
"profile_traits 0.0.1",
"range 0.0.1",
"script_traits 0.0.1",
"selectors 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]

1
components/servo/Cargo.toml
View file

@ -43,6 +43,7 @@ compiletest_helper = {path = "../../tests/compiletest/helper"}
plugin_compiletest = {path = "../../tests/compiletest/plugin"}
[dependencies]
script_layout_interface = {path = "../script_layout_interface"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
webrender = {git = "https://github.com/servo/webrender"}
compositing = {path = "../compositing"}

5
components/servo/lib.rs
View file

@ -39,6 +39,7 @@ pub extern crate profile;
pub extern crate profile_traits;
pub extern crate script;
pub extern crate script_traits;
pub extern crate script_layout_interface;
pub extern crate style;
pub extern crate url;
pub extern crate util;
@ -229,7 +230,7 @@ fn create_constellation(opts: opts::Opts,
webrender_api_sender: webrender_api_sender,
};
let constellation_chan =
Constellation::<script::layout_interface::Msg,
Constellation::<script_layout_interface::message::Msg,
layout::layout_thread::LayoutThread,
script::script_thread::ScriptThread>::start(initial_state);
@ -263,7 +264,7 @@ pub fn run_content_process(token: String) {
script::init();
unprivileged_content.start_all::<script::layout_interface::Msg,
unprivileged_content.start_all::<script_layout_interface::message::Msg,
layout::layout_thread::LayoutThread,
script::script_thread::ScriptThread>(true);
}