From 3cce77e3f2100bcfe9d0e0cedc528bc4742975fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Str=C3=BCbe?= Date: Tue, 8 Dec 2015 00:24:40 +0501 Subject: [PATCH] servo: Merge #8862 - Moved WorkerId type to devtools_traits (from fstr:move_workerid); r=Ms2ger Fixes #8846. Source-Repo: https://github.com/servo/servo Source-Revision: 02f4be9c9f82a6e03942977eece39d98dcaff839 --- servo/components/devtools/actors/worker.rs | 2 +- servo/components/devtools/lib.rs | 4 ++-- servo/components/devtools_traits/lib.rs | 5 ++++- servo/components/msg/constellation_msg.rs | 3 --- servo/components/script/dom/bindings/global.rs | 4 ++-- servo/components/script/dom/bindings/trace.rs | 3 ++- servo/components/script/dom/window.rs | 4 ++-- servo/components/script/dom/workerglobalscope.rs | 4 ++-- servo/components/script/script_task.rs | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/servo/components/devtools/actors/worker.rs b/servo/components/devtools/actors/worker.rs index 2be2719eefcd..5edb74521b20 100644 --- a/servo/components/devtools/actors/worker.rs +++ b/servo/components/devtools/actors/worker.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use actor::{Actor, ActorMessageStatus, ActorRegistry}; -use msg::constellation_msg::WorkerId; +use devtools_traits::WorkerId; use rustc_serialize::json; use std::net::TcpStream; diff --git a/servo/components/devtools/lib.rs b/servo/components/devtools/lib.rs index 22baef2e1e8c..5d1a34b52e93 100644 --- a/servo/components/devtools/lib.rs +++ b/servo/components/devtools/lib.rs @@ -44,9 +44,9 @@ use actors::timeline::TimelineActor; use actors::worker::WorkerActor; use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg}; use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo, LogLevel, NetworkEvent}; -use devtools_traits::{ScriptToDevtoolsControlMsg}; +use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use ipc_channel::ipc::IpcSender; -use msg::constellation_msg::{PipelineId, WorkerId}; +use msg::constellation_msg::PipelineId; use protocol::JsonPacketStream; use std::borrow::ToOwned; use std::cell::RefCell; diff --git a/servo/components/devtools_traits/lib.rs b/servo/components/devtools_traits/lib.rs index eb139b245444..9b43581b72a3 100644 --- a/servo/components/devtools_traits/lib.rs +++ b/servo/components/devtools_traits/lib.rs @@ -30,7 +30,7 @@ use hyper::header::Headers; use hyper::http::RawStatus; use hyper::method::Method; use ipc_channel::ipc::IpcSender; -use msg::constellation_msg::{PipelineId, WorkerId}; +use msg::constellation_msg::PipelineId; use rustc_serialize::{Decodable, Decoder}; use std::net::TcpStream; use time::Duration; @@ -319,3 +319,6 @@ impl PreciseTime { Duration::nanoseconds((later.0 - self.0) as i64) } } + +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize, HeapSizeOf)] +pub struct WorkerId(pub u32); diff --git a/servo/components/msg/constellation_msg.rs b/servo/components/msg/constellation_msg.rs index b0604e731bfb..139a77bc4fb8 100644 --- a/servo/components/msg/constellation_msg.rs +++ b/servo/components/msg/constellation_msg.rs @@ -450,9 +450,6 @@ pub enum NavigationDirection { #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] pub struct FrameId(pub u32); -#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize, HeapSizeOf)] -pub struct WorkerId(pub u32); - /// Each pipeline ID needs to be unique. However, it also needs to be possible to /// generate the pipeline ID from an iframe element (this simplifies a lot of other /// code that makes use of pipeline IDs). diff --git a/servo/components/script/dom/bindings/global.rs b/servo/components/script/dom/bindings/global.rs index 6f5bc6c58ef3..aaa37c5292c6 100644 --- a/servo/components/script/dom/bindings/global.rs +++ b/servo/components/script/dom/bindings/global.rs @@ -7,7 +7,7 @@ //! This module contains smart pointers to global scopes, to simplify writing //! code that works in workers as well as window scopes. -use devtools_traits::ScriptToDevtoolsControlMsg; +use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::conversions::root_from_object; use dom::bindings::js::{JS, Root}; @@ -19,7 +19,7 @@ use js::jsapi::GetGlobalForObjectCrossCompartment; use js::jsapi::{JSContext, JSObject, JS_GetClass, MutableHandleValue}; use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL}; use msg::constellation_msg::ScriptMsg as ConstellationMsg; -use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId}; +use msg::constellation_msg::{ConstellationChan, PipelineId}; use net_traits::ResourceTask; use profile_traits::mem; use script_task::{CommonScriptMsg, ScriptChan, ScriptPort, ScriptTask}; diff --git a/servo/components/script/dom/bindings/trace.rs b/servo/components/script/dom/bindings/trace.rs index e893f284978e..8c4a20d643ab 100644 --- a/servo/components/script/dom/bindings/trace.rs +++ b/servo/components/script/dom/bindings/trace.rs @@ -33,6 +33,7 @@ use canvas_traits::WebGLError; use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle}; use canvas_traits::{CompositionOrBlending, LineCapStyle, LineJoinStyle, RepetitionStyle}; use cssparser::RGBA; +use devtools_traits::WorkerId; use dom::bindings::js::{JS, Root}; use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::{Reflectable, Reflector}; @@ -54,7 +55,7 @@ use js::rust::Runtime; use layout_interface::{LayoutChan, LayoutRPC}; use libc; use msg::constellation_msg::{ConstellationChan, ScriptMsg}; -use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData, WorkerId}; +use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData}; use net_traits::Metadata; use net_traits::image::base::Image; use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask}; diff --git a/servo/components/script/dom/window.rs b/servo/components/script/dom/window.rs index e17d5dbeffb6..41201082e7f0 100644 --- a/servo/components/script/dom/window.rs +++ b/servo/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}; diff --git a/servo/components/script/dom/workerglobalscope.rs b/servo/components/script/dom/workerglobalscope.rs index 96a1786ff3c6..bef4f3547a1e 100644 --- a/servo/components/script/dom/workerglobalscope.rs +++ b/servo/components/script/dom/workerglobalscope.rs @@ -2,7 +2,7 @@ * 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/. */ -use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg}; +use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception}; @@ -21,7 +21,7 @@ use ipc_channel::ipc::IpcSender; use js::jsapi::{HandleValue, JSAutoRequest, JSContext}; use js::rust::Runtime; use msg::constellation_msg::ScriptMsg as ConstellationMsg; -use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId}; +use msg::constellation_msg::{ConstellationChan, PipelineId}; use net_traits::{ResourceTask, load_whole_resource}; use profile_traits::mem; use script_task::{CommonScriptMsg, ScriptChan, ScriptPort}; diff --git a/servo/components/script/script_task.rs b/servo/components/script/script_task.rs index bbc95b79a23f..f0ea6bd13546 100644 --- a/servo/components/script/script_task.rs +++ b/servo/components/script/script_task.rs @@ -18,8 +18,8 @@ //! loop. use devtools; -use devtools_traits::ScriptToDevtoolsControlMsg; use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo}; +use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use document_loader::DocumentLoader; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState}; @@ -66,7 +66,7 @@ use msg::constellation_msg::ScriptMsg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, LoadData}; use msg::constellation_msg::{MouseButton, MouseEventType, MozBrowserEvent, PipelineId}; use msg::constellation_msg::{PipelineNamespace}; -use msg::constellation_msg::{SubpageId, WindowSizeData, WorkerId}; +use msg::constellation_msg::{SubpageId, WindowSizeData}; use msg::webdriver_msg::WebDriverScriptCommand; use net_traits::LoadData as NetLoadData; use net_traits::image_cache_task::{ImageCacheChan, ImageCacheResult, ImageCacheTask};