diff options
| author | Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com> | 2015-04-29 19:54:22 +0530 |
|---|---|---|
| committer | Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com> | 2015-04-30 01:22:16 +0530 |
| commit | b980278d900ae8dea9bb33d00b73502046106d0c (patch) | |
| tree | 1bd5e349eace660b05cf6102a59120c567c77676 /components/script | |
| parent | 5b0c6c9d31973aabdb820f16237e1a7c2a6524ad (diff) | |
| download | servo-b980278d900ae8dea9bb33d00b73502046106d0c.tar.gz servo-b980278d900ae8dea9bb33d00b73502046106d0c.zip | |
Uniformise the various Msg types [#5882]
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/document.rs | 8 | ||||
| -rw-r--r-- | components/script/script_task.rs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index ce1abc1cd89..a414f782012 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -481,7 +481,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { if focus_type == FocusType::Element { let window = self.window.root(); let ConstellationChan(ref chan) = window.r().constellation_chan(); - let event = ConstellationMsg::FocusMsg(window.r().pipeline()); + let event = ConstellationMsg::Focus(window.r().pipeline()); chan.send(event).unwrap(); } } @@ -769,9 +769,9 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { if let Some((containing_pipeline_id, subpage_id)) = window.r().parent_info() { let ConstellationChan(ref chan) = window.r().constellation_chan(); - let event = ConstellationMsg::MozBrowserEventMsg(containing_pipeline_id, - subpage_id, - event); + let event = ConstellationMsg::MozBrowserEvent(containing_pipeline_id, + subpage_id, + event); chan.send(event).unwrap(); } } diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 08020fb12de..6d408d2f10f 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -718,9 +718,9 @@ impl ScriptTask { self.handle_freeze_msg(pipeline_id), ConstellationControlMsg::Thaw(pipeline_id) => self.handle_thaw_msg(pipeline_id), - ConstellationControlMsg::MozBrowserEventMsg(parent_pipeline_id, - subpage_id, - event) => + ConstellationControlMsg::MozBrowserEvent(parent_pipeline_id, + subpage_id, + event) => self.handle_mozbrowser_event_msg(parent_pipeline_id, subpage_id, event), @@ -728,9 +728,9 @@ impl ScriptTask { old_subpage_id, new_subpage_id) => self.handle_update_subpage_id(containing_pipeline_id, old_subpage_id, new_subpage_id), - ConstellationControlMsg::FocusIFrameMsg(containing_pipeline_id, subpage_id) => + ConstellationControlMsg::FocusIFrame(containing_pipeline_id, subpage_id) => self.handle_focus_iframe_msg(containing_pipeline_id, subpage_id), - ConstellationControlMsg::WebDriverCommandMsg(pipeline_id, msg) => { + ConstellationControlMsg::WebDriverCommand(pipeline_id, msg) => { self.handle_webdriver_msg(pipeline_id, msg); } } |