Skip to content

Commit

Permalink
Remove SetVisible message from iframe
Browse files Browse the repository at this point in the history
  • Loading branch information
AZWN committed Mar 12, 2019
1 parent b006913 commit 39c652e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 48 deletions.
35 changes: 0 additions & 35 deletions components/constellation/constellation.rs
Expand Up @@ -1322,9 +1322,6 @@ where
}
}
},
FromScriptMsg::SetVisible(is_visible) => {
self.handle_set_visible_msg(source_pipeline_id, is_visible);
},
FromScriptMsg::VisibilityChangeComplete(is_visible) => {
self.handle_visibility_change_complete(source_pipeline_id, is_visible);
},
Expand Down Expand Up @@ -3036,38 +3033,6 @@ where
result
}

fn handle_set_visible_msg(&mut self, pipeline_id: PipelineId, is_visible: bool) {
let browsing_context_id = match self.pipelines.get(&pipeline_id) {
Some(pipeline) => pipeline.browsing_context_id,
None => {
return warn!(
"No browsing context associated with pipeline {:?}",
pipeline_id
);
},
};

// TODO(mandreyel): can we make a mutable version of
// AllBrowsingContextsIterator to directly modify a browsing context
// without the need for this indirection?
let nested_ctx_ids: Vec<BrowsingContextId> = self
.all_descendant_browsing_contexts_iter(browsing_context_id)
.filter(|ctx| ctx.is_visible != is_visible)
.map(|ctx| ctx.id)
.collect();

for ctx_id in nested_ctx_ids {
if let Some(browsing_context) = self.browsing_contexts.get_mut(&ctx_id) {
browsing_context.is_visible = is_visible;
for pipeline_id in browsing_context.pipelines.iter() {
if let Some(pipeline) = self.pipelines.get_mut(&pipeline_id) {
pipeline.notify_visibility(is_visible);
}
}
}
}
}

fn handle_visibility_change_complete(&mut self, pipeline_id: PipelineId, visibility: bool) {
let browsing_context_id = match self.pipelines.get(&pipeline_id) {
Some(pipeline) => pipeline.browsing_context_id,
Expand Down
10 changes: 0 additions & 10 deletions components/script/dom/htmliframeelement.rs
Expand Up @@ -397,16 +397,6 @@ impl HTMLIFrameElement {
}
}

pub fn set_visible(&self, visible: bool) {
let msg = ScriptMsg::SetVisible(visible);
let window = window_from_node(self);
window
.upcast::<GlobalScope>()
.script_to_constellation_chan()
.send(msg)
.unwrap();
}

/// https://html.spec.whatwg.org/multipage/#iframe-load-event-steps steps 1-4
pub fn iframe_load_event_steps(&self, loaded_pipeline: PipelineId) {
// TODO(#9592): assert that the load blocker is present at all times when we
Expand Down
3 changes: 0 additions & 3 deletions components/script_traits/script_msg.rs
Expand Up @@ -175,8 +175,6 @@ pub enum ScriptMsg {
/// Notification that this iframe should be removed.
/// Returns a list of pipelines which were closed.
RemoveIFrame(BrowsingContextId, IpcSender<Vec<PipelineId>>),
/// Change pipeline visibility
SetVisible(bool),
/// Notifies constellation that an iframe's visibility has been changed.
VisibilityChangeComplete(bool),
/// A load has been requested in an IFrame.
Expand Down Expand Up @@ -243,7 +241,6 @@ impl fmt::Debug for ScriptMsg {
ReplaceHistoryState(..) => "ReplaceHistoryState",
JointSessionHistoryLength(..) => "JointSessionHistoryLength",
RemoveIFrame(..) => "RemoveIFrame",
SetVisible(..) => "SetVisible",
VisibilityChangeComplete(..) => "VisibilityChangeComplete",
ScriptLoadedURLInIFrame(..) => "ScriptLoadedURLInIFrame",
ScriptNewIFrame(..) => "ScriptNewIFrame",
Expand Down

0 comments on commit 39c652e

Please sign in to comment.