Skip to content

Commit

Permalink
Update wpt-tests metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
utsavoza committed May 18, 2020
1 parent 55a3eb6 commit 4c637e0
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 27 deletions.
7 changes: 7 additions & 0 deletions components/script/dom/document.rs
Expand Up @@ -579,6 +579,13 @@ impl Document {
if let Some(browsing_context) = self.browsing_context() {
// Step 1: If document is an iframe srcdoc document, then return the
// document base URL of document's browsing context's container document.
let container_base_url = browsing_context
.parent()
.and_then(|parent| parent.document())
.map(|document| document.base_url());
if document_url.as_str() == "about:srcdoc" && container_base_url.is_some() {
return container_base_url.unwrap();
}

// Step 2: If document's URL is about:blank, and document's browsing
// context's creator base URL is non-null, then return that creator base URL.
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/htmlanchorelement.rs
Expand Up @@ -637,7 +637,7 @@ pub fn follow_hyperlink(subject: &Element, hyperlink_suffix: Option<String>) {
if let Some(suffix) = hyperlink_suffix {
href.push_str(&suffix);
}
let url = match document.url().join(&href) {
let url = match document.base_url().join(&href) {
Ok(url) => url,
Err(_) => return,
};
Expand Down
10 changes: 4 additions & 6 deletions components/script/dom/windowproxy.rs
Expand Up @@ -731,12 +731,10 @@ impl CreatorBrowsingContextInfo {
parent: Option<&WindowProxy>,
opener: Option<&WindowProxy>,
) -> CreatorBrowsingContextInfo {
let creator = if parent.is_some() {
parent.unwrap().document()
} else if opener.is_some() {
opener.unwrap().document()
} else {
None
let creator = match (parent, opener) {
(Some(parent), _) => parent.document(),
(None, Some(opener)) => opener.document(),
(None, None) => None,
};

let base_url = creator.as_deref().map(|document| document.base_url());
Expand Down
@@ -0,0 +1,4 @@
[010.html]
type: testharness
[Link with onclick form submit to javascript url with delayed document.write and href navigation ]
expected: FAIL

This file was deleted.

This file was deleted.

@@ -1,7 +1,10 @@
[abort-while-navigating.window.html]
expected: TIMEOUT
[document.open() aborts documents that are navigating through iframe loading (XMLHttpRequest)]
expected: FAIL
expected: TIMEOUT

[document.open() aborts documents that are navigating through iframe loading (fetch())]
expected: TIMEOUT

[document.open() aborts documents that are navigating through Location (fetch())]
expected: TIMEOUT
Expand Down

0 comments on commit 4c637e0

Please sign in to comment.