<!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>[203029] 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/203029">203029</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-09 05:57:37 -0700 (Sat, 09 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make use of PrivateIdentifier to simplify Fetch Headers built-in checks
https://bugs.webkit.org/show_bug.cgi?id=159554
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-09
Reviewed by Alex Christensen.
Source/WebCore:
Test: fetch/header-constructor-overriden.html
Patch does not change visible behavior.
* Modules/fetch/FetchHeaders.idl: Adding PrivateIdentifier to the Headers constructor.
* Modules/fetch/FetchHeaders.js:
(initializeFetchHeaders): Checking directly with @Headers for improved clarity.
* Modules/fetch/FetchResponse.js: Using @Headers to check whether creating a Headers object or not before
passsing it to C++ FetchResponse initialize method.
(initializeFetchResponse):
* bindings/js/WebCoreBuiltinNames.h: Adding Headers private name.
LayoutTests:
* fetch/header-constructor-overriden-expected.txt: Added.
* fetch/header-constructor-overriden.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeadersidl">trunk/Source/WebCore/Modules/fetch/FetchHeaders.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeadersjs">trunk/Source/WebCore/Modules/fetch/FetchHeaders.js</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsejs">trunk/Source/WebCore/Modules/fetch/FetchResponse.js</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfetchheaderconstructoroverridenexpectedtxt">trunk/LayoutTests/fetch/header-constructor-overriden-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfetchheaderconstructoroverridenhtml">trunk/LayoutTests/fetch/header-constructor-overriden.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/LayoutTests/ChangeLog 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-09 Youenn Fablet <youenn@apple.com>
+
+ Make use of PrivateIdentifier to simplify Fetch Headers built-in checks
+ https://bugs.webkit.org/show_bug.cgi?id=159554
+
+ Reviewed by Alex Christensen.
+
+ * fetch/header-constructor-overriden-expected.txt: Added.
+ * fetch/header-constructor-overriden.html: Added.
+
</ins><span class="cx"> 2016-07-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> adoptNode() changes css class to lowercase for document loaded with XHR responseType = "document"
</span></span></pre></div>
<a id="trunkLayoutTestsfetchheaderconstructoroverridenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fetch/header-constructor-overriden-expected.txt (0 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fetch/header-constructor-overriden-expected.txt (rev 0)
+++ trunk/LayoutTests/fetch/header-constructor-overriden-expected.txt 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This test should create a Headers, override the Headers property and try creating new Headers from it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS headers.get('hello') is "world"
+PASS newHeaders.get('hello') is "world"
+PASS response.headers.get('hello') is "world"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfetchheaderconstructoroverridenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fetch/header-constructor-overriden.html (0 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fetch/header-constructor-overriden.html (rev 0)
+++ trunk/LayoutTests/fetch/header-constructor-overriden.html 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<iframe></iframe>
+<script>
+description("This test should create a Headers, override the Headers property and try creating new Headers from it.");
+
+let array = [ [ 'hello', 'world' ] ];
+var headers = new Headers(array);
+shouldBeEqualToString("headers.get('hello')", "world");
+
+var OldHeaders = Headers;
+
+headers.constructor = null;
+Headers = {};
+window.Headers = {};
+
+var newHeaders = new OldHeaders(headers);
+shouldBeEqualToString("newHeaders.get('hello')", "world");
+
+var response = new Response("", {headers: headers});
+shouldBeEqualToString("response.headers.get('hello')", "world");
+
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/Source/WebCore/ChangeLog 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-07-09 Youenn Fablet <youenn@apple.com>
+
+ Make use of PrivateIdentifier to simplify Fetch Headers built-in checks
+ https://bugs.webkit.org/show_bug.cgi?id=159554
+
+ Reviewed by Alex Christensen.
+
+ Test: fetch/header-constructor-overriden.html
+ Patch does not change visible behavior.
+
+ * Modules/fetch/FetchHeaders.idl: Adding PrivateIdentifier to the Headers constructor.
+ * Modules/fetch/FetchHeaders.js:
+ (initializeFetchHeaders): Checking directly with @Headers for improved clarity.
+ * Modules/fetch/FetchResponse.js: Using @Headers to check whether creating a Headers object or not before
+ passsing it to C++ FetchResponse initialize method.
+ (initializeFetchResponse):
+ * bindings/js/WebCoreBuiltinNames.h: Adding Headers private name.
+
</ins><span class="cx"> 2016-07-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> adoptNode() changes css class to lowercase for document loaded with XHR responseType = "document"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeadersidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.idl (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.idl 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.idl 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -32,8 +32,9 @@
</span><span class="cx"> Exposed=(Window,Worker),
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> InterfaceName=Headers,
</span><del>- JSBuiltinConstructor
-]
</del><ins>+ JSBuiltinConstructor,
+ PrivateIdentifier,
+ PublicIdentifier]
</ins><span class="cx"> interface FetchHeaders {
</span><span class="cx"> [RaisesException] void append(DOMString name, DOMString value);
</span><span class="cx"> [RaisesException, ImplementedAs=remove] void delete(DOMString name);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeadersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.js (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.js 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.js 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> if (!@isObject(headersInit))
</span><span class="cx"> throw new @TypeError("headersInit must be an object");
</span><span class="cx">
</span><del>- if (headersInit instanceof this.constructor) {
</del><ins>+ if (headersInit instanceof @Headers) {
</ins><span class="cx"> this.@fillFromJS(headersInit);
</span><span class="cx"> return this;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.js (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -35,11 +35,10 @@
</span><span class="cx"> throw new @TypeError("Response init must be an object");
</span><span class="cx"> parameters.status = init.status;
</span><span class="cx"> parameters.statusText = init.statusText;
</span><del>- // FIXME: Shield this from user scripts.
</del><span class="cx"> if (init.headers)
</span><del>- parameters.headers = (this.headers.constructor === init.headers.constructor) ? init.headers : new this.headers.constructor(init.headers);
</del><ins>+ parameters.headers = (init.headers instanceof @Headers) ? init.headers : new @Headers(init.headers);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (parameters.status === @undefined)
</span><span class="cx"> parameters.status = 200;
</span><span class="cx"> if (parameters.statusText === @undefined)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (203028 => 203029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-09 07:33:28 UTC (rev 203028)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-09 12:57:37 UTC (rev 203029)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> macro(underlyingSink) \
</span><span class="cx"> macro(underlyingSource) \
</span><span class="cx"> macro(writing) \
</span><ins>+ macro(Headers) \
</ins><span class="cx"> macro(MediaStream) \
</span><span class="cx"> macro(MediaStreamTrack) \
</span><span class="cx"> macro(ReadableStream) \
</span></span></pre>
</div>
</div>
</body>
</html>