aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-02-10 03:51:46 -0700
committerbors-servo <metajack+bors@gmail.com>2015-02-10 03:51:46 -0700
commit29d3b872de4abb693b75e71fc0b987c52b0fd1f6 (patch)
tree0acb53d9cf80f5d534b9903b395f45feb0baab53 /components/script/script_task.rs
parentd1c8ed4359c47cd047e5ca3edfa37e8692058644 (diff)
parentb2fcc2397e08d9daa4454ea942685e02dc73b000 (diff)
downloadservo-29d3b872de4abb693b75e71fc0b987c52b0fd1f6.tar.gz
servo-29d3b872de4abb693b75e71fc0b987c52b0fd1f6.zip
auto merge of #4886 : Ms2ger/servo/servo_msg, r=saneyuki
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 0f3f5c1b564..438fe67502d 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -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;