Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement window.parent for iframes.

Browse source
This commit is contained in:
Glenn Watson 2015-02-03 12:52:18 +10:00
parent 7e3f504d94
commit 0873e5c8ca
11 changed files with 60 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/browsercontext.rs
View file

@ -33,14 +33,16 @@ pub struct BrowserContext {
history: Vec<SessionHistoryEntry>,
active_index: uint,
window_proxy: *mut JSObject,
parent: Option<JS<Window>>,
}
impl BrowserContext {
pub fn new(document: JSRef<Document>) -> BrowserContext {
pub fn new(document: JSRef<Document>, parent: Option<JSRef<Window>>) -> BrowserContext {
let mut context = BrowserContext {
history: vec!(SessionHistoryEntry::new(document)),
active_index: 0,
window_proxy: ptr::null_mut(),
parent: parent.map(|p| JS::from_rooted(p)),
};
context.create_window_proxy();
context
@ -60,6 +62,12 @@ impl BrowserContext {
self.window_proxy
}
pub fn parent(&self) -> Option<Temporary<Window>> {
self.parent.map(|p| {
p.root().browser_context().as_ref().unwrap().active_window()
})
}
#[allow(unsafe_blocks)]
fn create_window_proxy(&mut self) {
let win = self.active_window().root();

10
components/script/dom/window.rs
View file

@ -272,9 +272,9 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
self.Window()
}
// https://html.spec.whatwg.org/multipage/browsers.html#dom-parent
fn Parent(self) -> Temporary<Window> {
//TODO - Once we support iframes correctly this needs to return the parent frame
self.Window()
self.browser_context().as_ref().unwrap().parent().unwrap_or(self.Window())
}
fn Performance(self) -> Temporary<Performance> {
@ -314,7 +314,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
pub trait WindowHelpers {
fn flush_layout(self, goal: ReflowGoal, query: ReflowQueryType);
fn init_browser_context(self, doc: JSRef<Document>);
fn init_browser_context(self, doc: JSRef<Document>, parent: Option<JSRef<Window>>);
fn load_url(self, href: DOMString);
fn handle_fire_timer(self, timer_id: TimerId);
fn IndexedGetter(self, _index: u32, _found: &mut bool) -> Option<Temporary<Window>>;
@ -357,8 +357,8 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
self.page().flush_layout(goal, query);
}
fn init_browser_context(self, doc: JSRef<Document>) {
*self.browser_context.borrow_mut() = Some(BrowserContext::new(doc));
fn init_browser_context(self, doc: JSRef<Document>, parent: Option<JSRef<Window>>) {
*self.browser_context.borrow_mut() = Some(BrowserContext::new(doc, parent));
}
/// Commence a new URL load which will either replace this window or scroll to a fragment.