diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2014-10-23 17:25:39 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2014-10-23 18:58:34 -0400 |
| commit | 225ec3ed4e0c176846bbf25217f58fbe6314fcec (patch) | |
| tree | 9c333d0558e818d4285dbf5f5b929d644247259f | |
| parent | 012a80cc182ea9773f82696bf36f05820ab994b3 (diff) | |
| download | servo-225ec3ed4e0c176846bbf25217f58fbe6314fcec.tar.gz servo-225ec3ed4e0c176846bbf25217f58fbe6314fcec.zip | |
Really fix #3738 by only processing iframe src attributes during parsing.
8 files changed, 20 insertions, 7 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 52ee5c56c7b..737f3340ecf 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -121,7 +121,7 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { })); let doc = document_from_node(self).root(); - if doc.ReadyState() != DocumentReadyStateValues::Complete { + if doc.ReadyState() == DocumentReadyStateValues::Loading { // https://github.com/servo/servo/issues/3738 // We can't handle dynamic frame tree changes in the compositor right now. let ConstellationChan(ref chan) = page.constellation_chan; diff --git a/tests/html/test-iframe.html b/tests/html/test-iframe.html new file mode 100644 index 00000000000..b0fd2023de9 --- /dev/null +++ b/tests/html/test-iframe.html @@ -0,0 +1,2 @@ +<iframe id="whee"></iframe> +<script>document.getElementById('whee').src = "http://google.com"</script> diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini index 6d1f9891ef4..d535d0b584a 100644 --- a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini @@ -1,3 +1,5 @@ [open-url-javascript-window-2.htm] type: testharness - expected: CRASH + expected: TIMEOUT + [XMLHttpRequest: open() - resolving URLs (javascript: ] + expected: TIMEOUT diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini index 3500ec34096..7f9301c48d1 100644 --- a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini @@ -1,3 +1,5 @@ [open-url-javascript-window.htm] type: testharness - expected: CRASH + expected: TIMEOUT + [XMLHttpRequest: open() - resolving URLs (javascript: ] + expected: TIMEOUT diff --git a/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini b/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini index 1b6854862e9..43f2e92d311 100644 --- a/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini @@ -1,3 +1,3 @@ [Document-createElement-namespace.html] type: testharness - expected: CRASH + expected: TIMEOUT diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini index ef67f52ba2a..47a47152007 100644 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini +++ b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini @@ -1,3 +1,9 @@ [load-text-plain.html] type: testharness - expected: CRASH + expected: TIMEOUT + [Checking document metadata for text file] + expected: NOTRUN + [Checking DOM for text file] + expected: NOTRUN + [Checking contents for text file] + expected: NOTRUN diff --git a/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini b/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini index e001caff59b..5f3d336c63e 100644 --- a/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini +++ b/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini @@ -1,3 +1,3 @@ [document-base-url.html] type: testharness - expected: CRASH + expected: TIMEOUT diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/039.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/039.html.ini index b4cf0682ffc..dd18691496a 100644 --- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/039.html.ini +++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/039.html.ini @@ -1,3 +1,4 @@ [039.html] type: testharness - expected: CRASH + [ scheduler: IFRAMEs added with DOM] + expected: FAIL |