diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-21 00:30:03 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-21 00:30:03 +0530 |
commit | 62b11a28fa41d6665408844eb7b09d3479c4ea20 (patch) | |
tree | 9bf4133b3b7c6437b91917ba8da62cd026fde0f3 /components/script/dom/document.rs | |
parent | 95eabdb4dbdc00937eeea5b495002d5526217f93 (diff) | |
parent | 82f39d5a1cd58cb7261c7ad5b454e2981394da16 (diff) | |
download | servo-62b11a28fa41d6665408844eb7b09d3479c4ea20.tar.gz servo-62b11a28fa41d6665408844eb7b09d3479c4ea20.zip |
Auto merge of #9027 - vwvww:cmrf2, r=jdm
Moved ScriptToCompositorMsg enum and EventResult enum to script_traits
Moved ScriptToCompositorMsg enum and EventResult enum to script_traits
resolving issue #8835.
(Need to be checked)
Variants in ScriptToCompositorMsg enum and EventResult enum had no doc
comment. I found some with grep command and copied it, and others I
wrote some doc comments manually to pass the build system. It needs to
be checked whether the doc comment is proper or not.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9027)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r-- | components/script/dom/document.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 1d7c7c43eb3..d682188c461 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -80,7 +80,6 @@ use js::jsapi::{JSContext, JSObject, JSRuntime}; use layout_interface::{HitTestResponse, MouseOverResponse}; use layout_interface::{LayoutChan, Msg}; use layout_interface::{ReflowGoal, ReflowQueryType}; -use msg::compositor_msg::ScriptToCompositorMsg; use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER}; use msg::constellation_msg::{AnimationState, PipelineId}; use msg::constellation_msg::{ConstellationChan, Key, KeyModifiers, KeyState}; @@ -91,7 +90,8 @@ use net_traits::{AsyncResponseTarget, PendingAsyncLoad}; use num::ToPrimitive; use script_task::CSSError; use script_task::{MainThreadScriptMsg, Runnable}; -use script_traits::{ScriptMsg as ConstellationMsg, TouchEventType, TouchId, UntrustedNodeAddress}; +use script_traits::{ScriptMsg as ConstellationMsg, ScriptToCompositorMsg}; +use script_traits::{TouchEventType, TouchId, UntrustedNodeAddress}; use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::boxed::FnBox; |