diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-02-13 04:54:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 04:54:47 -0500 |
| commit | b1d3d6f6324394f0e9f17b027fef24420d829b5c (patch) | |
| tree | da12ad096ade09fd4f89ff2b243b4eff6b69a8a9 /components/script_traits/script_msg.rs | |
| parent | 9e64008e759a678a3971d04977c2b20b66fa8229 (diff) | |
| parent | ee25413c0fe13378e0de4b716915f572e7bbc32a (diff) | |
| download | servo-b1d3d6f6324394f0e9f17b027fef24420d829b5c.tar.gz servo-b1d3d6f6324394f0e9f17b027fef24420d829b5c.zip | |
Auto merge of #19975 - paulrouget:killbhtml, r=mbrubeck,emilio
Kill browserhtml
Fixes https://github.com/servo/servo/issues/19971
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19975)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/script_msg.rs')
| -rw-r--r-- | components/script_traits/script_msg.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 6ff47b5e004..524a87d039a 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -9,7 +9,6 @@ use IFrameLoadInfo; use IFrameLoadInfoWithData; use LayoutControlMsg; use LoadData; -use MozBrowserEvent; use WorkerGlobalScopeInit; use WorkerScriptLoadOrigin; use canvas_traits::canvas::CanvasMsg; @@ -17,7 +16,7 @@ use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use euclid::{Point2D, Size2D, TypedSize2D}; use gfx_traits::Epoch; use ipc_channel::ipc::{IpcReceiver, IpcSender}; -use msg::constellation_msg::{BrowsingContextId, FrameType, PipelineId, TraversalDirection}; +use msg::constellation_msg::{BrowsingContextId, PipelineId, TraversalDirection}; use msg::constellation_msg::{Key, KeyModifiers, KeyState}; use net_traits::CoreResourceMsg; use net_traits::request::RequestInit; @@ -89,7 +88,7 @@ pub enum ScriptMsg { /// Get the browsing context id for a given pipeline. GetBrowsingContextId(PipelineId, IpcSender<Option<BrowsingContextId>>), /// Get the parent info for a given pipeline. - GetParentInfo(PipelineId, IpcSender<Option<(PipelineId, FrameType)>>), + GetParentInfo(PipelineId, IpcSender<Option<PipelineId>>), /// <head> tag finished parsing HeadParsed, /// All pending loads are complete, and the `load` event for this pipeline @@ -102,8 +101,6 @@ pub enum ScriptMsg { AbortLoadUrl, /// Post a message to the currently active window of a given browsing context. PostMessage(BrowsingContextId, Option<ImmutableOrigin>, Vec<u8>), - /// Dispatch a mozbrowser event to the parent of a mozbrowser iframe. - MozBrowserEvent(PipelineId, MozBrowserEvent), /// HTMLIFrameElement Forward or Back traversal. TraverseHistory(TraversalDirection), /// Gets the length of the joint session history from the constellation. |