<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211440] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211440">211440</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-31 10:59:23 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix layout tests added in <a href="http://trac.webkit.org/projects/webkit/changeset/211435">r211435</a>.
It is important that window.open() is called *after* testRunner.waitUntilDone()
has been called or you'll hit assertions in DRT.
* http/tests/security/cross-origin-window-open-insert-script.html:
* http/tests/security/cross-origin-window-open-javascript-url.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowopeninsertscripthtml">trunk/LayoutTests/http/tests/security/cross-origin-window-open-insert-script.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowopenjavascripturlhtml">trunk/LayoutTests/http/tests/security/cross-origin-window-open-javascript-url.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211439 => 211440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-01-31 18:57:57 UTC (rev 211439)
+++ trunk/LayoutTests/ChangeLog        2017-01-31 18:59:23 UTC (rev 211440)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-31 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, fix layout tests added in r211435.
+
+ It is important that window.open() is called *after* testRunner.waitUntilDone()
+ has been called or you'll hit assertions in DRT.
+
+ * http/tests/security/cross-origin-window-open-insert-script.html:
+ * http/tests/security/cross-origin-window-open-javascript-url.html:
+
</ins><span class="cx"> 2017-01-31 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> RTCPeerConnection methods can take dictionaries as input
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowopeninsertscripthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-window-open-insert-script.html (211439 => 211440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-open-insert-script.html        2017-01-31 18:57:57 UTC (rev 211439)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-open-insert-script.html        2017-01-31 18:59:23 UTC (rev 211440)
</span><span class="lines">@@ -12,35 +12,37 @@
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-let win = open("about:blank", "one");
-let otherDocument = win.document;
-win.resultDiv = document.getElementById("resultDiv");
</del><ins>+window.onload = function() {
+ let win = open("about:blank", "one");
+ let otherDocument = win.document;
+ win.resultDiv = document.getElementById("resultDiv");
</ins><span class="cx">
</span><del>-let a = otherDocument.createElement("a");
-a.href = "http://localhost:8000/security/resources/blank.html";
-a.click();
</del><ins>+ let a = otherDocument.createElement("a");
+ a.href = "http://localhost:8000/security/resources/blank.html";
+ a.click();
</ins><span class="cx">
</span><del>-window.addEventListener('message', function(e) {
- testFailed("Script executed in cross origin iframe");
- testFailed("Retrieved cross-origin window's URL: " + e.data);
-});
</del><ins>+ window.addEventListener('message', function(e) {
+ testFailed("Script executed in cross origin iframe");
+ testFailed("Retrieved cross-origin window's URL: " + e.data);
+ });
</ins><span class="cx">
</span><del>-it = setInterval(function() {
- try {
- win.location.href;
- } catch (e) {
- // Window has navigated to cross origin URL.
- clearInterval(it);
</del><ins>+ it = setInterval(function() {
</ins><span class="cx"> try {
</span><del>- var script = otherDocument.createElement("script");
- script.innerText = "opener.postMessage(location.href, '*');";
- otherDocument.body.append(script);
</del><ins>+ win.location.href;
</ins><span class="cx"> } catch (e) {
</span><del>- debug(e);
</del><ins>+ // Window has navigated to cross origin URL.
+ clearInterval(it);
+ try {
+ var script = otherDocument.createElement("script");
+ script.innerText = "opener.postMessage(location.href, '*');";
+ otherDocument.body.append(script);
+ } catch (e) {
+ debug(e);
+ }
+ setTimeout(finishJSTest, 0);
</ins><span class="cx"> }
</span><del>- setTimeout(finishJSTest, 0);
- }
-}, 10);
</del><ins>+ }, 10);
+}
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="/js-test-resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowopenjavascripturlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-window-open-javascript-url.html (211439 => 211440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-open-javascript-url.html        2017-01-31 18:57:57 UTC (rev 211439)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-open-javascript-url.html        2017-01-31 18:59:23 UTC (rev 211440)
</span><span class="lines">@@ -12,35 +12,37 @@
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-let win = open("about:blank", "one");
-let otherDocument = win.document;
-win.resultDiv = document.getElementById("resultDiv");
</del><ins>+window.onload = function() {
+ let win = open("about:blank", "one");
+ let otherDocument = win.document;
+ win.resultDiv = document.getElementById("resultDiv");
</ins><span class="cx">
</span><del>-let a = otherDocument.createElement("a");
-a.href = "http://localhost:8000/security/resources/blank.html";
-a.click();
</del><ins>+ let a = otherDocument.createElement("a");
+ a.href = "http://localhost:8000/security/resources/blank.html";
+ a.click();
</ins><span class="cx">
</span><del>-window.addEventListener('message', function(e) {
- testFailed("Script executed in cross origin iframe");
- testFailed("Retrieved cross-origin window's URL: " + e.data);
-});
</del><ins>+ window.addEventListener('message', function(e) {
+ testFailed("Script executed in cross origin iframe");
+ testFailed("Retrieved cross-origin window's URL: " + e.data);
+ });
</ins><span class="cx">
</span><del>-it = setInterval(function() {
- try {
- win.location.href;
- } catch (e) {
- // Window has navigated to cross origin URL.
- clearInterval(it);
</del><ins>+ it = setInterval(function() {
</ins><span class="cx"> try {
</span><del>- var frame = document.createElement("iframe");
- frame.src = "javascript:parent.opener.postMessage(parent.location.href, '*')"
- otherDocument.body.append(frame);
</del><ins>+ win.location.href;
</ins><span class="cx"> } catch (e) {
</span><del>- debug(e);
</del><ins>+ // Window has navigated to cross origin URL.
+ clearInterval(it);
+ try {
+ var frame = document.createElement("iframe");
+ frame.src = "javascript:parent.opener.postMessage(parent.location.href, '*')"
+ otherDocument.body.append(frame);
+ } catch (e) {
+ debug(e);
+ }
+ setTimeout(finishJSTest, 0);
</ins><span class="cx"> }
</span><del>- setTimeout(finishJSTest, 0);
- }
-}, 10);
</del><ins>+ }, 10);
+}
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="/js-test-resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre>
</div>
</div>
</body>
</html>