<!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>[212178] trunk</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/212178">212178</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 20:40:38 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>document.origin doesn't match spec
https://bugs.webkit.org/show_bug.cgi?id=168022
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
Rebaseline test now that document.origin has the right format.
* web-platform-tests/dom/nodes/Node-cloneNode-expected.txt:
Source/WebCore:
Update document.origin to return the origin in the expected format:
- https://dom.spec.whatwg.org/#dom-document-origin
Change: "https_webkit.org_0 -> "https://webkit.org".
The new behavior matches Firefox and Chrome.
No new tests, updated existing tests.
* dom/Document.cpp:
(WebCore::Document::origin):
LayoutTests:
* http/tests/media/media-stream/enumerate-devices-source-id-persistent.html:
Fix test that was passing only because the document.origin would never match the
expected string:
- Move idCounts to the global scope has the handler function is called 3 times
and we need to properly update the same idCounts object in all 3 calls.
- Fix initialization of idCounts to start at 1, not 0. Otherwise, idCounts[uniqueID]
is 0 instead of 1.
- Use a Map instead of an array since the ids are UUID strings, not integers.
- Fix check for non-unique ids, was idCounts[deviceId] == 1 instead of
idCounts[deviceId] != 1.
* http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html:
* http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html:
* http/tests/ssl/iframe-upgrade.https.html:
Update / rebaseline now that document.origin has the right format.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediastreamenumeratedevicessourceidpersistenthtml">trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyupgradeinsecurerequestsformupgradehtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyupgradeinsecurerequestsiframeupgradehttpshtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html</a></li>
<li><a href="#trunkLayoutTestshttptestsssliframeupgradehttpshtml">trunk/LayoutTests/http/tests/ssl/iframe-upgrade.https.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomnodesNodecloneNodeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-cloneNode-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/ChangeLog 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-02-10 Chris Dumez <cdumez@apple.com>
+
+ document.origin doesn't match spec
+ https://bugs.webkit.org/show_bug.cgi?id=168022
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/media/media-stream/enumerate-devices-source-id-persistent.html:
+ Fix test that was passing only because the document.origin would never match the
+ expected string:
+ - Move idCounts to the global scope has the handler function is called 3 times
+ and we need to properly update the same idCounts object in all 3 calls.
+ - Fix initialization of idCounts to start at 1, not 0. Otherwise, idCounts[uniqueID]
+ is 0 instead of 1.
+ - Use a Map instead of an array since the ids are UUID strings, not integers.
+ - Fix check for non-unique ids, was idCounts[deviceId] == 1 instead of
+ idCounts[deviceId] != 1.
+
+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html:
+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html:
+ * http/tests/ssl/iframe-upgrade.https.html:
+ Update / rebaseline now that document.origin has the right format.
+
</ins><span class="cx"> 2017-02-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r211845): [ios-simulator] LayoutTest compositing/masks/solid-color-masked.html is a flaky failure
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediastreamenumeratedevicessourceidpersistenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/http/tests/media/media-stream/enumerate-devices-source-id-persistent.html 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> <script src="../../../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> var frameInfos = [];
</span><ins>+ var idCounts = new Map();
</ins><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx">
</span><span class="cx"> if (window.testRunner) {
</span><span class="lines">@@ -22,11 +23,12 @@
</span><span class="cx">
</span><span class="cx"> function handler(event)
</span><span class="cx"> {
</span><del>- var idCounts = [];
-
</del><span class="cx"> event.data.deviceIds.forEach(function(id) {
</span><span class="cx"> frameInfos.push({origin : event.data.origin, deviceId : id});
</span><del>- idCounts[id] = idCounts[id] === undefined ? 0 : ++idCounts[id];
</del><ins>+ if (idCounts.has(id))
+ idCounts.set(id, idCounts.get(id) + 1);
+ else
+ idCounts.set(id, 1);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (frameInfos.length != 6)
</span><span class="lines">@@ -36,12 +38,12 @@
</span><span class="cx"> for (var i = 0; i < frameInfos.length; i++) {
</span><span class="cx"> var deviceId = frameInfos[i].deviceId;
</span><span class="cx"> if (frameInfos[i].origin.indexOf("http://localhost:8000") == 0) {
</span><del>- if (idCounts[deviceId] < 2) {
</del><ins>+ if (idCounts.get(deviceId) < 2) {
</ins><span class="cx"> testFailed(`: device ID in ${frameInfos[i].origin} is unique`);
</span><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if (idCounts[deviceId] == 1) {
</del><ins>+ if (idCounts.get(deviceId) != 1) {
</ins><span class="cx"> testFailed(`: device ID in ${frameInfos[i].origin} is not unique`);
</span><span class="cx"> success = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyupgradeinsecurerequestsformupgradehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/form-upgrade.html 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals("https_127.0.0.1_8443", e.data.origin);
</del><ins>+ assert_equals("https://127.0.0.1:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_localhost_8443");
</del><ins>+ assert_equals("https://localhost:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -38,4 +38,4 @@
</span><span class="cx"> document.body.appendChild(iframe);
</span><span class="cx"> }, "Cross-host form submissions are upgraded.");
</span><span class="cx"> </script>
</span><del>-</body>
</del><span class="cx">\ No newline at end of file
</span><ins>+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyupgradeinsecurerequestsiframeupgradehttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https.html 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_127.0.0.1_8443");
</del><ins>+ assert_equals("https://127.0.0.1:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_localhost_8443");
</del><ins>+ assert_equals("https://localhost:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "http_localhost_8000");
</del><ins>+ assert_equals("http://localhost:8000", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -54,4 +54,4 @@
</span><span class="cx"> document.body.appendChild(iframe);
</span><span class="cx"> }, "Upgrade policy does NOT cascade to nested, cross-host frames.");
</span><span class="cx"> </script>
</span><del>-</body>
</del><span class="cx">\ No newline at end of file
</span><ins>+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsssliframeupgradehttpshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/ssl/iframe-upgrade.https.html (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/ssl/iframe-upgrade.https.html 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/http/tests/ssl/iframe-upgrade.https.html 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_127.0.0.1_8443");
</del><ins>+ assert_equals("https://127.0.0.1:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_localhost_8443");
</del><ins>+ assert_equals("https://localhost:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener('message', t.step_func(e => {
</span><span class="cx"> if (e.source == iframe.contentWindow) {
</span><del>- assert_equals(e.data.origin, "https_127.0.0.1_8443");
</del><ins>+ assert_equals("https://127.0.0.1:8443", e.data.origin);
</ins><span class="cx"> t.done();
</span><span class="cx"> }
</span><span class="cx"> }));
</span><span class="lines">@@ -54,4 +54,4 @@
</span><span class="cx"> document.body.appendChild(iframe);
</span><span class="cx"> }, "Upgrade policy cascades to nested, same-host frames.");
</span><span class="cx"> </script>
</span><del>-</body>
</del><span class="cx">\ No newline at end of file
</span><ins>+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-10 Chris Dumez <cdumez@apple.com>
+
+ document.origin doesn't match spec
+ https://bugs.webkit.org/show_bug.cgi?id=168022
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline test now that document.origin has the right format.
+
+ * web-platform-tests/dom/nodes/Node-cloneNode-expected.txt:
+
</ins><span class="cx"> 2017-02-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] fetch fails when undefined is passed as headers
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomnodesNodecloneNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-cloneNode-expected.txt (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-cloneNode-expected.txt 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Node-cloneNode-expected.txt 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> PASS createElementNS non-HTML
</span><span class="cx"> PASS createProcessingInstruction
</span><span class="cx"> PASS implementation.createDocumentType
</span><del>-FAIL implementation.createDocument assert_equals: expected "null" but got "http_localhost_8800"
</del><ins>+FAIL implementation.createDocument assert_equals: expected "null" but got "http://localhost:8800"
</ins><span class="cx"> PASS implementation.createHTMLDocument
</span><span class="cx"> PASS node with children
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/Source/WebCore/ChangeLog 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-10 Chris Dumez <cdumez@apple.com>
+
+ document.origin doesn't match spec
+ https://bugs.webkit.org/show_bug.cgi?id=168022
+
+ Reviewed by Sam Weinig.
+
+ Update document.origin to return the origin in the expected format:
+ - https://dom.spec.whatwg.org/#dom-document-origin
+
+ Change: "https_webkit.org_0 -> "https://webkit.org".
+
+ The new behavior matches Firefox and Chrome.
+
+ No new tests, updated existing tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::origin):
+
</ins><span class="cx"> 2017-02-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix the build following <https://trac.webkit.org/changeset/212173>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (212177 => 212178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-02-11 04:05:06 UTC (rev 212177)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-02-11 04:40:38 UTC (rev 212178)
</span><span class="lines">@@ -4288,7 +4288,7 @@
</span><span class="cx">
</span><span class="cx"> String Document::origin() const
</span><span class="cx"> {
</span><del>- return SecurityOriginData::fromSecurityOrigin(securityOrigin()).databaseIdentifier();
</del><ins>+ return securityOrigin().toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Document::domain() const
</span></span></pre>
</div>
</div>
</body>
</html>