diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-19 04:39:20 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-19 04:39:20 +0530 |
| commit | acbe41305230a926458596444ca955eff063d9dd (patch) | |
| tree | 770845f2968753b5b133579204555db6da4cbcd6 /components/script/dom/document.rs | |
| parent | d11442bdcccf4002cdb84e85fe726130047a2b07 (diff) | |
| parent | 19294db6e5ffc9e85b4b628ef8dc6c72636c70a7 (diff) | |
| download | servo-acbe41305230a926458596444ca955eff063d9dd.tar.gz servo-acbe41305230a926458596444ca955eff063d9dd.zip | |
Auto merge of #8530 - KiChjang:split-constellation-msg, r=jdm
Split ConstellationMsg into ScriptMsg and CompositorMsg
Fixes #8356.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8530)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
| -rw-r--r-- | components/script/dom/document.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c6ddc24280e..585b93f1912 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -80,7 +80,7 @@ use layout_interface::{LayoutChan, Msg}; use layout_interface::{ReflowGoal, ReflowQueryType}; use msg::compositor_msg::ScriptToCompositorMsg; use msg::constellation_msg::AnimationState; -use msg::constellation_msg::Msg as ConstellationMsg; +use msg::constellation_msg::ScriptMsg as ConstellationMsg; use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER}; use msg::constellation_msg::{ConstellationChan, FocusType, Key, KeyModifiers, KeyState, MozBrowserEvent, SubpageId}; use net_traits::ControlMsg::{GetCookiesForUrl, SetCookiesForUrl}; |