aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-03 14:03:19 -0500
committerGitHub <noreply@github.com>2016-11-03 14:03:19 -0500
commit4984a83f675484a752e305f2d592f6d9e774c4fb (patch)
tree07f4fe15e08998c6f4e47e6b33ba87a9ec88a327 /components/script
parent05f4512433c108d00b7bac3a50243aefea7f153c (diff)
parent1803a585e5eb388830efac7e80d582f2fa4eb652 (diff)
downloadservo-4984a83f675484a752e305f2d592f6d9e774c4fb.tar.gz
servo-4984a83f675484a752e305f2d592f6d9e774c4fb.zip
Auto merge of #13965 - asajeffrey:script-iframe-check-document-browsing-context, r=Ms2ger
Check that an iframe is in a document with a browsing context before processing src <!-- Please describe your changes on the following line: --> Check that an iframe is in a document with a browsing context before processing src. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13964. - [X] These changes do not require tests because this is already tested by https://github.com/servo/servo/blob/master/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/034.html <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/13965) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/htmliframeelement.rs24
-rw-r--r--components/script/dom/node.rs4
2 files changed, 24 insertions, 4 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 73ef7c580d7..fef2cd70d85 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -409,7 +409,7 @@ unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent,
pub fn Navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult {
if iframe.Mozbrowser() {
- if iframe.upcast::<Node>().is_in_doc() {
+ if iframe.upcast::<Node>().is_in_doc_with_browsing_context() {
let window = window_from_node(iframe);
let msg = ConstellationMsg::TraverseHistory(iframe.pipeline_id(), direction);
window.upcast::<GlobalScope>().constellation_chan().send(msg).unwrap();
@@ -495,7 +495,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload
fn Reload(&self, _hard_reload: bool) -> ErrorResult {
if self.Mozbrowser() {
- if self.upcast::<Node>().is_in_doc() {
+ if self.upcast::<Node>().is_in_doc_with_browsing_context() {
self.navigate_or_reload_child_browsing_context(None, true);
}
Ok(())
@@ -593,7 +593,16 @@ impl VirtualMethods for HTMLIFrameElement {
},
&local_name!("src") => {
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_doc_with_browsing_context() {
+ debug!("iframe {} src set while in browsing context.", self.frame_id);
self.process_the_iframe_attributes();
}
}
@@ -616,7 +625,14 @@ impl VirtualMethods for HTMLIFrameElement {
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_doc_with_browsing_context() {
+ debug!("iframe {} bound to browsing context.", self.frame_id);
self.process_the_iframe_attributes();
}
}
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 4ec6c878ad5..824cb671240 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -771,6 +771,10 @@ impl Node {
self.owner_doc().is_html_document()
}
+ pub fn is_in_doc_with_browsing_context(&self) -> bool {
+ self.is_in_doc() && self.owner_doc().browsing_context().is_some()
+ }
+
pub fn children(&self) -> NodeSiblingIterator {
NodeSiblingIterator {
current: self.GetFirstChild(),