Move the remainder of layout_interface into script_layout_interface.

components/layout/layout_thread.rs

@@ -46,9 +46,9 @@ use query::process_offset_parent_query;
 use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request};
 use query::{process_node_geometry_request, process_node_layer_id_request, process_node_scroll_area_request};
 use query::{process_node_overflow_request, process_resolved_style_request, process_margin_style_query};
-use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType, ScriptReflow};
 use script::layout_wrapper::ServoLayoutNode;
 use script::reporter::CSSErrorReporter;
+use script_layout_interface::message::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType, ScriptReflow};
 use script_layout_interface::restyle_damage::{REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW, REFLOW};
 use script_layout_interface::rpc::{LayoutRPC, MarginStyleResponse, NodeOverflowResponse, OffsetParentResponse};
 use script_layout_interface::wrapper_traits::LayoutNode;

components/script/dom/document.rs

@@ -92,7 +92,6 @@ use html5ever::tree_builder::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
 use ipc_channel::ipc::{self, IpcSender};
 use js::jsapi::JS_GetRuntime;
 use js::jsapi::{JSContext, JSObject, JSRuntime};
-use layout_interface::{Msg, ReflowQueryType};
 use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER};
 use msg::constellation_msg::{Key, KeyModifiers, KeyState};
 use msg::constellation_msg::{PipelineId, ReferrerPolicy, SubpageId};
@@ -103,6 +102,7 @@ use net_traits::{AsyncResponseTarget, PendingAsyncLoad, IpcSend};
 use num_traits::ToPrimitive;
 use origin::Origin;
 use parse::{ParserRoot, ParserRef, MutNullableParserField};
+use script_layout_interface::message::{Msg, ReflowQueryType};
 use script_thread::{MainThreadScriptMsg, Runnable};
 use script_traits::UntrustedNodeAddress;
 use script_traits::{AnimationState, MouseButton, MouseEventType, MozBrowserEvent};

components/script/dom/htmliframeelement.rs

@@ -38,9 +38,9 @@ use dom::window::{ReflowReason, Window};
 use ipc_channel::ipc;
 use js::jsapi::{JSAutoCompartment, RootedValue, JSContext, MutableHandleValue};
 use js::jsval::{UndefinedValue, NullValue};
-use layout_interface::ReflowQueryType;
 use msg::constellation_msg::{FrameType, LoadData, NavigationDirection, PipelineId, SubpageId};
 use net_traits::response::HttpsState;
+use script_layout_interface::message::ReflowQueryType;
 use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
 use script_traits::{IFrameLoadInfo, MozBrowserEvent, ScriptMsg as ConstellationMsg};
 use std::cell::Cell;

components/script/dom/htmllinkelement.rs

@@ -25,9 +25,9 @@ use hyper::header::ContentType;
 use hyper::mime::{Mime, TopLevel, SubLevel};
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
-use layout_interface::Msg;
 use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError};
 use network_listener::{NetworkListener, PreInvoke};
+use script_layout_interface::message::Msg;
 use script_traits::{MozBrowserEvent, ScriptMsg as ConstellationMsg};
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;

components/script/dom/htmlstyleelement.rs

@@ -14,7 +14,7 @@ use dom::element::Element;
 use dom::htmlelement::HTMLElement;
 use dom::node::{ChildrenMutation, Node, document_from_node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
-use layout_interface::Msg;
+use script_layout_interface::message::Msg;
 use std::sync::Arc;
 use string_cache::Atom;
 use style::media_queries::parse_media_query_list;

components/script/dom/node.rs

@@ -56,11 +56,11 @@ use euclid::size::Size2D;
 use heapsize::{HeapSizeOf, heap_size_of};
 use html5ever::tree_builder::QuirksMode;
 use js::jsapi::{JSContext, JSObject, JSRuntime};
-use layout_interface::Msg;
 use libc::{self, c_void, uintptr_t};
 use msg::constellation_msg::PipelineId;
 use parse::html::parse_html_fragment;
 use ref_slice::ref_slice;
+use script_layout_interface::message::Msg;
 use script_layout_interface::{HTMLCanvasData, OpaqueStyleAndLayoutData};
 use script_layout_interface::{LayoutNodeType, LayoutElementType, TrustedNodeAddress};
 use script_traits::UntrustedNodeAddress;

components/script/dom/window.rs

@@ -42,7 +42,6 @@ use js::jsapi::{Evaluate2, HandleObject, HandleValue, JSAutoCompartment, JSConte
 use js::jsapi::{JS_GetRuntime, JS_GC, MutableHandleValue, SetWindowProxy};
 use js::rust::CompileOptionsWrapper;
 use js::rust::Runtime;
-use layout_interface::{Msg, Reflow, ReflowQueryType, ScriptReflow};
 use libc;
 use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, SubpageId};
 use msg::constellation_msg::{WindowSizeData, WindowSizeType};
@@ -59,6 +58,7 @@ use profile_traits::time::{ProfilerChan, TimerMetadataReflowType, profile};
 use reporter::CSSErrorReporter;
 use rustc_serialize::base64::{FromBase64, STANDARD, ToBase64};
 use script_layout_interface::TrustedNodeAddress;
+use script_layout_interface::message::{Msg, Reflow, ReflowQueryType, ScriptReflow};
 use script_layout_interface::rpc::{ContentBoxResponse, ContentBoxesResponse, LayoutRPC};
 use script_layout_interface::rpc::{MarginStyleResponse, ResolvedStyleResponse};
 use script_runtime::{ScriptChan, ScriptPort};

components/script/lib.rs

@@ -94,7 +94,6 @@ mod devtools;
 pub mod document_loader;
 #[macro_use]
 pub mod dom;
-pub mod layout_interface;
 pub mod layout_wrapper;
 mod mem;
 mod network_listener;

components/script/script_thread.rs

@@ -61,7 +61,6 @@ use js::jsapi::{JSAutoCompartment, JSContext, JS_SetWrapObjectCallbacks};
 use js::jsapi::{JSTracer, SetWindowProxyClass};
 use js::jsval::UndefinedValue;
 use js::rust::Runtime;
-use layout_interface::{self, NewLayoutThreadInfo, ReflowQueryType};
 use mem::heap_size_of_self_and_children;
 use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, PipelineNamespace};
 use msg::constellation_msg::{SubpageId, WindowSizeData, WindowSizeType};
@@ -77,6 +76,7 @@ use parse::html::{ParseContext, parse_html};
 use parse::xml::{self, parse_xml};
 use profile_traits::mem::{self, OpaqueSender, Report, ReportKind, ReportsChan};
 use profile_traits::time::{self, ProfilerCategory, profile};
+use script_layout_interface::message::{self, NewLayoutThreadInfo, ReflowQueryType};
 use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
 use script_runtime::{ScriptPort, StackRootTLS, new_rt_and_cx, get_reports};
 use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent};
@@ -135,7 +135,7 @@ struct InProgressLoad {
     /// The current window size associated with this pipeline.
     window_size: Option<WindowSizeData>,
     /// Channel to the layout thread associated with this pipeline.
-    layout_chan: Sender<layout_interface::Msg>,
+    layout_chan: Sender<message::Msg>,
     /// The current viewport clipping rectangle applying to this pipeline, if any.
     clip_rect: Option<Rect<f32>>,
     /// Window is frozen (navigated away while loading for example).
@@ -150,7 +150,7 @@ impl InProgressLoad {
     /// Create a new InProgressLoad object.
     fn new(id: PipelineId,
            parent_info: Option<(PipelineId, SubpageId, FrameType)>,
-           layout_chan: Sender<layout_interface::Msg>,
+           layout_chan: Sender<message::Msg>,
            window_size: Option<WindowSizeData>,
            url: Url) -> InProgressLoad {
         InProgressLoad {
@@ -438,11 +438,11 @@ impl<'a> Drop for ScriptMemoryFailsafe<'a> {
 }
 
 impl ScriptThreadFactory for ScriptThread {
-    type Message = layout_interface::Msg;
+    type Message = message::Msg;
 
     fn create(state: InitialScriptState,
               load_data: LoadData)
-              -> (Sender<layout_interface::Msg>, Receiver<layout_interface::Msg>) {
+              -> (Sender<message::Msg>, Receiver<message::Msg>) {
         let panic_chan = state.panic_chan.clone();
         let (script_chan, script_port) = channel();
 
@@ -1184,7 +1184,7 @@ impl ScriptThread {
 
         // Tell layout to actually spawn the thread.
         parent_window.layout_chan()
-                     .send(layout_interface::Msg::CreateLayoutThread(layout_creation_info))
+                     .send(message::Msg::CreateLayoutThread(layout_creation_info))
                      .unwrap();
 
         // Kick off the fetch for the new resource.
@@ -1462,10 +1462,10 @@ impl ScriptThread {
             // processed this message.
             let (response_chan, response_port) = channel();
             let chan = &load.layout_chan;
-            if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() {
+            if chan.send(message::Msg::PrepareToExit(response_chan)).is_ok() {
                 debug!("shutting down layout for page {:?}", id);
                 response_port.recv().unwrap();
-                chan.send(layout_interface::Msg::ExitNow).ok();
+                chan.send(message::Msg::ExitNow).ok();
             }
 
             let has_pending_loads = self.incomplete_loads.borrow().len() > 0;
@@ -1523,7 +1523,7 @@ impl ScriptThread {
         {
             // send the final url to the layout thread.
             incomplete.layout_chan
-                      .send(layout_interface::Msg::SetFinalUrl(final_url.clone()))
+                      .send(message::Msg::SetFinalUrl(final_url.clone()))
                       .unwrap();
 
             // update the pipeline url
@@ -2126,7 +2126,7 @@ fn shut_down_layout(context_tree: &BrowsingContext) {
         let (response_chan, response_port) = channel();
         let window = context.active_window();
         let chan = window.layout_chan().clone();
-        if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() {
+        if chan.send(message::Msg::PrepareToExit(response_chan)).is_ok() {
             channels.push(chan);
             response_port.recv().unwrap();
         }
@@ -2143,7 +2143,7 @@ fn shut_down_layout(context_tree: &BrowsingContext) {
 
     // Destroy the layout thread. If there were node leaks, layout will now crash safely.
     for chan in channels {
-        chan.send(layout_interface::Msg::ExitNow).ok();
+        chan.send(message::Msg::ExitNow).ok();
     }
 }
 

components/script_layout_interface/Cargo.toml

@@ -19,6 +19,8 @@ heapsize_plugin = "0.1.2"
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 libc = "0.2"
 msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+profile_traits = {path = "../profile_traits"}
 plugins = {path = "../plugins"}
 range = {path = "../range"}
 script_traits = {path = "../script_traits"}
@@ -26,3 +28,4 @@ selectors = {version = "0.6", features = ["heap_size"]}
 string_cache = {version = "0.2.20", features = ["heap_size"]}
 style = {path = "../style"}
 url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}

components/script_layout_interface/lib.rs

@@ -26,6 +26,8 @@ extern crate heapsize;
 extern crate ipc_channel;
 extern crate libc;
 extern crate msg;
+extern crate net_traits;
+extern crate profile_traits;
 extern crate range;
 extern crate script_traits;
 extern crate selectors;
@@ -33,7 +35,9 @@ extern crate selectors;
 extern crate string_cache;
 extern crate style;
 extern crate url;
+extern crate util;
 
+pub mod message;
 pub mod restyle_damage;
 pub mod rpc;
 pub mod wrapper_traits;

components/script_layout_interface/message.rs

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-//! The high-level interface from script to layout. Using this abstract
-//! interface helps reduce coupling between these two components, and enables
-//! the DOM to be placed in a separate crate from layout.
-
 use app_units::Au;
 use euclid::point::Point2D;
 use euclid::rect::Rect;
@@ -14,8 +10,7 @@ use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use msg::constellation_msg::{PanicMsg, PipelineId, WindowSizeData};
 use net_traits::image_cache_thread::ImageCacheThread;
 use profile_traits::mem::ReportsChan;
-use script_layout_interface::rpc::LayoutRPC;
+use rpc::LayoutRPC;
-use script_layout_interface::{OpaqueStyleAndLayoutData, TrustedNodeAddress};
 use script_traits::{ConstellationControlMsg, LayoutControlMsg};
 use script_traits::{LayoutMsg as ConstellationMsg, StackingContextScrollState};
 use std::sync::Arc;
@@ -26,6 +21,7 @@ use style::selector_impl::PseudoElement;
 use style::servo::Stylesheet;
 use url::Url;
 use util::ipc::OptionalOpaqueIpcSender;
+use {OpaqueStyleAndLayoutData, TrustedNodeAddress};
 
 /// Asynchronous messages that script can send to layout.
 pub enum Msg {

components/servo/Cargo.lock

@@ -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]]

components/servo/Cargo.toml

@@ -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"}

components/servo/lib.rs

@@ -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);
 }

ports/cef/Cargo.lock

@@ -1799,13 +1799,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]]
@@ -1915,6 +1918,7 @@ dependencies = [
  "profile 0.0.1",
  "profile_traits 0.0.1",
  "script 0.0.1",
+ "script_layout_interface 0.0.1",
  "script_traits 0.0.1",
  "style 0.0.1",
  "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",