<!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>[195954] 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/195954">195954</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-02-01 03:05:39 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Implement Fetch API Request
https://bugs.webkit.org/show_bug.cgi?id=153437
LayoutTests/imported/w3c:
Reviewed by Darin Adler.
* web-platform-tests/fetch/api/headers/headers-basic.html:
* web-platform-tests/fetch/api/request/request-clone.sub-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-clone.sub.html: Added.
* web-platform-tests/fetch/api/request/request-consume-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-consume.html: Added.
* web-platform-tests/fetch/api/request/request-disturbed-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-disturbed.html: Added.
* web-platform-tests/fetch/api/request/request-error-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-error.html: Added.
* web-platform-tests/fetch/api/request/request-headers-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-headers.html: Added.
* web-platform-tests/fetch/api/request/request-idl-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-idl.html: Added.
* web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-init-001.sub.html: Added.
* web-platform-tests/fetch/api/request/request-init-002-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-init-002.html: Added.
* web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-init-003.sub.html: Added.
* web-platform-tests/fetch/api/request/request-structure-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-structure.html: Added.
* web-platform-tests/fetch/api/resources/authentication.py: Added.
(main):
* web-platform-tests/fetch/api/resources/clean-stash.py: Added.
(main):
* web-platform-tests/fetch/api/resources/inspect-headers.py: Added.
(main):
* web-platform-tests/fetch/api/resources/method.py: Added.
(main):
* web-platform-tests/fetch/api/resources/preflight.py: Added.
(main):
* web-platform-tests/fetch/api/resources/redirect.py: Added.
(main):
* web-platform-tests/fetch/api/resources/top.txt: Added.
* web-platform-tests/fetch/api/resources/trickle.py: Added.
(main):
* web-platform-tests/fetch/api/resources/utils.js: Added.
(catch):
(dirname):
(checkRequest):
(readTextStream):
Source/WebCore:
Added support for Fetch Request and Body.
Body is sharing functionality between Request and Response.
Conversion between various body types are not implemented yet.
Added a FetchOptions class. Options in this class are partially redundant with ResourceLoaderOptions.
Fixing bug in Headers constructor.
Making error reporting in case of modifying headers compliant with the spec.
Reviewed by Darin Adler.
Tests: imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html
imported/w3c/web-platform-tests/fetch/api/request/request-consume.html
imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html
imported/w3c/web-platform-tests/fetch/api/request/request-error.html
imported/w3c/web-platform-tests/fetch/api/request/request-headers.html
imported/w3c/web-platform-tests/fetch/api/request/request-idl.html
imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html
imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html
imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html
imported/w3c/web-platform-tests/fetch/api/request/request-structure.html
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* Modules/fetch/FetchBody.cpp: Added.
(WebCore::FetchBody::initBody):
(WebCore::FetchBody::clear):
(WebCore::FetchBody::processIfEmptyOrDisturbed):
(WebCore::FetchBody::arrayBuffer):
(WebCore::FetchBody::formData):
(WebCore::FetchBody::blob):
(WebCore::FetchBody::text):
(WebCore::FetchBody::json):
* Modules/fetch/FetchBody.h: Added.
(WebCore::FetchBody::~FetchBody):
(WebCore::FetchBody::isEmpty):
(WebCore::FetchBody::isDisturbed):
(WebCore::FetchBody::setDisturbed):
(WebCore::FetchBody::setMimeType):
(WebCore::FetchBody::mimeType):
* Modules/fetch/FetchBody.idl: Added.
* Modules/fetch/FetchHeaders.cpp:
(WebCore::canWriteHeader):
(WebCore::FetchHeaders::append):
(WebCore::FetchHeaders::remove):
(WebCore::FetchHeaders::set):
(WebCore::FetchHeaders::fill): Helper routine implementing https://fetch.spec.whatwg.org/#concept-headers-fill
* Modules/fetch/FetchHeaders.h: Adding header getter/setter for FetchRequest.
(WebCore::FetchHeaders::fastGet):
(WebCore::FetchHeaders::fastSet):
* Modules/fetch/FetchHeaders.js: Fixing bug in constructor (covered by modified headers-basc.html test).
(initializeFetchHeaders):
* Modules/fetch/FetchOptions.h: Added.
(WebCore::FetchOptions::FetchOptions):
(WebCore::FetchOptions::type):
(WebCore::FetchOptions::destination):
(WebCore::FetchOptions::mode):
(WebCore::FetchOptions::credentials):
(WebCore::FetchOptions::cache):
(WebCore::FetchOptions::redirect):
(WebCore::FetchOptions::referrerPolicy):
(WebCore::FetchOptions::setType):
(WebCore::FetchOptions::setDestination):
(WebCore::FetchOptions::setMode):
(WebCore::FetchOptions::setCredentials):
(WebCore::FetchOptions::setCache):
(WebCore::FetchOptions::setRedirect):
(WebCore::FetchOptions::setReferrerPolicy):
* Modules/fetch/FetchRequest.cpp: Added.
(WebCore::FetchRequest::create):
(WebCore::FetchRequest::FetchRequest):
(WebCore::FetchRequest::init):
(WebCore::FetchRequest::setReferrer):
(WebCore::FetchRequest::setReferrerPolicy):
(WebCore::FetchRequest::setMode):
(WebCore::FetchRequest::setCredentials):
(WebCore::FetchRequest::setCache):
(WebCore::FetchRequest::setRedirect):
(WebCore::FetchRequest::type):
(WebCore::FetchRequest::destination):
(WebCore::FetchRequest::referrerPolicy):
(WebCore::FetchRequest::referrer):
(WebCore::FetchRequest::mode):
(WebCore::FetchRequest::credentials):
(WebCore::FetchRequest::cache):
(WebCore::FetchRequest::redirect):
(WebCore::FetchRequest::setMethod):
(WebCore::FetchRequest::clone):
* Modules/fetch/FetchRequest.h: Added.
(WebCore::FetchRequest::method):
(WebCore::FetchRequest::url):
(WebCore::FetchRequest::integrity):
(WebCore::FetchRequest::headers):
* Modules/fetch/FetchRequest.idl: Added.
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/Dictionary.h:
(WebCore::Dictionary::execState):
* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:
(WebCore::JSDictionary::get):
LayoutTests:
Reviewed by Darin Adler.
* js/dom/global-constructors-attributes-dedicated-worker-expected.txt:
* js/dom/global-constructors-attributes-expected.txt:
* platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt:
* platform/efl/js/dom/global-constructors-attributes-expected.txt:
* platform/gtk/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
* platform/win/js/dom/global-constructors-attributes-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheadersbasichtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesdedicatedworkerexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformefljsdomglobalconstructorsattributesdedicatedworkerexpectedtxt">trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeaderscpp">trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeadersh">trunk/Source/WebCore/Modules/fetch/FetchHeaders.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeadersjs">trunk/Source/WebCore/Modules/fetch/FetchHeaders.js</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDictionaryh">trunk/Source/WebCore/bindings/js/Dictionary.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/</li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestclonesubexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestclonesubhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequesterrorexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequesterrorhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestheadersexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestheadershtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestidlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestidlhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit001subexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit001subhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit002expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit002html">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit003subexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit003subhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequeststructureexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequeststructurehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure.html</a></li>
<li>trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/</li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesauthenticationpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/authentication.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcescleanstashpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/clean-stash.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesinspectheaderspy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/inspect-headers.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesmethodpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/method.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcespreflightpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/preflight.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesredirectpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/redirect.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcestoptxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/top.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcestricklepy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/trickle.py</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesutilsjs">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/utils.js</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyidl">trunk/Source/WebCore/Modules/fetch/FetchBody.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchOptionsh">trunk/Source/WebCore/Modules/fetch/FetchOptions.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequesth">trunk/Source/WebCore/Modules/fetch/FetchRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestidl">trunk/Source/WebCore/Modules/fetch/FetchRequest.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/ChangeLog 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] Implement Fetch API Request
+ https://bugs.webkit.org/show_bug.cgi?id=153437
+
+ Reviewed by Darin Adler.
+
+ * js/dom/global-constructors-attributes-dedicated-worker-expected.txt:
+ * js/dom/global-constructors-attributes-expected.txt:
+ * platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt:
+ * platform/efl/js/dom/global-constructors-attributes-expected.txt:
+ * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+ * platform/win/js/dom/global-constructors-attributes-expected.txt:
+
</ins><span class="cx"> 2016-01-31 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Add resize event for HTMLMediaElement
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2016-02-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] Implement Fetch API Request
+ https://bugs.webkit.org/show_bug.cgi?id=153437
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/fetch/api/headers/headers-basic.html:
+ * web-platform-tests/fetch/api/request/request-clone.sub-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-clone.sub.html: Added.
+ * web-platform-tests/fetch/api/request/request-consume-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-consume.html: Added.
+ * web-platform-tests/fetch/api/request/request-disturbed-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-disturbed.html: Added.
+ * web-platform-tests/fetch/api/request/request-error-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-error.html: Added.
+ * web-platform-tests/fetch/api/request/request-headers-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-headers.html: Added.
+ * web-platform-tests/fetch/api/request/request-idl-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-idl.html: Added.
+ * web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-init-001.sub.html: Added.
+ * web-platform-tests/fetch/api/request/request-init-002-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-init-002.html: Added.
+ * web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-init-003.sub.html: Added.
+ * web-platform-tests/fetch/api/request/request-structure-expected.txt: Added.
+ * web-platform-tests/fetch/api/request/request-structure.html: Added.
+ * web-platform-tests/fetch/api/resources/authentication.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/clean-stash.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/inspect-headers.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/method.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/preflight.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/redirect.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/top.txt: Added.
+ * web-platform-tests/fetch/api/resources/trickle.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/resources/utils.js: Added.
+ (catch):
+ (dirname):
+ (checkRequest):
+ (readTextStream):
+
</ins><span class="cx"> 2016-01-31 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Add resize event for HTMLMediaElement
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheadersbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-basic.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> assert_equals(headers.get(name), String(headerDict[name]),
</span><span class="cx"> "name: " + name + " has value: " + headerDict[name]);
</span><span class="cx"> }
</span><ins>+ assert_equals(headers.get("length"), null, "init should be treated as a sequence, not as a dictionary");
</ins><span class="cx"> }, "Create headers with sequence");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestclonesubexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+FAIL Check cloning a request ExpectedValuesDict["headers"].keys is not a function. (In 'ExpectedValuesDict["headers"].keys()', 'ExpectedValuesDict["headers"].keys' is undefined)
+PASS Check cloning a request copies the headers
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestclonesubhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request clone</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ <script src="../resources/utils.js"></script>
+ </head>
+ <body>
+ <script>
+ var headers = new Headers( {"name" : "value"} );
+ var emptyHeaders = new Headers();
+
+ var initValuesDict = {"method" : "POST",
+ "referrer" : "http://{{host}}:{{ports[http][0]}}/",
+ "referrerPolicy" : "origin-only",
+ "mode" : "same-origin",
+ "credentials" : "include",
+ "cache" : "no-cache",
+ "redirect" : "error",
+ "integrity" : "Request's Integrity",
+ "headers" : headers,
+ "body" : "Request's body"
+ };
+
+ var expectedInitialized = {"method" : "POST",
+ "referrer" : "http://{{host}}:{{ports[http][0]}}/",
+ "referrerPolicy" : "origin-only",
+ "mode" : "same-origin",
+ "credentials" : "include",
+ "cache" : "no-cache",
+ "redirect" : "error",
+ "integrity" : "Request's Integrity",
+ "headers" : headers,
+ "body" : "Request's body"
+ };
+
+ test(function() {
+ var RequestInitialized = new Request("", initValuesDict);
+ var requestToCheck = RequestInitialized.clone();
+ checkRequest(requestToCheck, expectedInitialized);
+ }, "Check cloning a request");
+
+ test(function() {
+ var initialRequest = new Request("", {"headers" : new Headers({"a": "1", "b" : "2"})});
+ var request = initialRequest.clone();
+ assert_equals(request.headers.get("a"), "1", "cloned request should have header 'a'");
+ assert_equals(request.headers.get("b"), "2", "cloned request should have header 'b'");
+
+ initialRequest.headers.delete("a");
+ assert_equals(request.headers.get("a"), "1", "cloned request should still have header 'a'");
+
+ request.headers.delete("a");
+ assert_equals(initialRequest.headers.get("b"), "2", "initial request should have header 'b'");
+
+ }, "Check cloning a request copies the headers");
+
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+
+PASS Consume request's body as text
+FAIL Consume request's body as blob promise_test: Unhandled rejection with value: undefined
+PASS Consume request's body as arrayBuffer
+PASS Consume request's body as json
+FAIL Consume request's body as formData promise_test: Unhandled rejection with value: undefined
+PASS Consume JSON from text: '"null"'
+PASS Consume JSON from text: '"1"'
+PASS Consume JSON from text: '"true"'
+PASS Consume JSON from text: '"\"string\""'
+PASS Trying to consume bad JSON text as JSON: 'undefined'
+PASS Trying to consume bad JSON text as JSON: '{'
+PASS Trying to consume bad JSON text as JSON: 'a'
+PASS Trying to consume bad JSON text as JSON: '['
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request consume</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ function checkBodyText(request, expectedBody) {
+ return request.text().then( function(bodyAsText) {
+ assert_equals(bodyAsText, expectedBody, "Retrieve and verify request's body");
+ assert_true(request.bodyUsed, "body as text: bodyUsed turned true");
+ });
+ }
+
+ function checkBodyBlob(request, expectedBody) {
+ return request.blob().then(function(bodyAsBlob) {
+ var promise = new Promise(function (resolve, reject) {
+ var reader = new FileReader();
+ reader.onload = function(evt) {
+ resolve(reader.result)
+ };
+ reader.onerror = function() {
+ reject("Blob's reader failed");
+ };
+ reader.readAsText(bodyAsBlob);
+ });
+ return promise.then(function(body) {
+ assert_equals(body, expectedBody, "Retrieve and verify request's body");
+ assert_true(request.bodyUsed, "body as blob: bodyUsed turned true");
+ });
+ });
+ }
+
+ <!-- Taken from https://developers.google.com -->
+ function str2ab(str) {
+ var buf = new ArrayBuffer(str.length*2); // 2 bytes for each char
+ var bufView = new Uint16Array(buf);
+ for (var i=0, strLen=str.length; i < strLen; i++) {
+ bufView[i] = str.charCodeAt(i);
+ }
+ return buf;
+ }
+
+ function checkBodyArrayBuffer(request, expectedBody) {
+ return request.arrayBuffer().then( function(bodyAsArrayBuffer) {
+ assert_array_equals(bodyAsArrayBuffer, str2ab(expectedBody), "Retrieve and verify request's body");
+ assert_true(request.bodyUsed, "body as arrayBuffer: bodyUsed turned true");
+ });
+ }
+
+ function checkBodyJSON(request, expectedBody) {
+ return request.json().then(function(bodyAsJSON) {
+ var strBody = JSON.stringify(bodyAsJSON)
+ assert_equals(strBody, expectedBody, "Retrieve and verify request's body");
+ assert_true(request.bodyUsed, "body as json: bodyUsed turned true");
+ });
+ }
+
+ function checkBodyFormData(request, expectedBody) {
+ return request.formData().then(function(bodyAsFormData) {
+ assert_true(bodyAsFormData instanceof FormData, "Should receive a FormData");
+ assert_true(request.bodyUsed, "body as formData: bodyUsed turned true");
+ });
+ }
+
+ function checkRequestBody(body, bodyType, checkFunction) {
+ promise_test(function(test) {
+ var request = new Request("", {"method": "POST", "body": body });
+ assert_false(request.bodyUsed, "bodyUsed is false at init");
+ return checkFunction(request, body);
+ }, "Consume request's body as " + bodyType);
+ }
+
+ var formData = new FormData();
+ formData.append("name", "value")
+ checkRequestBody("This is request's body", "text", checkBodyText);
+ checkRequestBody("This is request's body", "blob", checkBodyBlob);
+ checkRequestBody("This is request's body", "arrayBuffer", checkBodyArrayBuffer);
+ checkRequestBody(JSON.stringify("This is request's body"), "json", checkBodyJSON);
+ checkRequestBody(formData, "formData", checkBodyFormData);
+
+ var goodJSONValues = ["null", "1", "true", "\"string\""];
+ goodJSONValues.forEach(function(value) {
+ promise_test(function(test) {
+ var request = new Request("", {"method": "POST", "body": value});
+ return request.json().then(function(v) {
+ assert_equals(v, JSON.parse(value));
+ });
+ }, "Consume JSON from text: '" + JSON.stringify(value) + "'");
+ });
+
+ var badJSONValues = ["undefined", "{", "a", "["];
+ badJSONValues.forEach(function(value) {
+ promise_test(function(test) {
+ var request = new Request("", {"method": "POST", "body": "{"});
+ return promise_rejects(test, new SyntaxError(), request.json());
+ }, "Trying to consume bad JSON text as JSON: '" + value + "'");
+ });
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+PASS Request without body cannot be disturbed
+PASS Check cloning a disturbed request
+PASS Check creating a new request from a disturbed request
+PASS Input request used for creating new request became disturbed
+PASS Check consuming a disturbed request
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request disturbed</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ var initValuesDict = {"method" : "POST",
+ "body" : "Request's body"
+ };
+
+ var noBodyConsumed = new Request("");
+ noBodyConsumed.blob();
+ var bodyConsumed = new Request("", initValuesDict);
+ bodyConsumed.blob();
+
+ test(function() {
+ assert_false(noBodyConsumed.bodyUsed , "bodyUsed is false when request is not disturbed");
+ try {
+ noBodyConsumed.clone();
+ } catch (e) {
+ assert_unreached("Can use request not disturbed for creating or cloning request");
+ }
+ }, "Request without body cannot be disturbed");
+
+ test(function() {
+ assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
+ assert_throws(new TypeError(), function() { bodyConsumed.clone(); });
+ }, "Check cloning a disturbed request");
+
+ test(function() {
+ assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
+ assert_throws(new TypeError(), function() { new Request(bodyConsumed); });
+ }, "Check creating a new request from a disturbed request");
+
+ test(function() {
+ var bodyRequest = new Request("", initValuesDict);
+ assert_false(bodyRequest.bodyUsed , "bodyUsed is false when request is not disturbed");
+ var requestFromRequest = new Request(bodyRequest);
+ assert_true(bodyRequest.bodyUsed , "bodyUsed is true when request is disturbed");
+ }, "Input request used for creating new request became disturbed");
+
+ promise_test(function(test) {
+ assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
+ return promise_rejects(test, new TypeError(), bodyConsumed.blob());
+ }, "Check consuming a disturbed request");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequesterrorexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+
+PASS RequestInit's window is not null
+PASS Input URL is not valid
+PASS Input URL has credentials
+PASS RequestInit's mode is navigate
+PASS RequestInit's referrer is invalid
+PASS RequestInit's referrer has invalid origin
+PASS RequestInit's method is invalid
+PASS RequestInit's method is forbidden
+PASS RequestInit's mode is no-cors and method is not simple
+PASS RequestInit's mode is no-cors and integrity is not empty
+PASS Bad referrerPolicy init parameter value
+PASS Bad mode init parameter value
+PASS Bad credentials init parameter value
+PASS Bad cache init parameter value
+PASS Bad redirect init parameter value
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequesterrorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-error.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request error</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="help" href="https://fetch.spec.whatwg.org/#body-mixin">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"window" : "whatever"}); },
+ "Expect TypeError exception");
+ },"RequestInit's window is not null");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("http://:not a valid URL"); },
+ "Expect TypeError exception");
+ },"Input URL is not valid")
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("http://user:pass@test.url"); },
+ "Expect TypeError exception");
+ },"Input URL has credentials");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"mode" : "navigate"}); },
+ "Expect TypeError exception");
+ },"RequestInit's mode is navigate");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"referrer" : "http://:not a valid URL"}); },
+ "Expect TypeError exception");
+ },"RequestInit's referrer is invalid");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"referrer" : "http://test.url"}); },
+ "Expect TypeError exception");
+ },"RequestInit's referrer has invalid origin")
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"method" : "IN VALID"}); },
+ "Expect TypeError exception");
+ }, "RequestInit's method is invalid");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"method" : "TRACE"}); },
+ "Expect TypeError exception");
+ }, "RequestInit's method is forbidden");
+
+ test(function() {
+ assert_throws(new TypeError() , function() { new Request("", {"mode" : "no-cors", "method" : "PUT"}); },
+ "Expect TypeError exception");
+ },"RequestInit's mode is no-cors and method is not simple");
+
+ test(function() {
+ assert_throws(new TypeError() ,
+ function() { new Request("", {"mode" : "no-cors", "integrity" : "not an empty string"}); },
+ "Expect TypeError exception");
+ },"RequestInit's mode is no-cors and integrity is not empty");
+
+ var parameters = ["referrerPolicy", "mode", "credentials", "cache", "redirect"];
+ parameters.forEach(function(parameter) {
+ test(function() {
+ var options = { };
+ options[parameter] = "BAD";
+ assert_throws(new TypeError(), () => new Request("", options));
+ },"Bad " + parameter +" init parameter value");
+ });
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestheadersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+
+PASS Adding valid request header "Content-Type: OK"
+PASS Adding valid request header "Potato: OK"
+PASS Adding valid request header "proxy: OK"
+PASS Adding valid request header "proxya: OK"
+PASS Adding valid request header "sec: OK"
+PASS Adding valid request header "secb: OK"
+PASS Adding invalid request header "Accept-Charset: KO"
+PASS Adding invalid request header "accept-charset: KO"
+PASS Adding invalid request header "ACCEPT-ENCODING: KO"
+PASS Adding invalid request header "Accept-Encoding: KO"
+PASS Adding invalid request header "Access-Control-Request-Headers: KO"
+PASS Adding invalid request header "Access-Control-Request-Method: KO"
+PASS Adding invalid request header "Connection: KO"
+PASS Adding invalid request header "Content-Length: KO"
+PASS Adding invalid request header "Cookie: KO"
+PASS Adding invalid request header "Cookie2: KO"
+PASS Adding invalid request header "Date: KO"
+PASS Adding invalid request header "DNT: KO"
+PASS Adding invalid request header "Expect: KO"
+PASS Adding invalid request header "Host: KO"
+PASS Adding invalid request header "Keep-Alive: KO"
+PASS Adding invalid request header "Origin: KO"
+PASS Adding invalid request header "Referer: KO"
+PASS Adding invalid request header "TE: KO"
+PASS Adding invalid request header "Trailer: KO"
+PASS Adding invalid request header "Transfer-Encoding: KO"
+PASS Adding invalid request header "Upgrade: KO"
+PASS Adding invalid request header "Via: KO"
+PASS Adding invalid request header "Proxy-: KO"
+PASS Adding invalid request header "proxy-a: KO"
+PASS Adding invalid request header "Sec-: KO"
+PASS Adding invalid request header "sec-b: KO"
+PASS Adding valid no-cors request header "Accept: OK"
+PASS Adding valid no-cors request header "Accept-Language: OK"
+PASS Adding valid no-cors request header "content-language: OK"
+PASS Adding valid no-cors request header "content-type: application/x-www-form-urlencoded"
+PASS Adding valid no-cors request header "content-type: application/x-www-form-urlencoded;charset=UTF-8"
+PASS Adding valid no-cors request header "content-type: multipart/form-data"
+PASS Adding valid no-cors request header "content-type: multipart/form-data;charset=UTF-8"
+PASS Adding valid no-cors request header "content-TYPE: text/plain"
+PASS Adding valid no-cors request header "CONTENT-type: text/plain;charset=UTF-8"
+PASS Adding invalid no-cors request header "Content-Type: KO"
+PASS Adding invalid no-cors request header "Potato: KO"
+PASS Adding invalid no-cors request header "proxy: KO"
+PASS Adding invalid no-cors request header "proxya: KO"
+PASS Adding invalid no-cors request header "sec: KO"
+PASS Adding invalid no-cors request header "secb: KO"
+PASS Check that request constructor is filtering headers provided as init parameter
+PASS Check that no-cors request constructor is filtering headers provided as init parameter
+PASS Check that no-cors request constructor is filtering headers provided as part of request parameter
+PASS Request should get its content-type from the init request
+PASS Request should not get its content-type from the init request if init headers are provided
+PASS Request should get its content-type from the body if none is provided
+PASS Request should get its content-type from init headers if one is provided
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestheadershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-headers.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,150 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request Headers</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ var validRequestHeaders = [
+ ["Content-Type", "OK"],
+ ["Potato", "OK"],
+ ["proxy", "OK"],
+ ["proxya", "OK"],
+ ["sec", "OK"],
+ ["secb", "OK"],
+ ];
+ var invalidRequestHeaders = [
+ ["Accept-Charset", "KO"],
+ ["accept-charset", "KO"],
+ ["ACCEPT-ENCODING", "KO"],
+ ["Accept-Encoding", "KO"],
+ ["Access-Control-Request-Headers", "KO"],
+ ["Access-Control-Request-Method", "KO"],
+ ["Connection", "KO"],
+ ["Content-Length", "KO"],
+ ["Cookie", "KO"],
+ ["Cookie2", "KO"],
+ ["Date", "KO"],
+ ["DNT", "KO"],
+ ["Expect", "KO"],
+ ["Host", "KO"],
+ ["Keep-Alive", "KO"],
+ ["Origin", "KO"],
+ ["Referer", "KO"],
+ ["TE", "KO"],
+ ["Trailer", "KO"],
+ ["Transfer-Encoding", "KO"],
+ ["Upgrade", "KO"],
+ ["Via", "KO"],
+ ["Proxy-", "KO"],
+ ["proxy-a", "KO"],
+ ["Sec-", "KO"],
+ ["sec-b", "KO"],
+ ];
+
+ var validRequestNoCorsHeaders = [
+ ["Accept", "OK"],
+ ["Accept-Language", "OK"],
+ ["content-language", "OK"],
+ ["content-type", "application/x-www-form-urlencoded"],
+ ["content-type", "application/x-www-form-urlencoded;charset=UTF-8"],
+ ["content-type", "multipart/form-data"],
+ ["content-type", "multipart/form-data;charset=UTF-8"],
+ ["content-TYPE", "text/plain"],
+ ["CONTENT-type", "text/plain;charset=UTF-8"],
+ ];
+ var invalidRequestNoCorsHeaders = [
+ ["Content-Type", "KO"],
+ ["Potato", "KO"],
+ ["proxy", "KO"],
+ ["proxya", "KO"],
+ ["sec", "KO"],
+ ["secb", "KO"],
+ ];
+
+ validRequestHeaders.forEach(function(header) {
+ test(function() {
+ var request = new Request("");
+ request.headers.set(header[0], header[1]);
+ assert_equals(request.headers.get(header[0]), header[1]);
+ }, "Adding valid request header \"" + header[0] + ": " + header[1] + "\"");
+ });
+ invalidRequestHeaders.forEach(function(header) {
+ test(function() {
+ var request = new Request("");
+ request.headers.set(header[0], header[1]);
+ assert_equals(request.headers.get(header[0]), null);
+ }, "Adding invalid request header \"" + header[0] + ": " + header[1] + "\"");
+ });
+
+ validRequestNoCorsHeaders.forEach(function(header) {
+ test(function() {
+ var requestNoCors = new Request("", {"mode": "no-cors"});
+ requestNoCors.headers.set(header[0], header[1]);
+ assert_equals(requestNoCors.headers.get(header[0]), header[1]);
+ }, "Adding valid no-cors request header \"" + header[0] + ": " + header[1] + "\"");
+ });
+ invalidRequestNoCorsHeaders.forEach(function(header) {
+ test(function() {
+ var requestNoCors = new Request("", {"mode": "no-cors"});
+ requestNoCors.headers.set(header[0], header[1]);
+ assert_equals(requestNoCors.headers.get(header[0]), null);
+ }, "Adding invalid no-cors request header \"" + header[0] + ": " + header[1] + "\"");
+ });
+
+ test(function() {
+ var headers = new Headers([["Cookie2", "potato"]]);
+ var request = new Request("", {"headers": headers});
+ assert_equals(request.headers.get("Cookie2"), null);
+ }, "Check that request constructor is filtering headers provided as init parameter");
+
+ test(function() {
+ var headers = new Headers([["Content-Type", "potato"]]);
+ var request = new Request("", {"headers": headers, "mode": "no-cors"});
+ assert_equals(request.headers.get("Content-Type"), null);
+ }, "Check that no-cors request constructor is filtering headers provided as init parameter");
+
+ test(function() {
+ var headers = new Headers([["Content-Type", "potato"]]);
+ var initialRequest = new Request("", {"headers": headers});
+ var request = new Request(initialRequest, {"mode": "no-cors"});
+ assert_equals(request.headers.get("Content-Type"), null);
+ }, "Check that no-cors request constructor is filtering headers provided as part of request parameter");
+
+ test(function() {
+ var initialHeaders = new Headers([["Content-Type", "potato"]]);
+ var initialRequest = new Request("", {"headers" : initialHeaders});
+ var request = new Request(initialRequest);
+ assert_equals(request.headers.get("Content-Type"), "potato");
+ }, "Request should get its content-type from the init request");
+
+ test(function() {
+ var initialHeaders = new Headers([["Content-Type", "potato"]]);
+ var initialRequest = new Request("", {"headers" : initialHeaders});
+ var headers = new Headers([]);
+ var request = new Request(initialRequest, {"headers" : headers});
+ assert_false(request.headers.has("Content-Type"));
+ }, "Request should not get its content-type from the init request if init headers are provided");
+
+ test(function() {
+ var initialHeaders = new Headers([["Content-Type-Extra", "potato"]]);
+ var initialRequest = new Request("", {"headers" : initialHeaders, "body" : "this is my plate", "method" : "POST"});
+ var request = new Request(initialRequest);
+ assert_equals(request.headers.get("Content-Type"), "text/plain;charset=UTF-8");
+ }, "Request should get its content-type from the body if none is provided");
+
+ test(function() {
+ var initialHeaders = new Headers([["Content-Type", "potato"]]);
+ var initialRequest = new Request("", {"headers" : initialHeaders, "body" : "this is my plate", "method" : "POST"});
+ var request = new Request(initialRequest);
+ assert_equals(request.headers.get("Content-Type"), "potato");
+ }, "Request should get its content-type from init headers if one is provided");
+
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestidlexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+
+FAIL Request interface: existence and properties of interface object assert_equals: class string of Request expected "[object Function]" but got "[object RequestConstructor]"
+PASS Request interface object length
+PASS Request interface object name
+PASS Request interface: existence and properties of interface prototype object
+PASS Request interface: existence and properties of interface prototype object's "constructor" property
+FAIL Request interface: attribute method assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute url assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute headers assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute type assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute destination assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute referrer assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute referrerPolicy assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute mode assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute credentials assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute cache assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute redirect assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: attribute integrity assert_equals: getter must be Function expected "function" but got "undefined"
+PASS Request interface: operation clone()
+FAIL Request interface: attribute bodyUsed assert_equals: getter must be Function expected "function" but got "undefined"
+FAIL Request interface: operation arrayBuffer() assert_throws: calling operation with this = null didn't throw TypeError function "function () {
+ memberHolderObject[member.n..." did not throw
+FAIL Request interface: operation blob() assert_throws: calling operation with this = null didn't throw TypeError function "function () {
+ memberHolderObject[member.n..." did not throw
+FAIL Request interface: operation formData() assert_throws: calling operation with this = null didn't throw TypeError function "function () {
+ memberHolderObject[member.n..." did not throw
+FAIL Request interface: operation json() assert_throws: calling operation with this = null didn't throw TypeError function "function () {
+ memberHolderObject[member.n..." did not throw
+FAIL Request interface: operation text() assert_throws: calling operation with this = null didn't throw TypeError function "function () {
+ memberHolderObject[member.n..." did not throw
+PASS Request must be primary interface of new Request("")
+PASS Stringification of new Request("")
+PASS Request interface: new Request("") must inherit property "method" with the proper type (0)
+PASS Request interface: new Request("") must inherit property "url" with the proper type (1)
+PASS Request interface: new Request("") must inherit property "headers" with the proper type (2)
+PASS Request interface: new Request("") must inherit property "type" with the proper type (3)
+PASS Request interface: new Request("") must inherit property "destination" with the proper type (4)
+PASS Request interface: new Request("") must inherit property "referrer" with the proper type (5)
+FAIL Request interface: new Request("") must inherit property "referrerPolicy" with the proper type (6) Unrecognized type ReferrerPolicy
+PASS Request interface: new Request("") must inherit property "mode" with the proper type (7)
+PASS Request interface: new Request("") must inherit property "credentials" with the proper type (8)
+PASS Request interface: new Request("") must inherit property "cache" with the proper type (9)
+PASS Request interface: new Request("") must inherit property "redirect" with the proper type (10)
+PASS Request interface: new Request("") must inherit property "integrity" with the proper type (11)
+PASS Request interface: new Request("") must inherit property "clone" with the proper type (12)
+PASS Request interface: new Request("") must inherit property "bodyUsed" with the proper type (13)
+PASS Request interface: new Request("") must inherit property "arrayBuffer" with the proper type (14)
+PASS Request interface: new Request("") must inherit property "blob" with the proper type (15)
+PASS Request interface: new Request("") must inherit property "formData" with the proper type (16)
+PASS Request interface: new Request("") must inherit property "json" with the proper type (17)
+PASS Request interface: new Request("") must inherit property "text" with the proper type (18)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestidlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-idl.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request idl interface</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#response">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ <script src="/resources/WebIDLParser.js"></script>
+ <script src="/resources/idlharness.js"></script>
+ </head>
+ <body>
+ <script id="body-idl" type="text/plain">
+ typedef any JSON;
+ typedef (Blob or BufferSource or FormData or URLSearchParams or USVString) BodyInit;
+
+ [NoInterfaceObject,
+ Exposed=(Window,Worker)]
+ interface Body {
+ readonly attribute boolean bodyUsed;
+ [NewObject] Promise<ArrayBuffer> arrayBuffer();
+ [NewObject] Promise<Blob> blob();
+ [NewObject] Promise<FormData> formData();
+ [NewObject] Promise<JSON> json();
+ [NewObject] Promise<USVString> text();
+ };
+ </script>
+ <script id="request-idl" type="text/plain">
+ typedef (Request or USVString) RequestInfo;
+
+ [Constructor(RequestInfo input, optional RequestInit init),
+ Exposed=(Window,Worker)]
+ interface Request {
+ readonly attribute ByteString method;
+ readonly attribute USVString url;
+ [SameObject] readonly attribute Headers headers;
+
+ readonly attribute RequestType type;
+ readonly attribute RequestDestination destination;
+ readonly attribute USVString referrer;
+ readonly attribute ReferrerPolicy referrerPolicy;
+ readonly attribute RequestMode mode;
+ readonly attribute RequestCredentials credentials;
+ readonly attribute RequestCache cache;
+ readonly attribute RequestRedirect redirect;
+ readonly attribute DOMString integrity;
+
+ [NewObject] Request clone();
+ };
+ Request implements Body;
+
+ dictionary RequestInit {
+ ByteString method;
+ HeadersInit headers;
+ BodyInit? body;
+ USVString referrer;
+ ReferrerPolicy referrerPolicy;
+ RequestMode mode;
+ RequestCredentials credentials;
+ RequestCache cache;
+ RequestRedirect redirect;
+ DOMString integrity;
+ any window; // can only be set to null
+ };
+
+ enum RequestType { "", "audio", "font", "image", "script", "style", "track", "video" };
+ enum RequestDestination { "", "document", "sharedworker", "subresource", "unknown", "worker" };
+ enum RequestMode { "navigate", "same-origin", "no-cors", "cors" };
+ enum RequestCredentials { "omit", "same-origin", "include" };
+ enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" };
+ enum RequestRedirect { "follow", "error", "manual" };
+ </script>
+ <script>
+ var idlsArray = new IdlArray();
+ var idl = document.getElementById("body-idl").innerHTML
+ idl += document.getElementById("request-idl").innerHTML
+
+ idlsArray.add_idls(idl);
+ idlsArray.add_untested_idls("interface Headers {};");
+ idlsArray.add_objects({ Request: ['new Request("")'] });
+ idlsArray.test();
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit001subexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+
+PASS Check method init value of GET and associated getter
+PASS Check method init value of HEAD and associated getter
+PASS Check method init value of POST and associated getter
+PASS Check method init value of PUT and associated getter
+PASS Check method init value of DELETE and associated getter
+PASS Check method init value of OPTIONS and associated getter
+PASS Check method init value of head and associated getter
+PASS Check referrer init value of /relative/ressource and associated getter
+PASS Check referrer init value of http://localhost:8800/relative/ressource?query=true#fragment and associated getter
+PASS Check referrer init value of http://localhost:8800/ and associated getter
+PASS Check referrer init value of and associated getter
+PASS Check referrerPolicy init value of and associated getter
+PASS Check referrerPolicy init value of no-referrer and associated getter
+PASS Check referrerPolicy init value of no-referrer-when-downgrade and associated getter
+PASS Check referrerPolicy init value of origin-only and associated getter
+PASS Check referrerPolicy init value of origin-when-cross-origin and associated getter
+PASS Check referrerPolicy init value of unsafe-url and associated getter
+PASS Check mode init value of same-origin and associated getter
+PASS Check mode init value of no-cors and associated getter
+PASS Check mode init value of cors and associated getter
+PASS Check credentials init value of omit and associated getter
+PASS Check credentials init value of same-origin and associated getter
+PASS Check credentials init value of include and associated getter
+PASS Check cache init value of default and associated getter
+PASS Check cache init value of no-store and associated getter
+PASS Check cache init value of reload and associated getter
+PASS Check cache init value of no-cache and associated getter
+PASS Check cache init value of force-cache and associated getter
+PASS Check redirect init value of follow and associated getter
+PASS Check redirect init value of error and associated getter
+PASS Check redirect init value of manual and associated getter
+PASS Check integrity init value of and associated getter
+PASS Check integrity init value of AZERTYUIOP1234567890 and associated getter
+PASS Check window init value of null and associated getter
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit001subhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request init: simple cases</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ var methods = {"givenValues" : ["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "head"],
+ "expectedValues" : ["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "HEAD"]
+ };
+ var referrers = {"givenValues" : ["/relative/ressource",
+ "http://{{host}}:{{ports[http][0]}}/relative/ressource?query=true#fragment",
+ "http://{{host}}:{{ports[http][0]}}/",
+ ""
+ ],
+ "expectedValues" : ["http://{{host}}:{{ports[http][0]}}/relative/ressource",
+ "http://{{host}}:{{ports[http][0]}}/relative/ressource?query=true#fragment",
+ "http://{{host}}:{{ports[http][0]}}/",
+ ""
+ ]
+ };
+ var referrerPolicies = {"givenValues" : [ "",
+ "no-referrer",
+ "no-referrer-when-downgrade",
+ "origin-only",
+ "origin-when-cross-origin",
+ "unsafe-url"
+ ],
+ "expectedValues" : ["",
+ "no-referrer",
+ "no-referrer-when-downgrade",
+ "origin-only",
+ "origin-when-cross-origin",
+ "unsafe-url"
+ ]
+ };
+ var modes = {"givenValues" : ["same-origin", "no-cors", "cors"],
+ "expectedValues" : ["same-origin", "no-cors", "cors"]
+ };
+ var credentials = {"givenValues" : ["omit", "same-origin", "include"],
+ "expectedValues" : ["omit", "same-origin", "include"]
+ };
+ var caches = {"givenValues" : [ "default", "no-store", "reload", "no-cache", "force-cache"],
+ "expectedValues" : [ "default", "no-store", "reload", "no-cache", "force-cache"]
+ };
+ var redirects = {"givenValues" : ["follow", "error", "manual"],
+ "expectedValues" : ["follow", "error", "manual"]
+ };
+ var integrities = {"givenValues" : ["", "AZERTYUIOP1234567890" ],
+ "expectedValues" : ["", "AZERTYUIOP1234567890"]
+ };
+
+ //there is no getter for window, init's window might be null
+ var windows = {"givenValues" : [ null ],
+ "expectedValues" : [undefined]
+ };
+
+ var initValuesDict = { "method" : methods,
+ "referrer" : referrers,
+ "referrerPolicy" : referrerPolicies,
+ "mode" : modes,
+ "credentials" : credentials,
+ "cache" : caches,
+ "redirect" : redirects,
+ "integrity" : integrities,
+ "window" : windows
+ };
+
+ for (var attributeName in initValuesDict) {
+ var valuesToTest = initValuesDict[attributeName];
+ for (var valueIdx in valuesToTest["givenValues"]) {
+ var givenValue = valuesToTest["givenValues"][valueIdx];
+ var expectedValue = valuesToTest["expectedValues"][valueIdx];
+ test(function() {
+ var requestInit = {};
+ requestInit[attributeName] = givenValue
+ var request = new Request("", requestInit);
+ assert_equals(request[attributeName], expectedValue,
+ "Expect request's " + attributeName + " is " + expectedValue + " when initialized with " + givenValue);
+ }, "Check " + attributeName + " init value of " + givenValue + " and associated getter");
+ }
+ }
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit002expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+PASS Initialize Request with headers values
+FAIL Initialize Request's body with application/octet-binary promise_test: Unhandled rejection with value: undefined
+FAIL Initialize Request's body with multipart/form-data promise_test: Unhandled rejection with value: undefined
+PASS Initialize Request's body with text/plain;charset=UTF-8
+FAIL Initialize Request's body with application/x-www-form-urlencoded;charset=UTF-8 promise_test: Unhandled rejection with value: "URLSearchParams not supported"
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request init: headers and body</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ test(function() {
+ var headerDict = {"name1": "value1",
+ "name2": "value2",
+ "name3": "value3"
+ };
+ var headers = new Headers(headerDict);
+ var request = new Request("", { "headers" : headers })
+ for (var name in headerDict) {
+ assert_equals(request.headers.get(name), headerDict[name],
+ "request's headers has " + name + " : " + headerDict[name]);
+ }
+ }, "Initialize Request with headers values");
+
+ function checkRequestInit(body, bodyType, expectedTextBody) {
+ promise_test(function(test) {
+ var request = new Request("", {"method": "POST", "body": body});
+ assert_throws(new TypeError(),
+ function() { new Request("", {"method": "GET", "body": body}); }
+ );
+ assert_throws(new TypeError(),
+ function() { new Request("", {"method": "HEAD", "body": body}); }
+ );
+ var reqHeaders = request.headers;
+ var mime = reqHeaders.get("Content-Type");
+ assert_true(mime && mime.search(bodyType) > -1, "Content-Type header should be \"" + bodyType + "\", not \"" + mime + "\"");
+ return request.text().then(function(bodyAsText) {
+ //not equals: cannot guess formData exact value
+ assert_true( bodyAsText.search(expectedTextBody) > -1, "Retrieve and verify request body");
+ });
+ }, "Initialize Request's body with " + bodyType);
+ }
+
+ var blob = new Blob(["This is a blob"], {type: "application/octet-binary"});
+ var formaData = new FormData();
+ formaData.append("name", "value");
+ var usvString = "This is a USVString"
+
+ checkRequestInit(blob, "application/octet-binary", "This is a blob");
+ checkRequestInit(formaData, "multipart/form-data", "name=\"name\"\r\n\r\nvalue");
+ checkRequestInit(usvString, "text/plain;charset=UTF-8", "This is a USVString");
+
+ // Ensure test does not time out in case of missing URLSearchParams support.
+ if (window.URLSearchParams) {
+ var urlSearchParams = new URLSearchParams("name=value");
+ checkRequestInit(urlSearchParams, "application/x-www-form-urlencoded;charset=UTF-8", "name=value");
+ } else {
+ promise_test(function(test) {
+ return Promise.reject("URLSearchParams not supported");
+ }, "Initialize Request's body with application/x-www-form-urlencoded;charset=UTF-8");
+ }
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit003subexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+FAIL Check request values when initialized from Request ExpectedValuesDict["headers"].keys is not a function. (In 'ExpectedValuesDict["headers"].keys()', 'ExpectedValuesDict["headers"].keys' is undefined)
+FAIL Check request values when initialized from Request and init values ExpectedValuesDict["headers"].keys is not a function. (In 'ExpectedValuesDict["headers"].keys()', 'ExpectedValuesDict["headers"].keys' is undefined)
+FAIL Check request values when initialized from url string assert_equals: Check url attribute expected "http://url.test:1234/path/subpath?query=true" but got "http://url.test:1234/path/subpath?query=true#fragment"
+FAIL Check request values when initialized from url and init values ExpectedValuesDict["headers"].keys is not a function. (In 'ExpectedValuesDict["headers"].keys()', 'ExpectedValuesDict["headers"].keys' is undefined)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestinit003subhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request: init with request or url</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="help" href="https://url.spec.whatwg.org/#concept-url-serializer">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script src="../resources/utils.js"></script>
+ <script>
+ var headers = new Headers( {"name":"value"} );
+ var emptyHeaders = new Headers();
+
+ var initValuesDict = {"method" : "POST",
+ "referrer" : "http://{{host}}:{{ports[http][0]}}/",
+ "referrerPolicy" : "origin-only",
+ "mode" : "same-origin",
+ "credentials" : "include",
+ "cache" : "no-cache",
+ "redirect" : "error",
+ "integrity" : "Request's Integrity",
+ "headers" : headers,
+ "body" : "Request's body"
+ };
+
+ var expectedInitialized = {"method" : "POST",
+ "referrer" : "http://{{host}}:{{ports[http][0]}}/",
+ "referrerPolicy" : "origin-only",
+ "mode" : "same-origin",
+ "credentials" : "include",
+ "cache" : "no-cache",
+ "redirect" : "error",
+ "integrity" : "Request's Integrity",
+ "headers" : headers,
+ "body" : "Request's body"
+ };
+
+ var expectedDefault = {"method" : "GET",
+ "url" : location.ref,
+ "referrer" : "http://{{host}}:{{ports[http][0]}}/",
+ "referrerPolicy" : "",
+ "mode" : "cors",
+ "credentials" : "omit",
+ "cache" : "default",
+ "redirect" : "follow",
+ "integrity" : "",
+ "headers" : emptyHeaders
+ };
+
+ var RequestDefault = new Request("");
+ var RequestInitialized = new Request("", initValuesDict);
+
+ test(function() {
+ var requestToCheck = new Request(RequestInitialized);
+ checkRequest(requestToCheck, expectedInitialized);
+ }, "Check request values when initialized from Request");
+
+ test(function() {
+ var requestToCheck = new Request(RequestDefault, initValuesDict);
+ checkRequest(requestToCheck, expectedInitialized);
+ }, "Check request values when initialized from Request and init values");
+
+ test(function() {
+ var url = "http://url.test:1234/path/subpath?query=true";
+ expectedDefault["url"] = url;
+ url += "#fragment";
+ var requestToCheck = new Request(url);
+ checkRequest(requestToCheck, expectedDefault);
+ }, "Check request values when initialized from url string");
+
+ test(function() {
+ var url = "http://url.test:1234/path/subpath?query=true";
+ expectedInitialized["url"] = url;
+ url += "#fragment";
+ var requestToCheck = new Request(url , initValuesDict);
+ checkRequest(requestToCheck, expectedInitialized);
+ }, "Check request values when initialized from url and init values");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequeststructureexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure-expected.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+
+PASS Request has clone method
+PASS Request has arrayBuffer method
+PASS Request has blob method
+PASS Request has formData method
+PASS Request has json method
+PASS Request has text method
+PASS Check method attribute
+PASS Check url attribute
+PASS Check headers attribute
+PASS Check type attribute
+PASS Check destination attribute
+PASS Check referrer attribute
+PASS Check referrerPolicy attribute
+PASS Check mode attribute
+PASS Check credentials attribute
+PASS Check cache attribute
+PASS Check redirect attribute
+PASS Check integrity attribute
+PASS Check bodyUsed attribute
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequeststructurehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure.html (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-structure.html 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,134 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Request structure</title>
+ <meta name="help" href="https://fetch.spec.whatwg.org/#request">
+ <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+ var request = new Request("");
+ var methods = ["clone",
+ //Request implements Body
+ "arrayBuffer",
+ "blob",
+ "formData",
+ "json",
+ "text"
+ ];
+ var attributes = ["method",
+ "url",
+ "headers",
+ "type",
+ "destination",
+ "referrer",
+ "referrerPolicy",
+ "mode",
+ "credentials",
+ "cache",
+ "redirect",
+ "integrity",
+ //Request implements Body
+ "bodyUsed"
+ ];
+
+ function IsreadOnly(request, attributeToCheck) {
+ var defaultValue = undefined;
+ var newValue = undefined;
+ switch (attributeToCheck) {
+ case "method":
+ defaultValue = "GET";
+ newValue = "POST";
+ break;
+
+ case "url":
+ //default value is base url
+ //i.e http://web-platform.test:8000/fetch/api/request-structure.html
+ newValue = "http://url.test";
+ break;
+
+ case "headers":
+ request.headers = new Headers ({"name":"value"});
+ assert_false(request.headers.has("name"), "Headers attribute is read only");
+ return;
+ break;
+
+ case "type":
+ defaultValue = "";
+ newValue = "style";
+ break;
+
+ case "destination":
+ defaultValue = "";
+ newValue = "worker";
+ break;
+
+ case "referrer":
+ defaultValue = "about:client";
+ newValue = "http://url.test";
+ break;
+
+ case "referrerPolicy":
+ defaultValue = "";
+ newValue = "unsafe-url";
+ break;
+
+ case "mode":
+ defaultValue = "cors";
+ newValue = "navigate";
+ break;
+
+ case "credentials":
+ defaultValue = "omit";
+ newValue = "cors";
+ break;
+
+ case "cache":
+ defaultValue = "default";
+ newValue = "reload";
+ break;
+
+ case "redirect":
+ defaultValue = "follow";
+ newValue = "manual";
+ break;
+
+ case "integrity":
+ newValue = "CannotWriteIntegrity";
+ break;
+
+ case "bodyUsed":
+ defaultValue = false;
+ newValue = true;
+ break;
+
+ default:
+ return;
+ }
+
+ request[attributeToCheck] = newValue;
+ if (defaultValue === undefined)
+ assert_not_equals(request[attributeToCheck], newValue, "Attribute " + attributeToCheck + " is read only");
+ else
+ assert_equals(request[attributeToCheck], defaultValue,
+ "Attribute " + attributeToCheck + " is read only. Default value is " + defaultValue);
+ }
+
+ for (var idx in methods) {
+ test(function() {
+ assert_true(methods[idx] in request, "request has " + methods[idx] + " method");
+ }, "Request has " + methods[idx] + " method");
+ }
+
+ for (var idx in attributes) {
+ test(function() {
+ assert_true(attributes[idx] in request, "request has " + attributes[idx] + " attribute");
+ IsreadOnly(request, attributes[idx]);
+ }, "Check " + attributes[idx] + " attribute");
+ }
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesauthenticationpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/authentication.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/authentication.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/authentication.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+def main(request, response):
+ user = request.auth.username
+ password = request.auth.password
+
+ if user == "user" and password == "password":
+ return "Authentication done"
+
+ realm = "test"
+ if "realm" in request.GET:
+ realm = request.GET.first("realm")
+
+ return ((401, "Unauthorized"),
+ [("WWW-Authenticate", 'Basic realm="' + realm + '"')],
+ "Please login with credentials 'user' and 'password'")
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcescleanstashpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/clean-stash.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/clean-stash.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/clean-stash.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+def main(request, response):
+ token = request.GET.first("token")
+ if request.server.stash.take(token) is not None:
+ return "1"
+ else:
+ return "0"
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesinspectheaderspy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/inspect-headers.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/inspect-headers.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/inspect-headers.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+def main(request, response):
+ headers = []
+ request_headers = []
+ if "headers" in request.GET:
+ checked_headers = request.GET.first("headers").split("|")
+ for header in checked_headers:
+ if header in request.headers:
+ headers.append(("x-request-" + header, request.headers.get(header, "") ))
+
+ if "cors" in request.GET:
+ if "Origin" in request.headers:
+ headers.append(("Access-Control-Allow-Origin", request.headers.get("Origin", "")))
+ else:
+ headers.append(("Access-Control-Allow-Origin", "*"))
+ headers.append(("Access-Control-Allow-Credentials", "true"))
+ headers.append(("Access-Control-Allow-Methods", "GET, POST, HEAD"))
+ exposed_headers = ["x-request-" + header for header in checked_headers]
+ headers.append(("Access-Control-Expose-Headers", ", ".join(exposed_headers)))
+ headers.append(("Access-Control-Allow-Headers", ", ".join(request.headers)))
+
+ headers.append(("content-type", "text/plain"))
+ return headers, ""
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesmethodpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/method.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/method.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/method.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+def main(request, response):
+ headers = []
+ if "cors" in request.GET:
+ headers.append(("Access-Control-Allow-Origin", "*"))
+ headers.append(("Access-Control-Allow-Credentials", "true"))
+ headers.append(("Access-Control-Allow-Methods", "GET, POST, PUT, FOO"))
+ headers.append(("Access-Control-Allow-Headers", "x-test, x-foo"))
+ headers.append(("Access-Control-Expose-Headers", "x-request-method"))
+
+ headers.append(("x-request-method", request.method))
+ return headers, ""
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcespreflightpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/preflight.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/preflight.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/preflight.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+def main(request, response):
+ headers = [("Content-Type", "text/plain")]
+ stashed_data = {'control_request_headers': "", 'preflight': "0", 'preflight_referrer': ""}
+
+ if "origin" in request.GET:
+ for origin in request.GET['origin'].split(", "):
+ headers.append(("Access-Control-Allow-Origin", origin))
+ else:
+ headers.append(("Access-Control-Allow-Origin", "*"))
+
+ if request.method == "OPTIONS":
+ if not "Access-Control-Request-Method" in request.headers:
+ response.set_error(400, "No Access-Control-Request-Method header")
+ return "ERROR: No access-control-request-method in preflight!"
+
+ if "control_request_headers" in request.GET:
+ stashed_data['control_request_headers'] = request.headers.get("Access-Control-Request-Headers", "")
+
+ if "max_age" in request.GET:
+ headers.append(("Access-Control-Max-Age", request.GET['max_age']))
+
+ if "allow_headers" in request.GET:
+ headers.append(("Access-Control-Allow-Headers", request.GET['allow_headers']))
+
+ if "allow_methods" in request.GET:
+ headers.append(("Access-Control-Allow-Methods", request.GET['allow_methods']))
+
+ preflight_status = 200
+ if "preflight_status" in request.GET:
+ preflight_status = int(request.GET.first("preflight_status"))
+
+ stashed_data['preflight'] = "1"
+ stashed_data['preflight_referrer'] = request.headers.get("Referer", "")
+ request.server.stash.put(request.GET.first("token"), stashed_data)
+
+ return preflight_status, headers, ""
+
+ token = None
+ if "token" in request.GET:
+ token = request.GET.first("token")
+ data = request.server.stash.take(token)
+ if data:
+ stashed_data = data
+
+ #use x-* headers for returning value to bodyless responses
+ headers.append(("Access-Control-Expose-Headers", "x-did-preflight, x-control-request-headers, x-referrer, x-preflight-referrer, x-origin"))
+ headers.append(("x-did-preflight", stashed_data['preflight']))
+ headers.append(("x-control-request-headers", stashed_data['control_request_headers']))
+ headers.append(("x-preflight-referrer", stashed_data['preflight_referrer']))
+ headers.append(("x-referrer", request.headers.get("Referer", "") ))
+ headers.append(("x-origin", request.headers.get("Origin", "") ))
+
+ if token:
+ request.server.stash.put(token, stashed_data)
+
+ return headers, ""
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesredirectpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/redirect.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/redirect.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/redirect.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+def main(request, response):
+ stashed_data = {'count': 0, 'preflight': "0"}
+ status = 302
+ headers = [("Content-Type", "text/plain"),
+ ("Cache-Control", "no-cache"),
+ ("Pragma", "no-cache"),
+ ("Access-Control-Allow-Origin", "*")]
+ token = None
+
+ if "token" in request.GET:
+ token = request.GET.first("token")
+ data = request.server.stash.take(token)
+ if data:
+ stashed_data = data
+
+ if request.method == "OPTIONS":
+ if "allow_headers" in request.GET:
+ headers.append(("Access-Control-Allow-Headers", request.GET['allow_headers']))
+ stashed_data['preflight'] = "1"
+ #Preflight is not redirected: return 200
+ if not "redirect_preflight" in request.GET:
+ if token:
+ request.server.stash.put(request.GET.first("token"), stashed_data)
+ return 200, headers, ""
+
+ if "redirect_status" in request.GET:
+ status = int(request.GET['redirect_status'])
+
+ stashed_data['count'] += 1
+
+ #keep url parameters in location
+ url_parameters = "?" + "&".join(map(lambda x: x[0][0] + "=" + x[1][0], request.GET.items()))
+ #make sure location changes during redirection loop
+ url_parameters += "&count=" + str(stashed_data['count'])
+
+ if "location" in request.GET:
+ headers.append(("Location", request.GET['location'] + url_parameters))
+
+ if token:
+ request.server.stash.put(request.GET.first("token"), stashed_data)
+ if "max_count" in request.GET:
+ max_count = int(request.GET['max_count'])
+ #stop redirecting and return count
+ if stashed_data['count'] > max_count:
+ # -1 because the last is not a redirection
+ return str(stashed_data['count'] - 1)
+
+ return status, headers, ""
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcestoptxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/top.txt (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/top.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/top.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+top
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcestricklepy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/trickle.py (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/trickle.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/trickle.py 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+import time
+
+def main(request, response):
+ delay = float(request.GET.first("ms", 500)) / 1E3
+ count = int(request.GET.first("count", 50))
+ time.sleep(delay)
+ response.headers.set("Content-type", "text/plain")
+ response.write_status_headers()
+ time.sleep(delay);
+ for i in xrange(count):
+ response.writer.write_content("TEST_TRICKLE\n")
+ time.sleep(delay)
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesutilsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/utils.js (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/utils.js (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/utils.js 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+var inWorker = false;
+var RESOURCES_DIR = "../resources/";
+
+try {
+ inWorker = !(self instanceof Window);
+} catch (e) {
+ inWorker = true;
+}
+
+function dirname(path) {
+ return path.replace(/\/[^\/]*$/, '/')
+}
+
+function checkRequest(request, ExpectedValuesDict) {
+ for (var attribute in ExpectedValuesDict) {
+ switch(attribute) {
+ case "headers":
+ for (var key of ExpectedValuesDict["headers"].keys())
+ assert_equals(request["headers"].get(key), ExpectedValuesDict["headers"].get(key),
+ "Check headers attribute has " + key + ":" + ExpectedValuesDict["headers"].get(key));
+ break;
+
+ case "body":
+ //for checking body's content, a dedicated asyncronous/promise test should be used
+ assert_true(request["headers"].has("Content-Type") , "Check request has body using Content-Type header")
+ break;
+
+ case "method":
+ case "referrer":
+ case "referrerPolicy":
+ case "credentials":
+ case "cache":
+ case "redirect":
+ case "integrity":
+ case "url":
+ case "destination":
+ assert_equals(request[attribute], ExpectedValuesDict[attribute], "Check " + attribute + " attribute")
+ break;
+
+ default:
+ break;
+ }
+ }
+}
+
+//check reader's text content in an asyncronous test
+function readTextStream(reader, asyncTest, expectedValue, retrievedText) {
+ if (!retrievedText)
+ retrievedText = "";
+ reader.read().then(function(data) {
+ if (!data.done) {
+ var decoder = new TextDecoder();
+ retrievedText += decoder.decode(data.value);
+ readTextStream(reader, asyncTest, expectedValue, retrievedText);
+ }
+ asyncTest.step(function() {
+ assert_equals(retrievedText, expectedValue, "Retrieve and verify stream");
+ asyncTest.done();
+ });
+ }).catch(function(e) {
+ asyncTest.step(function() {
+ assert_unreached("Cannot read stream " + e);
+ asyncTest.done();
+ });
+ });
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesdedicatedworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').hasOwnProperty('set') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').enumerable is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').configurable is true
</span><ins>+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').value is URL
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').hasOwnProperty('get') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -938,6 +938,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformefljsdomglobalconstructorsattributesdedicatedworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-dedicated-worker-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').hasOwnProperty('set') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').enumerable is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'ReadableStream').configurable is true
</span><ins>+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS [Worker] Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').value is URL
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').hasOwnProperty('get') is false
</span><span class="cx"> PASS [Worker] Object.getOwnPropertyDescriptor(global, 'URL').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -998,6 +998,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1018,6 +1018,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1023,6 +1023,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -998,6 +998,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1073,6 +1073,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Rect').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Rect').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Rect').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SQLException').value is SQLException
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SQLException').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SQLException').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -873,6 +873,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ProgressEvent').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'Request').value is Request
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'Request').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').value is RGBColor
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -172,7 +172,9 @@
</span><span class="cx"> Modules/battery/BatteryManager.idl
</span><span class="cx"> Modules/battery/NavigatorBattery.idl
</span><span class="cx">
</span><ins>+ Modules/fetch/FetchBody.idl
</ins><span class="cx"> Modules/fetch/FetchHeaders.idl
</span><ins>+ Modules/fetch/FetchRequest.idl
</ins><span class="cx">
</span><span class="cx"> Modules/geolocation/Coordinates.idl
</span><span class="cx"> Modules/geolocation/Geolocation.idl
</span><span class="lines">@@ -815,7 +817,9 @@
</span><span class="cx"> Modules/battery/BatteryStatus.cpp
</span><span class="cx"> Modules/battery/NavigatorBattery.cpp
</span><span class="cx">
</span><ins>+ Modules/fetch/FetchBody.cpp
</ins><span class="cx"> Modules/fetch/FetchHeaders.cpp
</span><ins>+ Modules/fetch/FetchRequest.cpp
</ins><span class="cx">
</span><span class="cx"> Modules/geolocation/Coordinates.cpp
</span><span class="cx"> Modules/geolocation/GeoNotifier.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/ChangeLog 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1,3 +1,111 @@
</span><ins>+2016-02-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] Implement Fetch API Request
+ https://bugs.webkit.org/show_bug.cgi?id=153437
+
+ Added support for Fetch Request and Body.
+ Body is sharing functionality between Request and Response.
+ Conversion between various body types are not implemented yet.
+
+ Added a FetchOptions class. Options in this class are partially redundant with ResourceLoaderOptions.
+
+ Fixing bug in Headers constructor.
+ Making error reporting in case of modifying headers compliant with the spec.
+
+ Reviewed by Darin Adler.
+
+ Tests: imported/w3c/web-platform-tests/fetch/api/request/request-clone.sub.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-consume.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-error.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-headers.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-idl.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-init-001.sub.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-init-002.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-init-003.sub.html
+ imported/w3c/web-platform-tests/fetch/api/request/request-structure.html
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * Modules/fetch/FetchBody.cpp: Added.
+ (WebCore::FetchBody::initBody):
+ (WebCore::FetchBody::clear):
+ (WebCore::FetchBody::processIfEmptyOrDisturbed):
+ (WebCore::FetchBody::arrayBuffer):
+ (WebCore::FetchBody::formData):
+ (WebCore::FetchBody::blob):
+ (WebCore::FetchBody::text):
+ (WebCore::FetchBody::json):
+ * Modules/fetch/FetchBody.h: Added.
+ (WebCore::FetchBody::~FetchBody):
+ (WebCore::FetchBody::isEmpty):
+ (WebCore::FetchBody::isDisturbed):
+ (WebCore::FetchBody::setDisturbed):
+ (WebCore::FetchBody::setMimeType):
+ (WebCore::FetchBody::mimeType):
+ * Modules/fetch/FetchBody.idl: Added.
+ * Modules/fetch/FetchHeaders.cpp:
+ (WebCore::canWriteHeader):
+ (WebCore::FetchHeaders::append):
+ (WebCore::FetchHeaders::remove):
+ (WebCore::FetchHeaders::set):
+ (WebCore::FetchHeaders::fill): Helper routine implementing https://fetch.spec.whatwg.org/#concept-headers-fill
+ * Modules/fetch/FetchHeaders.h: Adding header getter/setter for FetchRequest.
+ (WebCore::FetchHeaders::fastGet):
+ (WebCore::FetchHeaders::fastSet):
+ * Modules/fetch/FetchHeaders.js: Fixing bug in constructor (covered by modified headers-basc.html test).
+ (initializeFetchHeaders):
+ * Modules/fetch/FetchOptions.h: Added.
+ (WebCore::FetchOptions::FetchOptions):
+ (WebCore::FetchOptions::type):
+ (WebCore::FetchOptions::destination):
+ (WebCore::FetchOptions::mode):
+ (WebCore::FetchOptions::credentials):
+ (WebCore::FetchOptions::cache):
+ (WebCore::FetchOptions::redirect):
+ (WebCore::FetchOptions::referrerPolicy):
+ (WebCore::FetchOptions::setType):
+ (WebCore::FetchOptions::setDestination):
+ (WebCore::FetchOptions::setMode):
+ (WebCore::FetchOptions::setCredentials):
+ (WebCore::FetchOptions::setCache):
+ (WebCore::FetchOptions::setRedirect):
+ (WebCore::FetchOptions::setReferrerPolicy):
+ * Modules/fetch/FetchRequest.cpp: Added.
+ (WebCore::FetchRequest::create):
+ (WebCore::FetchRequest::FetchRequest):
+ (WebCore::FetchRequest::init):
+ (WebCore::FetchRequest::setReferrer):
+ (WebCore::FetchRequest::setReferrerPolicy):
+ (WebCore::FetchRequest::setMode):
+ (WebCore::FetchRequest::setCredentials):
+ (WebCore::FetchRequest::setCache):
+ (WebCore::FetchRequest::setRedirect):
+ (WebCore::FetchRequest::type):
+ (WebCore::FetchRequest::destination):
+ (WebCore::FetchRequest::referrerPolicy):
+ (WebCore::FetchRequest::referrer):
+ (WebCore::FetchRequest::mode):
+ (WebCore::FetchRequest::credentials):
+ (WebCore::FetchRequest::cache):
+ (WebCore::FetchRequest::redirect):
+ (WebCore::FetchRequest::setMethod):
+ (WebCore::FetchRequest::clone):
+ * Modules/fetch/FetchRequest.h: Added.
+ (WebCore::FetchRequest::method):
+ (WebCore::FetchRequest::url):
+ (WebCore::FetchRequest::integrity):
+ (WebCore::FetchRequest::headers):
+ * Modules/fetch/FetchRequest.idl: Added.
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/Dictionary.h:
+ (WebCore::Dictionary::execState):
+ * bindings/js/JSDictionary.cpp:
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSDictionary.h:
+ (WebCore::JSDictionary::get):
+
</ins><span class="cx"> 2016-01-31 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Add resize event for HTMLMediaElement
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -154,7 +154,9 @@
</span><span class="cx"> #include "JSEvent.cpp"
</span><span class="cx"> #include "JSEventSource.cpp"
</span><span class="cx"> #include "JSEventTarget.cpp"
</span><ins>+#include "JSFetchBody.cpp"
</ins><span class="cx"> #include "JSFetchHeaders.cpp"
</span><ins>+#include "JSFetchRequest.cpp"
</ins><span class="cx"> #include "JSFile.cpp"
</span><span class="cx"> #include "JSFileError.cpp"
</span><span class="cx"> #include "JSFileException.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/DerivedSources.make 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -79,7 +79,9 @@
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeyNeededEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeySession.idl \
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeys.idl \
</span><ins>+ $(WebCore)/Modules/fetch/FetchBody.idl \
</ins><span class="cx"> $(WebCore)/Modules/fetch/FetchHeaders.idl \
</span><ins>+ $(WebCore)/Modules/fetch/FetchRequest.idl \
</ins><span class="cx"> $(WebCore)/Modules/gamepad/Gamepad.idl \
</span><span class="cx"> $(WebCore)/Modules/gamepad/GamepadButton.idl \
</span><span class="cx"> $(WebCore)/Modules/gamepad/GamepadEvent.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,181 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FetchBody.h"
+
+#if ENABLE(FETCH_API)
+
+#include "Dictionary.h"
+#include "ExceptionCode.h"
+#include "JSBlob.h"
+#include "JSDOMFormData.h"
+#include <runtime/JSONObject.h>
+
+namespace WebCore {
+
+FetchBody::FetchBody(Ref<Blob>&& blob)
+ : m_type(Type::Blob)
+ , m_mimeType(blob->type())
+ , m_blob(WTFMove(blob))
+{
+}
+
+FetchBody::FetchBody(Ref<DOMFormData>&& formData)
+ : m_type(Type::FormData)
+ , m_mimeType(ASCIILiteral("multipart/form-data"))
+ , m_formData(WTFMove(formData))
+{
+ // FIXME: Handle the boundary parameter of multipart/form-data MIME type.
+}
+
+FetchBody::FetchBody(String&& text)
+ : m_type(Type::Text)
+ , m_mimeType(ASCIILiteral("text/plain;charset=UTF-8"))
+ , m_text(WTFMove(text))
+{
+}
+
+FetchBody FetchBody::fromJSValue(JSC::ExecState& state, JSC::JSValue value)
+{
+ if (value.inherits(JSBlob::info()))
+ return FetchBody(*JSBlob::toWrapped(value));
+ if (value.inherits(JSDOMFormData::info()))
+ return FetchBody(*JSDOMFormData::toWrapped(value));
+ if (value.isString())
+ return FetchBody(value.toWTFString(&state));
+ return FetchBody();
+}
+
+// FIXME: Once FetchResponse is added, check whether using a move constructor instead.
+// Ensure whether resetting m_mimeType to the empty string be not observable.
+FetchBody FetchBody::fromRequestBody(FetchBody* body)
+{
+ if (!body)
+ return FetchBody();
+
+ FetchBody result;
+ result.m_type = body->m_type;
+ result.m_mimeType = body->m_mimeType;
+
+ result.m_blob = WTFMove(body->m_blob);
+ result.m_formData = WTFMove(body->m_formData);
+ result.m_text = WTFMove(body->m_text);
+
+ body->m_isDisturbed = true;
+
+ return result;
+}
+
+template<typename T> inline bool FetchBody::processIfEmptyOrDisturbed(DOMPromise<T, ExceptionCode>& promise)
+{
+ if (m_type == Type::None) {
+ promise.resolve(T());
+ return true;
+ }
+
+ if (m_isDisturbed) {
+ promise.reject(TypeError);
+ return true;
+ }
+ m_isDisturbed = true;
+ return false;
+}
+
+void FetchBody::arrayBuffer(ArrayBufferPromise&& promise)
+{
+ if (processIfEmptyOrDisturbed(promise))
+ return;
+
+ if (m_type == Type::Text) {
+ // FIXME: promise expects a Vector<unsigned char> that will be converted to an ArrayBuffer.
+ // We should try to create a Vector<unsigned char> or an ArrayBuffer directly from m_text.
+ CString data = m_text.utf8();
+ Vector<unsigned char> value(data.length());
+ memcpy(value.data(), data.data(), data.length());
+ promise.resolve(WTFMove(value));
+ return;
+ }
+ // FIXME: Support other types.
+ promise.reject(0);
+}
+
+void FetchBody::formData(FormDataPromise&& promise)
+{
+ if (m_type == Type::None || m_isDisturbed) {
+ promise.reject(TypeError);
+ return;
+ }
+ m_isDisturbed = true;
+
+ // FIXME: Support other types.
+ promise.reject(0);
+}
+
+void FetchBody::blob(BlobPromise&& promise)
+{
+ if (processIfEmptyOrDisturbed(promise))
+ return;
+
+ // FIXME: Support other types.
+ promise.reject(0);
+}
+
+void FetchBody::text(TextPromise&& promise)
+{
+ if (processIfEmptyOrDisturbed(promise))
+ return;
+
+ if (m_type == Type::Text) {
+ promise.resolve(m_text);
+ return;
+ }
+ // FIXME: Support other types.
+ promise.reject(0);
+}
+
+void FetchBody::json(JSC::ExecState& state, JSONPromise&& promise)
+{
+ if (processIfEmptyOrDisturbed(promise))
+ return;
+
+ if (m_type == Type::Text) {
+ JSC::JSValue value = JSC::JSONParse(&state, m_text);
+ if (!value)
+ promise.reject(SYNTAX_ERR);
+ else
+ promise.resolve(value);
+ return;
+ }
+ // FIXME: Support other types.
+ promise.reject(0);
+}
+
+}
+
+#endif // ENABLE(FETCH_API)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyhfromrev195953trunkSourceWebCoreModulesfetchFetchHeadersh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/fetch/FetchBody.h (from rev 195953, trunk/Source/WebCore/Modules/fetch/FetchHeaders.h) (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FetchBody_h
+#define FetchBody_h
+
+#if ENABLE(FETCH_API)
+
+#include "Blob.h"
+#include "DOMFormData.h"
+#include "JSDOMPromise.h"
+
+namespace JSC {
+class ExecState;
+class JSValue;
+};
+
+namespace WebCore {
+
+class Dictionary;
+typedef int ExceptionCode;
+
+class FetchBody {
+public:
+ typedef DOMPromise<Vector<unsigned char>, ExceptionCode> ArrayBufferPromise;
+ void arrayBuffer(ArrayBufferPromise&&);
+
+ typedef DOMPromise<RefPtr<DOMFormData>, ExceptionCode> FormDataPromise;
+ void formData(FormDataPromise&&);
+
+ typedef DOMPromise<RefPtr<Blob>, ExceptionCode> BlobPromise;
+ void blob(BlobPromise&&);
+
+ typedef DOMPromise<JSC::JSValue, ExceptionCode> JSONPromise;
+ void json(JSC::ExecState&, JSONPromise&&);
+
+ typedef DOMPromise<String, ExceptionCode> TextPromise;
+ void text(TextPromise&&);
+
+ bool isDisturbed() const { return m_isDisturbed; }
+ bool isEmpty() const { return m_type == Type::None; }
+
+ void setMimeType(const String& mimeType) { m_mimeType = mimeType; }
+ String mimeType() const { return m_mimeType; }
+
+ static FetchBody fromJSValue(JSC::ExecState&, JSC::JSValue);
+ static FetchBody fromRequestBody(FetchBody*);
+
+private:
+ template<typename T> bool processIfEmptyOrDisturbed(DOMPromise<T, ExceptionCode>&);
+
+ enum class Type { None, Text, Blob, FormData };
+
+ FetchBody(Ref<Blob>&&);
+ FetchBody(Ref<DOMFormData>&&);
+ FetchBody(String&&);
+ FetchBody() { }
+
+ Type m_type = Type::None;
+ String m_mimeType;
+ bool m_isDisturbed = false;
+
+ // FIXME: Add support for BufferSource and URLSearchParams.
+ RefPtr<Blob> m_blob;
+ RefPtr<DOMFormData> m_formData;
+ String m_text;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
+
+#endif // FetchBody_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyidlfromrev195953trunkSourceWebCoreModulesfetchFetchHeadersh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/fetch/FetchBody.idl (from rev 195953, trunk/Source/WebCore/Modules/fetch/FetchHeaders.h) (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.idl (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.idl 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=FETCH_API,
+ GlobalContext=DOMWindow&WorkerGlobalScope,
+ InterfaceName=Body,
+ NoInterfaceObject
+]
+interface FetchBody {
+ [ImplementedAs=isDisturbed] readonly attribute boolean bodyUsed;
+ [NewObject] Promise arrayBuffer();
+ [NewObject] Promise blob();
+ [NewObject] Promise formData();
+ [CallWith=ScriptState, NewObject] Promise json();
+ [NewObject] Promise text();
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeaderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -101,12 +101,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool canWriteHeader(const String& name, const String& value, FetchHeaders::Guard guard)
</del><ins>+static bool canWriteHeader(const String& name, const String& value, FetchHeaders::Guard guard, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (!isValidHTTPToken(name) || !isValidHTTPHeaderValue(value))
</del><ins>+ if (!isValidHTTPToken(name) || !isValidHTTPHeaderValue(value)) {
+ ec = TypeError;
</ins><span class="cx"> return false;
</span><del>- if (guard == FetchHeaders::Guard::Immutable)
</del><ins>+ }
+ if (guard == FetchHeaders::Guard::Immutable) {
+ ec = TypeError;
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx"> if (guard == FetchHeaders::Guard::Request && isForbiddenHeaderName(name))
</span><span class="cx"> return false;
</span><span class="cx"> if (guard == FetchHeaders::Guard::RequestNoCors && !isSimpleHeader(name, value))
</span><span class="lines">@@ -119,19 +123,15 @@
</span><span class="cx"> void FetchHeaders::append(const String& name, const String& value, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value);
</span><del>- if (!canWriteHeader(name, normalizedValue, m_guard)) {
- ec = TypeError;
</del><ins>+ if (!canWriteHeader(name, normalizedValue, m_guard, ec))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx"> m_headers.add(name, normalizedValue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchHeaders::remove(const String& name, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (!canWriteHeader(name, String(), m_guard)) {
- ec = TypeError;
</del><ins>+ if (!canWriteHeader(name, String(), m_guard, ec))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx"> m_headers.remove(name);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,13 +156,29 @@
</span><span class="cx"> void FetchHeaders::set(const String& name, const String& value, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value);
</span><del>- if (!canWriteHeader(name, normalizedValue, m_guard)) {
- ec = TypeError;
</del><ins>+ if (!canWriteHeader(name, normalizedValue, m_guard, ec))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx"> m_headers.set(name, normalizedValue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FetchHeaders::fill(const FetchHeaders* headers)
+{
+ if (!headers)
+ return;
+
+ ASSERT(m_guard != Guard::Immutable);
+
+ ExceptionCode ec;
+ for (auto& header : headers->m_headers) {
+ if (canWriteHeader(header.key, header.value, m_guard, ec)) {
+ if (header.keyAsHTTPHeaderName)
+ m_headers.add(header.keyAsHTTPHeaderName.value(), header.value);
+ else
+ m_headers.add(header.key, header.value);
+ }
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FETCH_API)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.h (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<FetchHeaders> create(Guard guard = Guard::None) { return adoptRef(*new FetchHeaders(guard)); }
</span><ins>+ static Ref<FetchHeaders> create(const FetchHeaders& headers) { return adoptRef(*new FetchHeaders(headers.m_guard, headers.m_headers)); }
</ins><span class="cx">
</span><span class="cx"> void append(const String& name, const String& value, ExceptionCode&);
</span><span class="cx"> void remove(const String&, ExceptionCode&);
</span><span class="lines">@@ -56,9 +57,14 @@
</span><span class="cx"> void set(const String& name, const String& value, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void initializeWith(const FetchHeaders*, ExceptionCode&);
</span><ins>+ void fill(const FetchHeaders*);
</ins><span class="cx">
</span><ins>+ String fastGet(HTTPHeaderName name) const { return m_headers.get(name); }
+ void fastSet(HTTPHeaderName name, const String& value) { m_headers.set(name, value); }
+
</ins><span class="cx"> private:
</span><span class="cx"> FetchHeaders(Guard guard) : m_guard(guard) { }
</span><ins>+ FetchHeaders(Guard guard, const HTTPHeaderMap& headers) : m_guard(guard), m_headers(headers) { }
</ins><span class="cx">
</span><span class="cx"> Guard m_guard;
</span><span class="cx"> HTTPHeaderMap m_headers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeadersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.js (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.js 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.js 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> throw new @TypeError("headersInit sequence items should contain two values");
</span><span class="cx"> this.@appendFromJS(header[0], header[1]);
</span><span class="cx"> }
</span><ins>+ return this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @Object.@getOwnPropertyNames(headersInit).forEach((name) => {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchOptionsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/fetch/FetchOptions.h (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchOptions.h (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchOptions.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,132 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FetchOptions_h
+#define FetchOptions_h
+
+#if ENABLE(FETCH_API)
+
+namespace WebCore {
+
+class FetchOptions {
+public:
+ enum class Type {
+ Default,
+ Audio,
+ Font,
+ Image,
+ Script,
+ Style,
+ Track,
+ Video
+ };
+ enum class Destination {
+ Default,
+ Document,
+ SharedWorker,
+ Subresource,
+ Unknown,
+ Worker
+ };
+ enum class Mode {
+ NoCors,
+ Navigate,
+ SameOrigin,
+ Cors
+ };
+ enum class Credentials {
+ Omit,
+ SameOrigin,
+ Include
+ };
+ enum class Cache {
+ Default,
+ NoStore,
+ Reload,
+ NoCache,
+ ForceCache,
+ };
+ enum class Redirect {
+ Follow,
+ Error,
+ Manual
+ };
+ enum class ReferrerPolicy {
+ Empty,
+ NoReferrer,
+ NoReferrerWhenDowngrade,
+ OriginOnly,
+ OriginWhenCrossOrigin,
+ UnsafeURL
+ };
+
+ FetchOptions() { }
+ FetchOptions(Type, Destination, Mode, Credentials, Cache, Redirect, ReferrerPolicy);
+
+ Type type() const { return m_type; }
+ Destination destination() const { return m_destination; }
+ Mode mode() const { return m_mode; }
+ Credentials credentials() const { return m_credentials; }
+ Cache cache() const { return m_cache; }
+ Redirect redirect() const { return m_redirect; }
+ ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
+
+ void setType(Type type) { m_type = type; }
+ void setDestination(Destination destination) { m_destination = destination; }
+ void setMode(Mode mode) { m_mode = mode; }
+ void setCredentials(Credentials credentials) { m_credentials = credentials; }
+ void setCache(Cache cache) { m_cache = cache; }
+ void setRedirect(Redirect redirect) { m_redirect = redirect; }
+ void setReferrerPolicy(ReferrerPolicy referrerPolicy) { m_referrerPolicy = referrerPolicy; }
+
+private:
+ Type m_type = Type::Default;
+ Destination m_destination = Destination::Default;
+ Mode m_mode = Mode::NoCors;
+ Credentials m_credentials = Credentials::Omit;
+ Cache m_cache = Cache::Default;
+ Redirect m_redirect = Redirect:: Follow;
+ ReferrerPolicy m_referrerPolicy = ReferrerPolicy::Empty;
+};
+
+inline FetchOptions::FetchOptions(Type type, Destination destination, Mode mode, Credentials credentials, Cache cache, Redirect redirect, ReferrerPolicy referrerPolicy)
+ : m_type(type)
+ , m_destination(destination)
+ , m_mode(mode)
+ , m_credentials(credentials)
+ , m_cache(cache)
+ , m_redirect(redirect)
+ , m_referrerPolicy(referrerPolicy)
+{
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
+
+#endif // FetchOptions_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,451 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FetchRequest.h"
+
+#if ENABLE(FETCH_API)
+
+#include "Dictionary.h"
+#include "ExceptionCode.h"
+#include "HTTPParsers.h"
+#include "ScriptExecutionContext.h"
+#include "SecurityOrigin.h"
+
+namespace WebCore {
+
+static bool setReferrerPolicy(FetchOptions& options, const String& referrerPolicy)
+{
+ if (referrerPolicy.isEmpty())
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::Empty);
+ else if (referrerPolicy == "no-referrer")
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::NoReferrer);
+ else if (referrerPolicy == "no-referrer-when-downgrade")
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::NoReferrerWhenDowngrade);
+ else if (referrerPolicy == "origin-only")
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::OriginOnly);
+ else if (referrerPolicy == "origin-when-cross-origin")
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::OriginWhenCrossOrigin);
+ else if (referrerPolicy == "unsafe-url")
+ options.setReferrerPolicy(FetchOptions::ReferrerPolicy::UnsafeURL);
+ else
+ return false;
+ return true;
+}
+
+static bool setMode(FetchOptions& options, const String& mode)
+{
+ if (mode == "navigate")
+ options.setMode(FetchOptions::Mode::Navigate);
+ else if (mode == "same-origin")
+ options.setMode(FetchOptions::Mode::SameOrigin);
+ else if (mode == "no-cors")
+ options.setMode(FetchOptions::Mode::NoCors);
+ else if (mode == "cors")
+ options.setMode(FetchOptions::Mode::Cors);
+ else
+ return false;
+ return true;
+}
+
+static bool setCredentials(FetchOptions& options, const String& credentials)
+{
+ if (credentials == "omit")
+ options.setCredentials(FetchOptions::Credentials::Omit);
+ else if (credentials == "same-origin")
+ options.setCredentials(FetchOptions::Credentials::SameOrigin);
+ else if (credentials == "include")
+ options.setCredentials(FetchOptions::Credentials::Include);
+ else
+ return false;
+ return true;
+}
+
+static bool setCache(FetchOptions& options, const String& cache)
+{
+ if (cache == "default")
+ options.setCache(FetchOptions::Cache::Default);
+ else if (cache == "no-store")
+ options.setCache(FetchOptions::Cache::NoStore);
+ else if (cache == "reload")
+ options.setCache(FetchOptions::Cache::Reload);
+ else if (cache == "no-cache")
+ options.setCache(FetchOptions::Cache::NoCache);
+ else if (cache == "force-cache")
+ options.setCache(FetchOptions::Cache::ForceCache);
+ else
+ return false;
+ return true;
+}
+
+static bool setRedirect(FetchOptions& options, const String& redirect)
+{
+ if (redirect == "follow")
+ options.setRedirect(FetchOptions::Redirect::Follow);
+ else if (redirect == "error")
+ options.setRedirect(FetchOptions::Redirect::Error);
+ else if (redirect == "manual")
+ options.setRedirect(FetchOptions::Redirect::Manual);
+ else
+ return false;
+ return true;
+}
+
+static bool setMethod(ResourceRequest& request, const String& initMethod)
+{
+ if (!isValidHTTPToken(initMethod))
+ return false;
+
+ String method = initMethod.convertToASCIIUppercase();
+ if (method == "CONNECT" || method == "TRACE" || method == "TRACK")
+ return false;
+
+ request.setHTTPMethod((method == "DELETE" || method == "GET" || method == "HEAD" || method == "OPTIONS" || method == "POST" || method == "PUT") ? method : initMethod);
+
+ return true;
+}
+
+static bool setReferrer(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
+{
+ String referrer;
+ if (!init.get("referrer", referrer))
+ return true;
+ if (referrer.isEmpty()) {
+ request.referrer = ASCIILiteral("no-referrer");
+ return true;
+ }
+ // FIXME: Tighten the URL parsing algorithm according https://url.spec.whatwg.org/#concept-url-parser.
+ URL referrerURL = context.completeURL(referrer);
+ if (!referrerURL.isValid())
+ return false;
+
+ if (referrerURL.protocolIs("about") && referrerURL.path() == "client") {
+ request.referrer = ASCIILiteral("client");
+ return true;
+ }
+
+ if (!(context.securityOrigin() && context.securityOrigin()->canRequest(referrerURL)))
+ return false;
+
+ request.referrer = referrerURL.string();
+ return true;
+}
+
+static bool buildOptions(FetchRequest::InternalRequest& request, ScriptExecutionContext& context, const Dictionary& init)
+{
+ JSC::JSValue window;
+ if (init.get("window", window)) {
+ if (!window.isNull())
+ return false;
+ }
+
+ if (!setReferrer(request, context, init))
+ return false;
+
+ String value;
+ if (init.get("referrerPolicy", value) && !setReferrerPolicy(request.options, value))
+ return false;
+
+ if (init.get("mode", value) && !setMode(request.options, value))
+ return false;
+ if (request.options.mode() == FetchOptions::Mode::Navigate)
+ return false;
+
+ if (init.get("credentials", value) && !setCredentials(request.options, value))
+ return false;
+
+ if (init.get("cache", value) && !setCache(request.options, value))
+ return false;
+
+ if (init.get("redirect", value) && !setRedirect(request.options, value))
+ return false;
+
+ init.get("integrity", request.integrity);
+
+ if (init.get("method", value) && !setMethod(request.request, value))
+ return false;
+
+ return true;
+}
+
+static RefPtr<FetchHeaders> buildHeaders(const Dictionary& init, const FetchRequest::InternalRequest& request, const FetchHeaders* inputHeaders = nullptr)
+{
+ FetchHeaders::Guard guard = FetchHeaders::Guard::Request;
+ if (request.options.mode() == FetchOptions::Mode::NoCors) {
+ const String& method = request.request.httpMethod();
+ if (method != "GET" && method != "POST" && method != "HEAD")
+ return nullptr;
+ if (!request.integrity.isEmpty())
+ return nullptr;
+ guard = FetchHeaders::Guard::RequestNoCors;
+ }
+
+ RefPtr<FetchHeaders> initialHeaders;
+ RefPtr<FetchHeaders> headers = FetchHeaders::create(guard);
+ headers->fill(init.get("headers", initialHeaders) ? initialHeaders.get() : inputHeaders);
+
+ return headers;
+}
+
+static FetchBody buildBody(const Dictionary& init, FetchHeaders& headers, FetchBody* inputBody = nullptr)
+{
+ JSC::JSValue value;
+ bool hasInitBody = init.get("body", value);
+ FetchBody body = hasInitBody ? FetchBody::fromJSValue(*init.execState(), value) : FetchBody::fromRequestBody(inputBody);
+
+ String type = headers.fastGet(HTTPHeaderName::ContentType);
+ if (hasInitBody && type.isEmpty() && !body.mimeType().isEmpty()) {
+ type = body.mimeType();
+ headers.fastSet(HTTPHeaderName::ContentType, type);
+ }
+ body.setMimeType(type);
+ return body;
+}
+
+static bool validateBodyAndMethod(const FetchBody& body, const FetchRequest::InternalRequest& internalRequest)
+{
+ if (body.isEmpty())
+ return true;
+ return internalRequest.request.httpMethod() != "GET" && internalRequest.request.httpMethod() != "HEAD";
+}
+
+RefPtr<FetchRequest> FetchRequest::create(ScriptExecutionContext& context, const String& url, const Dictionary& init, ExceptionCode& ec)
+{
+ // FIXME: Tighten the URL parsing algorithm according https://url.spec.whatwg.org/#concept-url-parser.
+ URL requestURL = context.completeURL(url);
+ if (!requestURL.isValid() || !requestURL.user().isEmpty() || !requestURL.pass().isEmpty()) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ FetchRequest::InternalRequest internalRequest;
+ internalRequest.options.setMode(FetchOptions::Mode::Cors);
+ internalRequest.options.setCredentials(FetchOptions::Credentials::Omit);
+ internalRequest.referrer = ASCIILiteral("client");
+ internalRequest.request.setURL(requestURL);
+
+ if (!buildOptions(internalRequest, context, init)) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ RefPtr<FetchHeaders> headers = buildHeaders(init, internalRequest);
+ if (!headers) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ FetchBody body = buildBody(init, *headers);
+ if (!validateBodyAndMethod(body, internalRequest)) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ return adoptRef(*new FetchRequest(WTFMove(body), headers.releaseNonNull(), WTFMove(internalRequest)));
+}
+
+RefPtr<FetchRequest> FetchRequest::create(ScriptExecutionContext& context, FetchRequest* input, const Dictionary& init, ExceptionCode& ec)
+{
+ ASSERT(input);
+
+ if (input->isDisturbed()) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ FetchRequest::InternalRequest internalRequest(input->m_internalRequest);
+
+ if (!buildOptions(internalRequest, context, init)) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ RefPtr<FetchHeaders> headers = buildHeaders(init, internalRequest, input->m_headers.ptr());
+ if (!headers) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ FetchBody body = buildBody(init, *headers, &input->m_body);
+ if (!validateBodyAndMethod(body, internalRequest)) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ return adoptRef(*new FetchRequest(WTFMove(body), headers.releaseNonNull(), WTFMove(internalRequest)));
+}
+
+String FetchRequest::type() const
+{
+ switch (m_internalRequest.options.type()) {
+ case FetchOptions::Type::Default:
+ return String();
+ case FetchOptions::Type::Audio :
+ return ASCIILiteral("audio");
+ case FetchOptions::Type::Font :
+ return ASCIILiteral("font");
+ case FetchOptions::Type::Image :
+ return ASCIILiteral("image");
+ case FetchOptions::Type::Script :
+ return ASCIILiteral("script");
+ case FetchOptions::Type::Style :
+ return ASCIILiteral("style");
+ case FetchOptions::Type::Track :
+ return ASCIILiteral("track");
+ case FetchOptions::Type::Video :
+ return ASCIILiteral("video");
+ };
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::destination() const
+{
+ switch (m_internalRequest.options.destination()) {
+ case FetchOptions::Destination::Default:
+ return String();
+ case FetchOptions::Destination::Document:
+ return ASCIILiteral("document");
+ case FetchOptions::Destination::SharedWorker:
+ return ASCIILiteral("sharedworker");
+ case FetchOptions::Destination::Subresource:
+ return ASCIILiteral("subresource");
+ case FetchOptions::Destination::Unknown:
+ return ASCIILiteral("unknown");
+ case FetchOptions::Destination::Worker:
+ return ASCIILiteral("worker");
+ }
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::referrerPolicy() const
+{
+ switch (m_internalRequest.options.referrerPolicy()) {
+ case FetchOptions::ReferrerPolicy::Empty:
+ return String();
+ case FetchOptions::ReferrerPolicy::NoReferrer:
+ return ASCIILiteral("no-referrer");
+ case FetchOptions::ReferrerPolicy::NoReferrerWhenDowngrade:
+ return ASCIILiteral("no-referrer-when-downgrade");
+ case FetchOptions::ReferrerPolicy::OriginOnly:
+ return ASCIILiteral("origin-only");
+ case FetchOptions::ReferrerPolicy::OriginWhenCrossOrigin:
+ return ASCIILiteral("origin-when-cross-origin");
+ case FetchOptions::ReferrerPolicy::UnsafeURL:
+ return ASCIILiteral("unsafe-url");
+ }
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::referrer() const
+{
+ if (m_internalRequest.referrer == "no-referrer")
+ return String();
+ if (m_internalRequest.referrer == "client")
+ return ASCIILiteral("about:client");
+ return m_internalRequest.referrer;
+}
+
+String FetchRequest::mode() const
+{
+ switch (m_internalRequest.options.mode()) {
+ case FetchOptions::Mode::Navigate:
+ return ASCIILiteral("navigate");
+ case FetchOptions::Mode::SameOrigin:
+ return ASCIILiteral("same-origin");
+ case FetchOptions::Mode::NoCors:
+ return ASCIILiteral("no-cors");
+ case FetchOptions::Mode::Cors:
+ return ASCIILiteral("cors");
+ };
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::credentials() const
+{
+ switch (m_internalRequest.options.credentials()) {
+ case FetchOptions::Credentials::Omit:
+ return ASCIILiteral("omit");
+ case FetchOptions::Credentials::SameOrigin:
+ return ASCIILiteral("same-origin");
+ case FetchOptions::Credentials::Include:
+ return ASCIILiteral("include");
+ };
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::cache() const
+{
+ switch (m_internalRequest.options.cache()) {
+ case FetchOptions::Cache::Default:
+ return ASCIILiteral("default");
+ case FetchOptions::Cache::NoStore:
+ return ASCIILiteral("no-store");
+ case FetchOptions::Cache::Reload:
+ return ASCIILiteral("reload");
+ case FetchOptions::Cache::NoCache:
+ return ASCIILiteral("no-cache");
+ case FetchOptions::Cache::ForceCache:
+ return ASCIILiteral("force-cache");
+ }
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+String FetchRequest::redirect() const
+{
+ switch (m_internalRequest.options.redirect()) {
+ case FetchOptions::Redirect::Follow:
+ return ASCIILiteral("follow");
+ case FetchOptions::Redirect::Error:
+ return ASCIILiteral("error");
+ case FetchOptions::Redirect::Manual:
+ return ASCIILiteral("manual");
+ }
+ ASSERT_NOT_REACHED();
+ return String();
+}
+
+RefPtr<FetchRequest> FetchRequest::clone(ExceptionCode& ec)
+{
+ if (isDisturbed()) {
+ ec = TypeError;
+ return nullptr;
+ }
+
+ // FIXME: Validate body teeing.
+ return adoptRef(*new FetchRequest(FetchBody(m_body), FetchHeaders::create(m_headers.get()), FetchRequest::InternalRequest(m_internalRequest)));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequesth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/fetch/FetchRequest.h (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.h (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FetchRequest_h
+#define FetchRequest_h
+
+#if ENABLE(FETCH_API)
+
+#include "FetchBody.h"
+#include "FetchHeaders.h"
+#include "FetchOptions.h"
+#include "ResourceRequest.h"
+
+namespace WebCore {
+
+class Dictionary;
+class ScriptExecutionContext;
+
+typedef int ExceptionCode;
+
+class FetchRequest : public RefCounted<FetchRequest> {
+public:
+ static RefPtr<FetchRequest> create(ScriptExecutionContext&, FetchRequest*, const Dictionary&, ExceptionCode&);
+ static RefPtr<FetchRequest> create(ScriptExecutionContext&, const String&, const Dictionary&, ExceptionCode&);
+
+ // Request API
+ const String& method() const { return m_internalRequest.request.httpMethod(); }
+ const String& url() const { return m_internalRequest.request.url().string(); }
+ FetchHeaders& headers() { return m_headers.get(); }
+
+ String type() const;
+ String destination() const;
+ String referrer() const;
+ String referrerPolicy() const;
+ String mode() const;
+ String credentials() const;
+ String cache() const;
+ String redirect() const;
+ const String& integrity() const { return m_internalRequest.integrity; }
+
+ RefPtr<FetchRequest> clone(ExceptionCode&);
+
+ // Body API
+ bool isDisturbed() const { return m_body.isDisturbed(); }
+ void arrayBuffer(FetchBody::ArrayBufferPromise&& promise) { m_body.arrayBuffer(WTFMove(promise)); }
+ void formData(FetchBody::FormDataPromise&& promise) { m_body.formData(WTFMove(promise)); }
+ void blob(FetchBody::BlobPromise&& promise) { m_body.blob(WTFMove(promise)); }
+ void json(JSC::ExecState& state, FetchBody::JSONPromise&& promise) { m_body.json(state, WTFMove(promise)); }
+ void text(FetchBody::TextPromise&& promise) { m_body.text(WTFMove(promise)); }
+
+ struct InternalRequest {
+ ResourceRequest request;
+ FetchOptions options;
+ String referrer;
+ String integrity;
+ };
+
+ FetchBody& body() { return m_body; }
+
+private:
+ FetchRequest(FetchBody&&, Ref<FetchHeaders>&&, InternalRequest&&);
+
+ FetchBody m_body;
+ Ref<FetchHeaders> m_headers;
+ InternalRequest m_internalRequest;
+};
+
+inline FetchRequest::FetchRequest(FetchBody&& body, Ref<FetchHeaders>&& headers, InternalRequest&& internalRequest)
+ : m_body(WTFMove(body))
+ , m_headers(WTFMove(headers))
+ , m_internalRequest(WTFMove(internalRequest))
+{
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
+
+#endif // FetchRequest_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/fetch/FetchRequest.idl (0 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.idl (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.idl 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2016 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+enum RequestType { "", "audio", "font", "image", "script", "style", "track", "video" };
+enum RequestDestination { "", "document", "sharedworker", "subresource", "unknown", "worker" };
+enum RequestMode { "navigate", "same-origin", "no-cors", "cors" };
+enum RequestCredentials { "omit", "same-origin", "include" };
+enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache" };
+enum RequestRedirect { "follow", "error", "manual" };
+enum ReferrerPolicy { "", "no-referrer", "no-referrer-when-downgrade", "origin-only", "origin-when-cross-origin", "unsafe-url" };
+
+[
+ Conditional=FETCH_API,
+ ConstructorCallWith=ScriptExecutionContext,
+ ConstructorRaisesException,
+ Constructor(FetchRequest input, [Default=Undefined] optional Dictionary init),
+ Constructor(DOMString input, [Default=Undefined] optional Dictionary init),
+ GlobalContext=DOMWindow&WorkerGlobalScope,
+ ImplementationLacksVTable,
+ InterfaceName=Request
+]
+interface FetchRequest {
+ readonly attribute DOMString method;
+ readonly attribute DOMString url;
+ readonly attribute FetchHeaders headers;
+
+ readonly attribute RequestType type;
+ readonly attribute RequestDestination destination;
+ readonly attribute DOMString referrer;
+ readonly attribute ReferrerPolicy referrerPolicy;
+ readonly attribute RequestMode mode;
+ readonly attribute RequestCredentials credentials;
+ readonly attribute RequestCache cache;
+ readonly attribute RequestRedirect redirect;
+ readonly attribute DOMString integrity;
+
+ [RaisesException, NewObject] FetchRequest clone();
+};
+FetchRequest implements FetchBody;
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -1547,7 +1547,9 @@
</span><span class="cx"> 41F066E50F64BCF600A07EAC /* ScriptGlobalObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F066E30F64BCF600A07EAC /* ScriptGlobalObject.cpp */; };
</span><span class="cx"> 41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 41F1D2200EF35C2A00DA8753 /* ScriptCachedFrameData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */; };
</span><ins>+ 41F54F8B1C50C50300338488 /* FetchBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F7D1C50C4F600338488 /* FetchBody.cpp */; };
</ins><span class="cx"> 41F54F8D1C50C50800338488 /* FetchHeaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F821C50C4F600338488 /* FetchHeaders.cpp */; };
</span><ins>+ 41F54F8E1C50C50C00338488 /* FetchRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F871C50C4F600338488 /* FetchRequest.cpp */; };
</ins><span class="cx"> 41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */; };
</span><span class="cx"> 41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */; };
</span><span class="cx"> 41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */; };
</span><span class="lines">@@ -2793,6 +2795,8 @@
</span><span class="cx"> 7E474E1E12494DC900235364 /* SQLiteDatabaseTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E474E1B12494DC900235364 /* SQLiteDatabaseTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7E474E1F12494DC900235364 /* SQLiteDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E474E1C12494DC900235364 /* SQLiteDatabaseTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7E474E2012494DC900235364 /* SQLiteDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E474E1D12494DC900235364 /* SQLiteDatabaseTracker.cpp */; };
</span><ins>+ 7E4C96DC1AD4483500365A50 /* JSFetchRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E4C96D81AD4483500365A50 /* JSFetchRequest.cpp */; };
+ 7E4C96DD1AD4483500365A50 /* JSFetchRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E4C96D91AD4483500365A50 /* JSFetchRequest.h */; };
</ins><span class="cx"> 7E4DE10D198B10B60051CB02 /* DiskCacheMonitorCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E4DE10C198B10B60051CB02 /* DiskCacheMonitorCocoa.mm */; };
</span><span class="cx"> 7E5D7A76161D3F8F00896C34 /* OESElementIndexUint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E5D7A73161D3F8F00896C34 /* OESElementIndexUint.cpp */; };
</span><span class="cx"> 7E5D7A77161D3F8F00896C34 /* OESElementIndexUint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */; };
</span><span class="lines">@@ -2829,6 +2833,8 @@
</span><span class="cx"> 7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845D12D26E3800E79415 /* ResourceResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */; };
</span><span class="cx"> 7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */; };
</span><ins>+ 7F4C96DC1AD4483500365A50 /* JSFetchBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */; };
+ 7F4C96DD1AD4483500365A50 /* JSFetchBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F4C96D91AD4483500365A50 /* JSFetchBody.h */; };
</ins><span class="cx"> 8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8102C5871325BB1100DDE67A /* StringCallback.cpp */; };
</span><span class="cx"> 81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AC5997131636E60009A7E0 /* DataTransferItem.h */; };
</span><span class="cx"> 81AC599A131636E60009A7E0 /* DataTransferItemList.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AC5998131636E60009A7E0 /* DataTransferItemList.h */; };
</span><span class="lines">@@ -8959,10 +8965,17 @@
</span><span class="cx"> 41F066E30F64BCF600A07EAC /* ScriptGlobalObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptGlobalObject.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCachedFrameData.h; sourceTree = "<group>"; };
</span><span class="cx"> 41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCachedFrameData.cpp; sourceTree = "<group>"; };
</span><ins>+ 41F54F7D1C50C4F600338488 /* FetchBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FetchBody.cpp; sourceTree = "<group>"; };
+ 41F54F7E1C50C4F600338488 /* FetchBody.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchBody.h; sourceTree = "<group>"; };
+ 41F54F7F1C50C4F600338488 /* FetchBody.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchBody.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 41F54F821C50C4F600338488 /* FetchHeaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FetchHeaders.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41F54F831C50C4F600338488 /* FetchHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchHeaders.h; sourceTree = "<group>"; };
</span><span class="cx"> 41F54F841C50C4F600338488 /* FetchHeaders.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchHeaders.idl; sourceTree = "<group>"; };
</span><span class="cx"> 41F54F851C50C4F600338488 /* FetchHeaders.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = FetchHeaders.js; sourceTree = "<group>"; };
</span><ins>+ 41F54F861C50C4F600338488 /* FetchOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchOptions.h; sourceTree = "<group>"; };
+ 41F54F871C50C4F600338488 /* FetchRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FetchRequest.cpp; sourceTree = "<group>"; };
+ 41F54F881C50C4F600338488 /* FetchRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchRequest.h; sourceTree = "<group>"; };
+ 41F54F891C50C4F600338488 /* FetchRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchRequest.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePortCustom.h; sourceTree = "<group>"; };
</span><span class="cx"> 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControls.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControls.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10358,6 +10371,8 @@
</span><span class="cx"> 7E474E1B12494DC900235364 /* SQLiteDatabaseTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabaseTrackerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 7E474E1C12494DC900235364 /* SQLiteDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabaseTracker.h; sourceTree = "<group>"; };
</span><span class="cx"> 7E474E1D12494DC900235364 /* SQLiteDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteDatabaseTracker.cpp; sourceTree = "<group>"; };
</span><ins>+ 7E4C96D81AD4483500365A50 /* JSFetchRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchRequest.cpp; sourceTree = "<group>"; };
+ 7E4C96D91AD4483500365A50 /* JSFetchRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchRequest.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7E4DE10C198B10B60051CB02 /* DiskCacheMonitorCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DiskCacheMonitorCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7E5D7A73161D3F8F00896C34 /* OESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OESElementIndexUint.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OESElementIndexUint.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10396,6 +10411,8 @@
</span><span class="cx"> 7EE6845D12D26E3800E79415 /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponse.h; sourceTree = "<group>"; };
</span><span class="cx"> 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoaderCFNet.cpp; sourceTree = "<group>"; };
</span><ins>+ 7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchBody.cpp; sourceTree = "<group>"; };
+ 7F4C96D91AD4483500365A50 /* JSFetchBody.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchBody.h; sourceTree = "<group>"; };
</ins><span class="cx"> 8102C5871325BB1100DDE67A /* StringCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringCallback.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 81AC5997131636E60009A7E0 /* DataTransferItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataTransferItem.h; sourceTree = "<group>"; };
</span><span class="cx"> 81AC5998131636E60009A7E0 /* DataTransferItemList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataTransferItemList.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16619,10 +16636,17 @@
</span><span class="cx"> 41F54F7C1C50C4F600338488 /* fetch */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 41F54F7D1C50C4F600338488 /* FetchBody.cpp */,
+ 41F54F7E1C50C4F600338488 /* FetchBody.h */,
+ 41F54F7F1C50C4F600338488 /* FetchBody.idl */,
</ins><span class="cx"> 41F54F821C50C4F600338488 /* FetchHeaders.cpp */,
</span><span class="cx"> 41F54F831C50C4F600338488 /* FetchHeaders.h */,
</span><span class="cx"> 41F54F841C50C4F600338488 /* FetchHeaders.idl */,
</span><span class="cx"> 41F54F851C50C4F600338488 /* FetchHeaders.js */,
</span><ins>+ 41F54F861C50C4F600338488 /* FetchOptions.h */,
+ 41F54F871C50C4F600338488 /* FetchRequest.cpp */,
+ 41F54F881C50C4F600338488 /* FetchRequest.h */,
+ 41F54F891C50C4F600338488 /* FetchRequest.idl */,
</ins><span class="cx"> );
</span><span class="cx"> path = fetch;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -16630,6 +16654,10 @@
</span><span class="cx"> 42A023FA1A39F13A00F722CF /* FetchAPI */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */,
+ 7F4C96D91AD4483500365A50 /* JSFetchBody.h */,
+ 7E4C96D81AD4483500365A50 /* JSFetchRequest.cpp */,
+ 7E4C96D91AD4483500365A50 /* JSFetchRequest.h */,
</ins><span class="cx"> 7D4C96D81AD4483500365A50 /* JSFetchHeaders.cpp */,
</span><span class="cx"> 7D4C96D91AD4483500365A50 /* JSFetchHeaders.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -26483,6 +26511,8 @@
</span><span class="cx"> 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */,
</span><span class="cx"> B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */,
</span><span class="cx"> 65DF320209D1CC60000BE325 /* JSRange.h in Headers */,
</span><ins>+ 7F4C96DD1AD4483500365A50 /* JSFetchBody.h in Headers */,
+ 7E4C96DD1AD4483500365A50 /* JSFetchRequest.h in Headers */,
</ins><span class="cx"> 7D4C96DD1AD4483500365A50 /* JSFetchHeaders.h in Headers */,
</span><span class="cx"> 7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */,
</span><span class="cx"> 6C4C96DF1AD4483500365A50 /* JSReadableStreamController.h in Headers */,
</span><span class="lines">@@ -29664,6 +29694,7 @@
</span><span class="cx"> C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */,
</span><span class="cx"> 516D7D711BB5F0BD00AF7C77 /* IDBConnectionToClient.cpp in Sources */,
</span><span class="cx"> 5198F7C01BC4856700E2CC5F /* IDBConnectionToServer.cpp in Sources */,
</span><ins>+ 41F54F8B1C50C50300338488 /* FetchBody.cpp in Sources */,
</ins><span class="cx"> 5185FC7A1BB4C4E80012898F /* IDBCursor.cpp in Sources */,
</span><span class="cx"> 51F41A691BA73B5B002E053B /* IDBCursorBackend.cpp in Sources */,
</span><span class="cx"> 51F41A6B1BA73B5B002E053B /* IDBCursorBackendOperations.cpp in Sources */,
</span><span class="lines">@@ -30073,6 +30104,7 @@
</span><span class="cx"> A80E7E9E0A1A83E3007FB8C5 /* JSHTMLTextAreaElement.cpp in Sources */,
</span><span class="cx"> 83E359A31BB1031D002CEB98 /* JSHTMLTimeElement.cpp in Sources */,
</span><span class="cx"> A80E7B130A19D606007FB8C5 /* JSHTMLTitleElement.cpp in Sources */,
</span><ins>+ 41F54F8E1C50C50C00338488 /* FetchRequest.cpp in Sources */,
</ins><span class="cx"> 070756D314239A4E00414161 /* JSHTMLTrackElement.cpp in Sources */,
</span><span class="cx"> 1A85B2100A1B258700D8C87C /* JSHTMLUListElement.cpp in Sources */,
</span><span class="cx"> 6E4ABCD4138EA0B70071D291 /* JSHTMLUnknownElement.cpp in Sources */,
</span><span class="lines">@@ -30195,7 +30227,9 @@
</span><span class="cx"> 077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */,
</span><span class="cx"> B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
</span><span class="cx"> 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */,
</span><ins>+ 7F4C96DC1AD4483500365A50 /* JSFetchBody.cpp in Sources */,
</ins><span class="cx"> 7D4C96DC1AD4483500365A50 /* JSFetchHeaders.cpp in Sources */,
</span><ins>+ 7E4C96DC1AD4483500365A50 /* JSFetchRequest.cpp in Sources */,
</ins><span class="cx"> 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */,
</span><span class="cx"> 6C4C96DE1AD4483500365A50 /* JSReadableStreamController.cpp in Sources */,
</span><span class="cx"> 4129DF851BB5B80700322A16 /* JSReadableStreamPrivateConstructors.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/Dictionary.h (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/Dictionary.h 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/bindings/js/Dictionary.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> bool getOwnPropertyNames(Vector<String>&) const;
</span><span class="cx"> bool getWithUndefinedOrNullCheck(const char* propertyName, String& value) const;
</span><span class="cx">
</span><ins>+ JSC::ExecState* execState() const { return m_dictionary.execState(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> template <typename T>
</span><span class="cx"> JSC::JSObject* asJSObject(T*) const;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -47,6 +47,10 @@
</span><span class="cx"> #include "JSMediaKeyError.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(FETCH_API)
+#include "JSFetchHeaders.h"
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> #include "JSMediaStream.h"
</span><span class="cx"> #include "JSMediaStreamTrack.h"
</span><span class="lines">@@ -227,6 +231,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(FETCH_API)
+void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<FetchHeaders>& result)
+{
+ result = JSFetchHeaders::toWrapped(value);
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<MediaStream>& result)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (195953 => 195954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-02-01 06:34:07 UTC (rev 195953)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-02-01 11:05:39 UTC (rev 195954)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class DOMWindow;
</span><span class="cx"> class EventTarget;
</span><span class="cx"> class Gamepad;
</span><ins>+class FetchHeaders;
</ins><span class="cx"> class MediaKeyError;
</span><span class="cx"> class MediaStream;
</span><span class="cx"> class MediaStreamTrack;
</span><span class="lines">@@ -126,6 +127,9 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaKeyError>& result);
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(FETCH_API)
+ static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<FetchHeaders>& result);
+#endif
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStream>& result);
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStreamTrack>& result);
</span><span class="lines">@@ -163,6 +167,12 @@
</span><span class="cx"> return tryGetPropertyAndResult(propertyName, &finalResult, IdentitySetter<Result>::identitySetter) == PropertyFound;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <>
+inline bool JSDictionary::get(const char* propertyName, JSC::JSValue& finalResult) const
+{
+ return tryGetProperty(propertyName, finalResult) == PropertyFound;
+}
+
</ins><span class="cx"> template <typename T, typename Result>
</span><span class="cx"> JSDictionary::GetPropertyResult JSDictionary::tryGetPropertyAndResult(const char* propertyName, T* context, void (*setter)(T* context, const Result&)) const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>