<!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>[202428] 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/202428">202428</a></dd>
<dt>Author</dt> <dd>wilander@apple.com</dd>
<dt>Date</dt> <dd>2016-06-24 10:34:42 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make window.open layout tests for about: URLs work on iOS
https://bugs.webkit.org/show_bug.cgi?id=159072
Reviewed by Alex Christensen.
Fix two window.open layout tests for iOS. They previously used click events.
Now they instead turn off the popup blocker and just call window.open() on
the load event.
* http/tests/dom/window-open-about-blank-and-access-document-expected.txt:
* http/tests/dom/window-open-about-blank-and-access-document.html:
* http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt:
* http/tests/dom/window-open-about-webkit-org-and-access-document.html:
* platform/ios-simulator/TestExpectations:
Removed the skipping of these two test cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumentexpectedtxt">trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumenthtml">trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html</a></li>
<li><a href="#trunkLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumentexpectedtxt">trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumenthtml">trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/ChangeLog 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-24 John Wilander <wilander@apple.com>
+
+ Make window.open layout tests for about: URLs work on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=159072
+
+ Reviewed by Alex Christensen.
+
+ Fix two window.open layout tests for iOS. They previously used click events.
+ Now they instead turn off the popup blocker and just call window.open() on
+ the load event.
+
+ * http/tests/dom/window-open-about-blank-and-access-document-expected.txt:
+ * http/tests/dom/window-open-about-blank-and-access-document.html:
+ * http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt:
+ * http/tests/dom/window-open-about-webkit-org-and-access-document.html:
+ * platform/ios-simulator/TestExpectations:
+ Removed the skipping of these two test cases.
+
</ins><span class="cx"> 2016-06-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL] ImageBufferCairo should accept resolution factor
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><span class="cx"> CONSOLE MESSAGE: line 1: Injected script running.
</span><del>-
</del><span class="cx"> PASS newWindow.document is defined.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -10,19 +10,20 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.setPopupBlockingEnabled(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function checkNewWindowDocumentIsUndefined () {
</del><ins>+ function checkNewWindowDocumentIsDefined () {
</ins><span class="cx"> shouldBeDefined("newWindow.document");
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function clickHandler() {
</del><ins>+ function run() {
</ins><span class="cx"> newWindow = window.open("about:blank");
</span><span class="cx"> try {
</span><span class="cx"> newWindow.document.write("<scri" + "pt>console.log('Injected script running.')</sc" + "ript>");
</span><del>- setTimeout(checkNewWindowDocumentIsUndefined, 500);
</del><ins>+ setTimeout(checkNewWindowDocumentIsDefined, 500);
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> testFailed("Was not able to write to the new window's document.");
</span><span class="cx"> if (window.testRunner)
</span><span class="lines">@@ -29,21 +30,9 @@
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- function clickButton() {
- var button = document.getElementById("test");
- var buttonX = button.offsetLeft + button.offsetWidth / 2;
- var buttonY = button.offsetTop + button.offsetHeight / 2;
- if (window.eventSender) {
- eventSender.mouseMoveTo(buttonX, buttonY);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
</del><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body onload="clickButton()">
-<button id="test" onclick="clickHandler()"></button>
</del><ins>+<body onload="run()">
</ins><span class="cx"> <div id="console"></div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><del>-CONSOLE MESSAGE: line 45: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "null". The frame requesting access has a protocol of "http", the frame being accessed has a protocol of "about". Protocols must match.
</del><ins>+CONSOLE MESSAGE: line 34: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "null". The frame requesting access has a protocol of "http", the frame being accessed has a protocol of "about". Protocols must match.
</ins><span class="cx">
</span><span class="cx"> CONSOLE MESSAGE: line 347: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "null". The frame requesting access has a protocol of "http", the frame being accessed has a protocol of "about". Protocols must match.
</span><span class="cx">
</span><del>-
</del><span class="cx"> PASS newWindow.document is undefined.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.setPopupBlockingEnabled(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkNewWindowDocumentIsUndefined () {
</span><span class="lines">@@ -17,7 +18,7 @@
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function clickHandler() {
</del><ins>+ function run() {
</ins><span class="cx"> newWindow = window.open("about://webkit.org");
</span><span class="cx"> try {
</span><span class="cx"> newWindow.document.write("<scri" + "pt>console.log('Injected script running.')</sc" + "ript>");
</span><span class="lines">@@ -28,21 +29,9 @@
</span><span class="cx"> setTimeout(checkNewWindowDocumentIsUndefined, 500);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- function clickButton() {
- var button = document.getElementById("test");
- var buttonX = button.offsetLeft + button.offsetWidth / 2;
- var buttonY = button.offsetTop + button.offsetHeight / 2;
- if (window.eventSender) {
- eventSender.mouseMoveTo(buttonX, buttonY);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
</del><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body onload="clickButton()">
-<button id="test" onclick="clickHandler()"></button>
</del><ins>+<body onload="run()">
</ins><span class="cx"> <div id="console"></div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (202427 => 202428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-24 17:32:58 UTC (rev 202427)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-24 17:34:42 UTC (rev 202428)
</span><span class="lines">@@ -254,8 +254,6 @@
</span><span class="cx"> fast/scrolling/scroll-animator-select-list-events.html [ Skip ]
</span><span class="cx"> fast/events/prevent-default-prevents-interaction-with-scrollbars.html [ Skip ]
</span><span class="cx"> fast/text/text-disappear-on-deselect.html [ ImageOnlyFailure ]
</span><del>-http/tests/dom/window-open-about-blank-and-access-document.html [ Skip ]
-http/tests/dom/window-open-about-webkit-org-and-access-document.html [ Skip ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>