aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorDarin Minamoto <darinm223@gmail.com>2016-01-11 14:43:19 -0800
committerDarin Minamoto <darinm223@gmail.com>2016-01-13 19:23:45 -0800
commit374bd5be2718a867b5188ef5613edcf7352fedb3 (patch)
tree9659f5a193ec43c00d81626e0ee520d282f0618f /components/script
parentb26c7bd7ea92bdbf7cdcaa0e3d826a880b9cd0ca (diff)
downloadservo-374bd5be2718a867b5188ef5613edcf7352fedb3.tar.gz
servo-374bd5be2718a867b5188ef5613edcf7352fedb3.zip
Moving MouseButton from msg to script_traits
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/document.rs4
-rw-r--r--components/script/script_thread.rs5
2 files changed, 4 insertions, 5 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index d959452dfd2..0d1b9a9370b 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -82,13 +82,13 @@ use layout_interface::{HitTestResponse, MouseOverResponse};
use layout_interface::{LayoutChan, Msg, ReflowQueryType};
use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER};
use msg::constellation_msg::{ConstellationChan, Key, KeyModifiers, KeyState};
-use msg::constellation_msg::{MouseButton, PipelineId, SubpageId};
+use msg::constellation_msg::{PipelineId, SubpageId};
use net_traits::ControlMsg::{GetCookiesForUrl, SetCookiesForUrl};
use net_traits::CookieSource::NonHTTP;
use net_traits::{AsyncResponseTarget, PendingAsyncLoad};
use num::ToPrimitive;
use script_thread::{MainThreadScriptMsg, Runnable};
-use script_traits::{AnimationState, MouseEventType, MozBrowserEvent};
+use script_traits::{AnimationState, MouseButton, MouseEventType, MozBrowserEvent};
use script_traits::{ScriptMsg as ConstellationMsg, ScriptToCompositorMsg};
use script_traits::{TouchEventType, TouchId, UntrustedNodeAddress};
use std::ascii::AsciiExt;
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 1b42f35d716..c9b2d8c8687 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -64,8 +64,7 @@ use layout_interface::{self, LayoutChan, NewLayoutThreadInfo, ScriptLayoutChan};
use libc;
use mem::heap_size_of_self_and_children;
use msg::constellation_msg::{ConstellationChan, LoadData};
-use msg::constellation_msg::{MouseButton, PipelineId};
-use msg::constellation_msg::{PipelineNamespace};
+use msg::constellation_msg::{PipelineId, PipelineNamespace};
use msg::constellation_msg::{SubpageId, WindowSizeData};
use msg::webdriver_msg::WebDriverScriptCommand;
use net_traits::LoadData as NetLoadData;
@@ -81,7 +80,7 @@ use profile_traits::time::{self, ProfilerCategory, profile};
use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent};
use script_traits::CompositorEvent::{TouchEvent};
use script_traits::{CompositorEvent, ConstellationControlMsg, EventResult};
-use script_traits::{InitialScriptState, MouseEventType, MozBrowserEvent, NewLayoutInfo};
+use script_traits::{InitialScriptState, MouseButton, MouseEventType, MozBrowserEvent, NewLayoutInfo};
use script_traits::{LayoutMsg, OpaqueScriptLayoutChannel, ScriptMsg as ConstellationMsg};
use script_traits::{ScriptThreadFactory, ScriptToCompositorMsg, TimerEvent, TimerEventRequest, TimerSource};
use script_traits::{TouchEventType, TouchId};