aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-12-08 00:53:40 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-12-08 00:53:40 +0530
commit02f4be9c9f82a6e03942977eece39d98dcaff839 (patch)
tree597979d884a7b1f5a6184f2ac8e75ca7d254ed65 /components/script/dom/window.rs
parent7fb5f3c976d29c0013735035fb6923ec1cc84377 (diff)
parentb81f712ce1d4029b11819b7d87d0ab6c0a67f041 (diff)
downloadservo-02f4be9c9f82a6e03942977eece39d98dcaff839.tar.gz
servo-02f4be9c9f82a6e03942977eece39d98dcaff839.zip
Auto merge of #8862 - fstr:move_workerid, r=Ms2ger
Moved WorkerId type to devtools_traits Fixes #8846. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8862) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index e17d5dbeffb..41201082e7f 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au;
-use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
+use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType, WorkerId};
use dom::bindings::callback::ExceptionHandling;
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
@@ -44,7 +44,7 @@ use layout_interface::{LayoutChan, LayoutRPC, Msg, Reflow, ReflowGoal, ReflowQue
use libc;
use msg::compositor_msg::{LayerId, ScriptToCompositorMsg};
use msg::constellation_msg::ScriptMsg as ConstellationMsg;
-use msg::constellation_msg::{ConstellationChan, LoadData, PipelineId, SubpageId, WindowSizeData, WorkerId};
+use msg::constellation_msg::{ConstellationChan, LoadData, PipelineId, SubpageId, WindowSizeData};
use msg::webdriver_msg::{WebDriverJSError, WebDriverJSResult};
use net_traits::ResourceTask;
use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask};