mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Import msg as msg rather than servo_msg.
This commit is contained in:
parent
d1c8ed4359
commit
b2fcc2397e
40 changed files with 93 additions and 94 deletions
|
@ -16,7 +16,7 @@ use dom::window::{ScriptHelpers};
|
|||
use dom::element::Element;
|
||||
use dom::document::DocumentHelpers;
|
||||
use page::Page;
|
||||
use servo_msg::constellation_msg::PipelineId;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use script_task::get_page;
|
||||
|
||||
use std::sync::mpsc::Sender;
|
||||
|
|
|
@ -44,8 +44,8 @@ use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData};
|
|||
use net::image_cache_task::ImageCacheTask;
|
||||
use script_traits::ScriptControlChan;
|
||||
use script_traits::UntrustedNodeAddress;
|
||||
use servo_msg::compositor_msg::ScriptListener;
|
||||
use servo_msg::constellation_msg::ConstellationChan;
|
||||
use msg::compositor_msg::ScriptListener;
|
||||
use msg::constellation_msg::ConstellationChan;
|
||||
use util::smallvec::{SmallVec1, SmallVec};
|
||||
use util::str::{LengthOrPercentageOrAuto};
|
||||
use std::cell::{Cell, RefCell};
|
||||
|
|
|
@ -25,7 +25,7 @@ use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_n
|
|||
use hyper::method::Method;
|
||||
use hyper::header::common::ContentType;
|
||||
use hyper::mime;
|
||||
use servo_msg::constellation_msg::LoadData;
|
||||
use msg::constellation_msg::LoadData;
|
||||
use util::str::DOMString;
|
||||
use script_task::{ScriptChan, ScriptMsg};
|
||||
use std::ascii::OwnedAsciiExt;
|
||||
|
|
|
@ -23,9 +23,9 @@ use dom::virtualmethods::VirtualMethods;
|
|||
use dom::window::Window;
|
||||
use page::{IterablePage, Page};
|
||||
|
||||
use servo_msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
|
||||
use servo_msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
|
||||
use servo_msg::constellation_msg::Msg as ConstellationMsg;
|
||||
use msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
|
||||
use msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
|
||||
use msg::constellation_msg::Msg as ConstellationMsg;
|
||||
use util::str::DOMString;
|
||||
use string_cache::Atom;
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ use dom::bindings::utils::{Reflectable, reflect_dom_object};
|
|||
use dom::event::{Event, EventTypeId};
|
||||
use dom::uievent::UIEvent;
|
||||
use dom::window::Window;
|
||||
use servo_msg::constellation_msg;
|
||||
use msg::constellation_msg;
|
||||
use util::str::DOMString;
|
||||
|
||||
use std::borrow::ToOwned;
|
||||
|
|
|
@ -33,8 +33,8 @@ use script_task::ScriptMsg;
|
|||
use script_traits::ScriptControlChan;
|
||||
use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
|
||||
|
||||
use servo_msg::compositor_msg::ScriptListener;
|
||||
use servo_msg::constellation_msg::LoadData;
|
||||
use msg::compositor_msg::ScriptListener;
|
||||
use msg::constellation_msg::LoadData;
|
||||
use servo_net::image_cache_task::ImageCacheTask;
|
||||
use servo_net::storage_task::StorageTask;
|
||||
use util::str::{DOMString,HTML_SPACE_CHARACTERS};
|
||||
|
|
|
@ -11,7 +11,7 @@ use dom::node::LayoutDataRef;
|
|||
use geom::point::Point2D;
|
||||
use geom::rect::Rect;
|
||||
use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel, UntrustedNodeAddress};
|
||||
use servo_msg::constellation_msg::{PipelineExitType, WindowSizeData};
|
||||
use msg::constellation_msg::{PipelineExitType, WindowSizeData};
|
||||
use util::geometry::Au;
|
||||
use std::any::Any;
|
||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||
|
|
|
@ -36,7 +36,6 @@ extern crate "net" as servo_net;
|
|||
extern crate util;
|
||||
#[macro_use]
|
||||
extern crate style;
|
||||
extern crate "msg" as servo_msg;
|
||||
extern crate url;
|
||||
extern crate uuid;
|
||||
extern crate string_cache;
|
||||
|
|
|
@ -22,9 +22,9 @@ use script_traits::{UntrustedNodeAddress, ScriptControlChan};
|
|||
|
||||
use geom::{Point2D, Rect, Size2D};
|
||||
use js::rust::Cx;
|
||||
use servo_msg::compositor_msg::ScriptListener;
|
||||
use servo_msg::constellation_msg::{ConstellationChan, WindowSizeData};
|
||||
use servo_msg::constellation_msg::{PipelineId, SubpageId};
|
||||
use msg::compositor_msg::ScriptListener;
|
||||
use msg::constellation_msg::{ConstellationChan, WindowSizeData};
|
||||
use msg::constellation_msg::{PipelineId, SubpageId};
|
||||
use servo_net::resource_task::ResourceTask;
|
||||
use servo_net::storage_task::StorageTask;
|
||||
use util::geometry::{Au, MAX_RECT};
|
||||
|
|
|
@ -51,14 +51,14 @@ use script_traits::CompositorEvent::{MouseMoveEvent, KeyEvent};
|
|||
use script_traits::{NewLayoutInfo, OpaqueScriptLayoutChannel};
|
||||
use script_traits::{ConstellationControlMsg, ScriptControlChan};
|
||||
use script_traits::ScriptTaskFactory;
|
||||
use servo_msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
|
||||
use servo_msg::compositor_msg::{LayerId, ScriptListener};
|
||||
use servo_msg::constellation_msg::{ConstellationChan};
|
||||
use servo_msg::constellation_msg::{LoadData, NavigationDirection, PipelineId, SubpageId};
|
||||
use servo_msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
|
||||
use servo_msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
|
||||
use servo_msg::constellation_msg::{PipelineExitType};
|
||||
use servo_msg::constellation_msg::Msg as ConstellationMsg;
|
||||
use msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
|
||||
use msg::compositor_msg::{LayerId, ScriptListener};
|
||||
use msg::constellation_msg::{ConstellationChan};
|
||||
use msg::constellation_msg::{LoadData, NavigationDirection, PipelineId, SubpageId};
|
||||
use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
|
||||
use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
|
||||
use msg::constellation_msg::{PipelineExitType};
|
||||
use msg::constellation_msg::Msg as ConstellationMsg;
|
||||
use servo_net::image_cache_task::ImageCacheTask;
|
||||
use servo_net::resource_task::{ResourceTask, ControlMsg};
|
||||
use servo_net::resource_task::LoadData as NetLoadData;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue