mirror of
https://github.com/servo/servo.git
synced 2025-07-17 12:23:40 +01:00
Check that an iframe is in a document with a browsing context before processing src.
This commit is contained in:
parent
25e3ae6915
commit
23d030e7a7
2 changed files with 34 additions and 4 deletions
|
@ -408,7 +408,7 @@ unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent,
|
||||||
|
|
||||||
pub fn Navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult {
|
pub fn Navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult {
|
||||||
if iframe.Mozbrowser() {
|
if iframe.Mozbrowser() {
|
||||||
if iframe.upcast::<Node>().is_in_doc() {
|
if iframe.upcast::<Node>().is_in_a_document_tree_with_a_browsing_context() {
|
||||||
let window = window_from_node(iframe);
|
let window = window_from_node(iframe);
|
||||||
let msg = ConstellationMsg::TraverseHistory(iframe.pipeline_id(), direction);
|
let msg = ConstellationMsg::TraverseHistory(iframe.pipeline_id(), direction);
|
||||||
window.upcast::<GlobalScope>().constellation_chan().send(msg).unwrap();
|
window.upcast::<GlobalScope>().constellation_chan().send(msg).unwrap();
|
||||||
|
@ -494,7 +494,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
|
||||||
// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload
|
// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload
|
||||||
fn Reload(&self, _hard_reload: bool) -> ErrorResult {
|
fn Reload(&self, _hard_reload: bool) -> ErrorResult {
|
||||||
if self.Mozbrowser() {
|
if self.Mozbrowser() {
|
||||||
if self.upcast::<Node>().is_in_doc() {
|
if self.upcast::<Node>().is_in_a_document_tree_with_a_browsing_context() {
|
||||||
self.navigate_or_reload_child_browsing_context(None, true);
|
self.navigate_or_reload_child_browsing_context(None, true);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -592,7 +592,16 @@ impl VirtualMethods for HTMLIFrameElement {
|
||||||
},
|
},
|
||||||
&atom!("src") => {
|
&atom!("src") => {
|
||||||
if let AttributeMutation::Set(_) = mutation {
|
if let AttributeMutation::Set(_) = mutation {
|
||||||
if self.upcast::<Node>().is_in_doc() {
|
// https://html.spec.whatwg.org/multipage/#the-iframe-element
|
||||||
|
// "Similarly, whenever an iframe element with a non-null nested browsing context
|
||||||
|
// but with no srcdoc attribute specified has its src attribute set, changed, or removed,
|
||||||
|
// the user agent must process the iframe attributes,"
|
||||||
|
// but we can't check that directly, since the child browsing context
|
||||||
|
// may be in a different script thread. Instread, we check to see if the parent
|
||||||
|
// is in a document tree and has a browsing context, which is what causes
|
||||||
|
// the child browsing context to be created.
|
||||||
|
if self.upcast::<Node>().is_in_a_document_tree_with_a_browsing_context() {
|
||||||
|
debug!("iframe {} src set while in browsing context.", self.frame_id);
|
||||||
self.process_the_iframe_attributes();
|
self.process_the_iframe_attributes();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -615,7 +624,14 @@ impl VirtualMethods for HTMLIFrameElement {
|
||||||
s.bind_to_tree(tree_in_doc);
|
s.bind_to_tree(tree_in_doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if tree_in_doc {
|
// https://html.spec.whatwg.org/multipage/#the-iframe-element
|
||||||
|
// "When an iframe element is inserted into a document that has
|
||||||
|
// a browsing context, the user agent must create a new
|
||||||
|
// browsing context, set the element's nested browsing context
|
||||||
|
// to the newly-created browsing context, and then process the
|
||||||
|
// iframe attributes for the "first time"."
|
||||||
|
if self.upcast::<Node>().is_in_a_document_tree_with_a_browsing_context() {
|
||||||
|
debug!("iframe {} bound to browsing context.", self.frame_id);
|
||||||
self.process_the_iframe_attributes();
|
self.process_the_iframe_attributes();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -771,6 +771,20 @@ impl Node {
|
||||||
self.owner_doc().is_html_document()
|
self.owner_doc().is_html_document()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://dom.spec.whatwg.org/#in-a-document-tree
|
||||||
|
pub fn is_in_a_document_tree(&self) -> bool {
|
||||||
|
self.inclusive_ancestors().last()
|
||||||
|
.and_then(Root::downcast::<Document>)
|
||||||
|
.is_some()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_in_a_document_tree_with_a_browsing_context(&self) -> bool {
|
||||||
|
self.inclusive_ancestors().last()
|
||||||
|
.and_then(Root::downcast::<Document>)
|
||||||
|
.map(|doc| doc.browsing_context().is_some())
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn children(&self) -> NodeSiblingIterator {
|
pub fn children(&self) -> NodeSiblingIterator {
|
||||||
NodeSiblingIterator {
|
NodeSiblingIterator {
|
||||||
current: self.GetFirstChild(),
|
current: self.GetFirstChild(),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue