<!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>[202193] branches/safari-601-branch</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/202193">202193</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 18:09:09 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/202174">r202174</a>. rdar://problem/26701322</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformURLcpp">branches/safari-601-branch/Source/WebCore/platform/URL.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumentexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumenthtml">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (202192 => 202193)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-18 01:06:45 UTC (rev 202192)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-18 01:09:09 UTC (rev 202193)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-06-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r202174.
+
+ 2016-06-17 John Wilander <wilander@apple.com>
+
+ Ignore case in the check for security origin inheritance
+ https://bugs.webkit.org/show_bug.cgi?id=158878
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt: Added.
+ * http/tests/dom/window-open-about-uppercase-blank-and-access-document.html: Added.
+
+2016-06-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r202151.
</span><span class="cx">
</span><span class="cx"> 2016-06-16 John Wilander <wilander@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumentexpectedtxtfromrev202191branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumentexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt (from rev 202191, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt) (0 => 202193)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document-expected.txt 2016-06-18 01:09:09 UTC (rev 202193)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: line 1: Injected script running.
+PASS newWindow.document is defined.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumenthtmlfromrev202191branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutuppercaseblankandaccessdocumenthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document.html (from rev 202191, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document.html) (0 => 202193)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-uppercase-blank-and-access-document.html 2016-06-18 01:09:09 UTC (rev 202193)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Tests opening a new about:blank window and accessing its document</title>
+ <script src="../resources/js-test-pre.js"></script>
+ <script>
+ var newWindow;
+
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.waitUntilDone();
+ testRunner.setPopupBlockingEnabled(false);
+ }
+
+ function checkNewWindowDocumentIsDefined () {
+ shouldBeDefined("newWindow.document");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function run() {
+ newWindow = window.open("about:BLANK");
+ try {
+ newWindow.document.write("<scri" + "pt>console.log('Injected script running.')</sc" + "ript>");
+ setTimeout(checkNewWindowDocumentIsDefined, 500);
+ } catch (e) {
+ testFailed("Was not able to write to the new window's document.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+ </script>
+</head>
+<body onload="run()">
+<div id="console"></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (202192 => 202193)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-06-18 01:06:45 UTC (rev 202192)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-06-18 01:09:09 UTC (rev 202193)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-06-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r202174.
+
+ 2016-06-17 John Wilander <wilander@apple.com>
+
+ Ignore case in the check for security origin inheritance
+ https://bugs.webkit.org/show_bug.cgi?id=158878
+
+ Reviewed by Alex Christensen.
+
+ Darin Adler commented in https://bugs.webkit.org/show_bug.cgi?id=158855:
+ "Are these comparisons intentionally case sensitive? Shouldn’t they ignore ASCII
+ case? We could use equalIgnoringASCIICase and equalLettersIgnoringASCIICase for
+ those two lines instead of using ==. URL::parse normalizes letters in the scheme
+ and host by using toASCIILower, but does not normalize letters elsewhere in the
+ URL, such as in the "blank" or "srcdoc" in the above URLs."
+
+ Test: http/tests/dom/window-open-about-uppercase-blank-and-access-document.html
+
+ * platform/URL.cpp:
+ (WebCore::URL::shouldInheritSecurityOriginFromOwner):
+
+2016-06-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r202151.
</span><span class="cx">
</span><span class="cx"> 2016-06-16 John Wilander <wilander@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/URL.cpp (202192 => 202193)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/URL.cpp 2016-06-18 01:06:45 UTC (rev 202192)
+++ branches/safari-601-branch/Source/WebCore/platform/URL.cpp 2016-06-18 01:09:09 UTC (rev 202193)
</span><span class="lines">@@ -1983,8 +1983,8 @@
</span><span class="cx"> bool URL::shouldInheritSecurityOriginFromOwner() const
</span><span class="cx"> {
</span><span class="cx"> return isEmpty()
</span><del>- || m_string == blankURL().string()
- || m_string == "about:srcdoc";
</del><ins>+ || equalIgnoringASCIICase(m_string, blankURL().string())
+ || equalIgnoringASCIICase(m_string, "about:srcdoc");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isDefaultPortForProtocol(unsigned short port, const String& protocol)
</span></span></pre>
</div>
</div>
</body>
</html>