aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-19 04:39:20 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-19 04:39:20 +0530
commitacbe41305230a926458596444ca955eff063d9dd (patch)
tree770845f2968753b5b133579204555db6da4cbcd6 /components/script/dom/htmliframeelement.rs
parentd11442bdcccf4002cdb84e85fe726130047a2b07 (diff)
parent19294db6e5ffc9e85b4b628ef8dc6c72636c70a7 (diff)
downloadservo-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/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index edb45fbb14b..b3e62ef434b 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -25,7 +25,7 @@ use dom::window::Window;
use js::jsapi::{JSAutoCompartment, JSAutoRequest, RootedValue, JSContext, MutableHandleValue};
use js::jsval::{UndefinedValue, NullValue};
use msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
-use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::ScriptMsg as ConstellationMsg;
use msg::constellation_msg::{ConstellationChan, IframeLoadInfo, MozBrowserEvent};
use msg::constellation_msg::{NavigationDirection, PipelineId, SubpageId};
use page::IterablePage;