<!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>[210514] trunk/Source/WebCore</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/210514">210514</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-09 10:26:58 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merging ThreadableLoader redundant options on filtering responses
Merge OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options
https://bugs.webkit.org/show_bug.cgi?id=166843
Patch by Youenn Fablet <youennf@gmail.com> on 2017-01-09
Reviewed by Darin Adler.
Covered by existing tests.
Removing OpaqueResponseBodyPolicy option.
When ResponseFilteringPolicy is set to Enable, the body is filtered out in DocumentThreadableLoader.
* Modules/fetch/FetchLoader.cpp:
(WebCore::FetchLoader::start):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didReceiveResponse): Implementing body filtering based on ResponseFilteringPolicy option.
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):
* loader/ThreadableLoader.h:
* loader/WorkerThreadableLoader.cpp:
(WebCore::LoaderTaskOptions::LoaderTaskOptions):
* workers/WorkerScriptLoader.cpp:
(WebCore::WorkerScriptLoader::loadSynchronously):
(WebCore::WorkerScriptLoader::loadAsynchronously):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchLoadercpp">trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderThreadableLoadercpp">trunk/Source/WebCore/loader/ThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderThreadableLoaderh">trunk/Source/WebCore/loader/ThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoadercpp">trunk/Source/WebCore/workers/WorkerScriptLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/ChangeLog 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-01-09 Youenn Fablet <youennf@gmail.com>
+
+ Merging ThreadableLoader redundant options on filtering responses
+
+ Merge OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options
+ https://bugs.webkit.org/show_bug.cgi?id=166843
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests.
+
+ Removing OpaqueResponseBodyPolicy option.
+ When ResponseFilteringPolicy is set to Enable, the body is filtered out in DocumentThreadableLoader.
+
+ * Modules/fetch/FetchLoader.cpp:
+ (WebCore::FetchLoader::start):
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::didReceiveResponse): Implementing body filtering based on ResponseFilteringPolicy option.
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):
+ * loader/ThreadableLoader.h:
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::LoaderTaskOptions::LoaderTaskOptions):
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::loadSynchronously):
+ (WebCore::WorkerScriptLoader::loadAsynchronously):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
</ins><span class="cx"> 2017-01-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Evaluating window named element may return wrong result
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ThreadableLoaderOptions options(request.fetchOptions(), ConsiderPreflight,
</span><span class="cx"> context.shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective,
</span><span class="cx"> String(cachedResourceRequestInitiators().fetch),
</span><del>- OpaqueResponseBodyPolicy::DoNotReceive, ResponseFilteringPolicy::Enable);
</del><ins>+ ResponseFilteringPolicy::Enable);
</ins><span class="cx"> options.sendLoadCallbacks = SendCallbacks;
</span><span class="cx"> options.dataBufferingPolicy = DoNotBufferData;
</span><span class="cx"> options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -281,13 +281,18 @@
</span><span class="cx"> void DocumentThreadableLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse& response, ResourceResponse::Tainting tainting)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_client);
</span><ins>+ ASSERT(response.type() != ResourceResponse::Type::Error);
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didReceiveThreadableLoaderResponse(*this, identifier);
</span><span class="cx">
</span><del>- ASSERT(response.type() != ResourceResponse::Type::Error);
</del><ins>+ if (options().filteringPolicy == ResponseFilteringPolicy::Disable) {
+ m_client->didReceiveResponse(identifier, response);
+ return;
+ }
+
</ins><span class="cx"> if (response.type() == ResourceResponse::Type::Default) {
</span><del>- m_client->didReceiveResponse(identifier, options().filteringPolicy == ResponseFilteringPolicy::Enable ? ResourceResponse::filterResponse(response, tainting) : response);
- if (tainting == ResourceResponse::Tainting::Opaque && options().opaqueResponse == OpaqueResponseBodyPolicy::DoNotReceive) {
</del><ins>+ m_client->didReceiveResponse(identifier, ResourceResponse::filterResponse(response, tainting));
+ if (tainting == ResourceResponse::Tainting::Opaque) {
</ins><span class="cx"> clearResource();
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didFinishLoading(identifier, 0.0);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -52,12 +52,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, String&& initiator, OpaqueResponseBodyPolicy opaqueResponse, ResponseFilteringPolicy filteringPolicy)
</del><ins>+ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, String&& initiator, ResponseFilteringPolicy filteringPolicy)
</ins><span class="cx"> : ResourceLoaderOptions(baseOptions)
</span><span class="cx"> , preflightPolicy(preflightPolicy)
</span><span class="cx"> , contentSecurityPolicyEnforcement(contentSecurityPolicyEnforcement)
</span><span class="cx"> , initiator(WTFMove(initiator))
</span><del>- , opaqueResponse(opaqueResponse)
</del><span class="cx"> , filteringPolicy(filteringPolicy)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.h 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/loader/ThreadableLoader.h 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -57,11 +57,6 @@
</span><span class="cx"> EnforceScriptSrcDirective,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum class OpaqueResponseBodyPolicy {
- Receive,
- DoNotReceive
- };
-
</del><span class="cx"> enum class ResponseFilteringPolicy {
</span><span class="cx"> Enable,
</span><span class="cx"> Disable,
</span><span class="lines">@@ -69,14 +64,13 @@
</span><span class="cx">
</span><span class="cx"> struct ThreadableLoaderOptions : ResourceLoaderOptions {
</span><span class="cx"> ThreadableLoaderOptions();
</span><del>- ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, ContentSecurityPolicyEnforcement, String&& initiator, OpaqueResponseBodyPolicy, ResponseFilteringPolicy);
</del><ins>+ ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, ContentSecurityPolicyEnforcement, String&& initiator, ResponseFilteringPolicy);
</ins><span class="cx"> ~ThreadableLoaderOptions();
</span><span class="cx">
</span><span class="cx"> PreflightPolicy preflightPolicy { ConsiderPreflight };
</span><span class="cx"> ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement { ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective };
</span><span class="cx"> String initiator; // This cannot be an AtomicString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread.
</span><del>- OpaqueResponseBodyPolicy opaqueResponse { OpaqueResponseBodyPolicy::Receive };
- ResponseFilteringPolicy filteringPolicy { ResponseFilteringPolicy::Enable };
</del><ins>+ ResponseFilteringPolicy filteringPolicy { ResponseFilteringPolicy::Disable };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Useful for doing loader operations from any thread (not threadsafe,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> LoaderTaskOptions::LoaderTaskOptions(const ThreadableLoaderOptions& options, const String& referrer, Ref<SecurityOrigin>&& origin)
</span><del>- : options(options, options.preflightPolicy, options.contentSecurityPolicyEnforcement, options.initiator.isolatedCopy(), options.opaqueResponse, options.filteringPolicy)
</del><ins>+ : options(options, options.preflightPolicy, options.contentSecurityPolicyEnforcement, options.initiator.isolatedCopy(), options.filteringPolicy)
</ins><span class="cx"> , referrer(referrer.isolatedCopy())
</span><span class="cx"> , origin(WTFMove(origin))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> options.mode = mode;
</span><span class="cx"> options.sendLoadCallbacks = SendCallbacks;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><del>- options.filteringPolicy = ResponseFilteringPolicy::Disable;
</del><span class="cx">
</span><span class="cx"> WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(*scriptExecutionContext), WTFMove(*request), *this, options);
</span><span class="cx"> }
</span><span class="lines">@@ -92,7 +91,6 @@
</span><span class="cx"> options.mode = mode;
</span><span class="cx"> options.sendLoadCallbacks = SendCallbacks;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><del>- options.filteringPolicy = ResponseFilteringPolicy::Disable;
</del><span class="cx">
</span><span class="cx"> // During create, callbacks may happen which remove the last reference to this object.
</span><span class="cx"> Ref<WorkerScriptLoader> protectedThis(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (210513 => 210514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2017-01-09 18:14:52 UTC (rev 210513)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2017-01-09 18:26:58 UTC (rev 210514)
</span><span class="lines">@@ -669,6 +669,7 @@
</span><span class="cx"> options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
</span><span class="cx"> options.initiator = cachedResourceRequestInitiators().xmlhttprequest;
</span><span class="cx"> options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
</span><ins>+ options.filteringPolicy = ResponseFilteringPolicy::Enable;
</ins><span class="cx">
</span><span class="cx"> if (m_timeoutMilliseconds) {
</span><span class="cx"> if (!m_async)
</span></span></pre>
</div>
</div>
</body>
</html>