Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove page and move functionality to browing context

Browse source 
Allow for adding history items

Fixed nested iframe test failure

Cleanup and small refactors

fixup
This commit is contained in:
Connor Brewster 2016-05-05 22:45:08 -06:00
parent 392135bd0c
commit cbc5ca65a8
9 changed files with 461 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/htmliframeelement.rs
View file

@ -36,7 +36,6 @@ use layout_interface::ReflowQueryType;
use msg::constellation_msg::{ConstellationChan, LoadData};
use msg::constellation_msg::{NavigationDirection, PipelineId, SubpageId};
use net_traits::response::HttpsState;
use page::IterablePage;
use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
use script_traits::{IFrameLoadInfo, MozBrowserEvent, ScriptMsg as ConstellationMsg};
use std::ascii::AsciiExt;
@ -418,11 +417,8 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
self.subpage_id.get().and_then(|subpage_id| {
let window = window_from_node(self);
let window = window.r();
let children = window.page().children.borrow();
children.iter().find(|page| {
let window = page.window();
window.subpage() == Some(subpage_id)
}).map(|page| page.window())
let browsing_context = window.browsing_context();
browsing_context.find_child_by_subpage(subpage_id)
})
}