<!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>[203971] 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/203971">203971</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-01 00:02:35 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce the number of ResourceRequest copies in DocumentThreadableLoader
https://bugs.webkit.org/show_bug.cgi?id=160338
Patch by Youenn Fablet <youennf@gmail.com> on 2016-08-01
Reviewed by Darin Adler.
No observable change of behavior.
Updating one of CachedResourceReques constructor to take a ResourceRequest&&.
This allows reducing a ResourceRequest copy in DocumentThreadableLoader.
Updating DocumentLoader and MediaResourceLoader accordingly (future optimization steps may look at making these
two loaders more efficient with regards to Resource Request).
Updating ThreadableLoader to take a ResourceRequest&&.
This allows reducing the number of copies in DocumentThreadableLoader.
Updating clients of ThreadableLoader accordingly.
* Modules/fetch/FetchLoader.cpp:
(WebCore::FetchLoader::start):
* dom/Document.cpp:
(WebCore::Document::didLoadResourceSynchronously):
* dom/Document.h:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::didLoadResourceSynchronously):
* dom/ScriptExecutionContext.h:
* fileapi/FileReaderLoader.cpp:
(WebCore::FileReaderLoader::start):
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::loadResource):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::startLoadingMainResource):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadResourceSynchronously):
(WebCore::DocumentThreadableLoader::create):
(WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
(WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
(WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
(WebCore::DocumentThreadableLoader::redirectReceived):
(WebCore::DocumentThreadableLoader::preflightSuccess):
(WebCore::DocumentThreadableLoader::loadRequest):
* loader/DocumentThreadableLoader.h:
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResourceLoader::requestResource):
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoader::create):
(WebCore::ThreadableLoader::loadResourceSynchronously):
* loader/ThreadableLoader.h:
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::WorkerThreadableLoader):
(WebCore::WorkerThreadableLoader::loadResourceSynchronously):
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
* loader/WorkerThreadableLoader.h:
(WebCore::WorkerThreadableLoader::create):
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::CachedResourceRequest):
* loader/cache/CachedResourceRequest.h:
* page/EventSource.cpp:
(WebCore::EventSource::connect):
* 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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoadercpp">trunk/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoaderh">trunk/Source/WebCore/loader/DocumentThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.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="#trunkSourceWebCoreloaderWorkerThreadableLoaderh">trunk/Source/WebCore/loader/WorkerThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestcpp">trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.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 (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/ChangeLog 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -1,3 +1,68 @@
</span><ins>+2016-08-01 Youenn Fablet <youennf@gmail.com>
+
+ Reduce the number of ResourceRequest copies in DocumentThreadableLoader
+ https://bugs.webkit.org/show_bug.cgi?id=160338
+
+ Reviewed by Darin Adler.
+
+ No observable change of behavior.
+
+ Updating one of CachedResourceReques constructor to take a ResourceRequest&&.
+ This allows reducing a ResourceRequest copy in DocumentThreadableLoader.
+ Updating DocumentLoader and MediaResourceLoader accordingly (future optimization steps may look at making these
+ two loaders more efficient with regards to Resource Request).
+
+ Updating ThreadableLoader to take a ResourceRequest&&.
+ This allows reducing the number of copies in DocumentThreadableLoader.
+ Updating clients of ThreadableLoader accordingly.
+
+ * Modules/fetch/FetchLoader.cpp:
+ (WebCore::FetchLoader::start):
+ * dom/Document.cpp:
+ (WebCore::Document::didLoadResourceSynchronously):
+ * dom/Document.h:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::didLoadResourceSynchronously):
+ * dom/ScriptExecutionContext.h:
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::start):
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::loadResource):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::startLoadingMainResource):
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::loadResourceSynchronously):
+ (WebCore::DocumentThreadableLoader::create):
+ (WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
+ (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
+ (WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
+ (WebCore::DocumentThreadableLoader::redirectReceived):
+ (WebCore::DocumentThreadableLoader::preflightSuccess):
+ (WebCore::DocumentThreadableLoader::loadRequest):
+ * loader/DocumentThreadableLoader.h:
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResourceLoader::requestResource):
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoader::create):
+ (WebCore::ThreadableLoader::loadResourceSynchronously):
+ * loader/ThreadableLoader.h:
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::WorkerThreadableLoader):
+ (WebCore::WorkerThreadableLoader::loadResourceSynchronously):
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+ * loader/WorkerThreadableLoader.h:
+ (WebCore::WorkerThreadableLoader::create):
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::CachedResourceRequest):
+ * loader/cache/CachedResourceRequest.h:
+ * page/EventSource.cpp:
+ (WebCore::EventSource::connect):
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::loadSynchronously):
+ (WebCore::WorkerScriptLoader::loadAsynchronously):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
</ins><span class="cx"> 2016-07-31 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Fetch Response built-ins should use @makeThisTypeError
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> options.mode = FetchOptions::Mode::SameOrigin;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span><span class="cx">
</span><del>- m_loader = ThreadableLoader::create(&context, this, request, options);
</del><ins>+ m_loader = ThreadableLoader::create(&context, this, WTFMove(request), options);
</ins><span class="cx"> m_isStarted = m_loader;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -6874,7 +6874,7 @@
</span><span class="cx"> m_cachedDOMCookies = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didLoadResourceSynchronously(const ResourceRequest&)
</del><ins>+void Document::didLoadResourceSynchronously()
</ins><span class="cx"> {
</span><span class="cx"> // Synchronous resources loading can set cookies so we invalidate the cookies cache
</span><span class="cx"> // in this case, to be safe.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/dom/Document.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -1421,7 +1421,7 @@
</span><span class="cx"> void setCachedDOMCookies(const String&);
</span><span class="cx"> bool isDOMCookieCacheValid() const { return m_cookieCacheExpiryTimer.isActive(); }
</span><span class="cx"> void invalidateDOMCookieCache();
</span><del>- void didLoadResourceSynchronously(const ResourceRequest&) final;
</del><ins>+ void didLoadResourceSynchronously() final;
</ins><span class="cx">
</span><span class="cx"> void checkViewportDependentPictures();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> m_messagePorts.remove(&messagePort);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptExecutionContext::didLoadResourceSynchronously(const ResourceRequest&)
</del><ins>+void ScriptExecutionContext::didLoadResourceSynchronously()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> void createdMessagePort(MessagePort&);
</span><span class="cx"> void destroyedMessagePort(MessagePort&);
</span><span class="cx">
</span><del>- virtual void didLoadResourceSynchronously(const ResourceRequest&);
</del><ins>+ virtual void didLoadResourceSynchronously();
</ins><span class="cx">
</span><span class="cx"> void ref() { refScriptExecutionContext(); }
</span><span class="cx"> void deref() { derefScriptExecutionContext(); }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><del>- m_loader = ThreadableLoader::create(scriptExecutionContext, this, request, options);
</del><ins>+ m_loader = ThreadableLoader::create(scriptExecutionContext, this, WTFMove(request), options);
</ins><span class="cx"> else
</span><del>- ThreadableLoader::loadResourceSynchronously(scriptExecutionContext, request, *this, options);
</del><ins>+ ThreadableLoader::loadResourceSynchronously(scriptExecutionContext, WTFMove(request), *this, options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FileReaderLoader::cancel()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx"> // InspectorThreadableLoaderClient deletes itself when the load completes.
</span><span class="cx"> InspectorThreadableLoaderClient* inspectorThreadableLoaderClient = new InspectorThreadableLoaderClient(callback.copyRef());
</span><span class="cx">
</span><del>- auto loader = DocumentThreadableLoader::create(*document, *inspectorThreadableLoaderClient, request, options);
</del><ins>+ auto loader = DocumentThreadableLoader::create(*document, *inspectorThreadableLoaderClient, WTFMove(request), options);
</ins><span class="cx"> if (!loader) {
</span><span class="cx"> inspectorThreadableLoaderClient->didFailLoaderCreation();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> request.makeUnconditional();
</span><span class="cx">
</span><span class="cx"> static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, SkipSecurityCheck, FetchOptions::Mode::NoCors, IncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching);
</span><del>- CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions);
</del><ins>+ CachedResourceRequest cachedResourceRequest(ResourceRequest(request), mainResourceLoadOptions);
</ins><span class="cx"> cachedResourceRequest.setInitiator(*this);
</span><span class="cx"> m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceRequest);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -56,32 +56,32 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::loadResourceSynchronously(Document& document, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+void DocumentThreadableLoader::loadResourceSynchronously(Document& document, ResourceRequest&& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</ins><span class="cx"> {
</span><span class="cx"> // The loader will be deleted as soon as this function exits.
</span><del>- RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadSynchronously, request, options, WTFMove(origin), WTFMove(contentSecurityPolicy)));
</del><ins>+ RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadSynchronously, WTFMove(request), options, WTFMove(origin), WTFMove(contentSecurityPolicy)));
</ins><span class="cx"> ASSERT(loader->hasOneRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::loadResourceSynchronously(Document& document, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</del><ins>+void DocumentThreadableLoader::loadResourceSynchronously(Document& document, ResourceRequest&& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- loadResourceSynchronously(document, request, client, options, nullptr, nullptr);
</del><ins>+ loadResourceSynchronously(document, WTFMove(request), client, options, nullptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, const ResourceRequest& request, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, ResourceRequest&& request, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</ins><span class="cx"> {
</span><del>- RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadAsynchronously, request, options, WTFMove(origin), WTFMove(contentSecurityPolicy)));
</del><ins>+ RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadAsynchronously, WTFMove(request), options, WTFMove(origin), WTFMove(contentSecurityPolicy)));
</ins><span class="cx"> if (!loader->isLoading())
</span><span class="cx"> loader = nullptr;
</span><span class="cx"> return loader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</del><ins>+RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, ResourceRequest&& request, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- return create(document, client, request, options, nullptr, nullptr);
</del><ins>+ return create(document, client, WTFMove(request), options, nullptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DocumentThreadableLoader::DocumentThreadableLoader(Document& document, ThreadableLoaderClient& client, BlockingBehavior blockingBehavior, const ResourceRequest& request, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+DocumentThreadableLoader::DocumentThreadableLoader(Document& document, ThreadableLoaderClient& client, BlockingBehavior blockingBehavior, ResourceRequest&& request, const ThreadableLoaderOptions& options, RefPtr<SecurityOrigin>&& origin, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</ins><span class="cx"> : m_client(&client)
</span><span class="cx"> , m_document(document)
</span><span class="cx"> , m_options(options)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> m_options.setAllowCredentials((m_options.credentials == FetchOptions::Credentials::Include || (m_options.credentials == FetchOptions::Credentials::SameOrigin && m_sameOriginRequest)) ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</span><span class="cx">
</span><span class="cx"> if (m_sameOriginRequest || m_options.mode == FetchOptions::Mode::NoCors) {
</span><del>- loadRequest(request, DoSecurityCheck);
</del><ins>+ loadRequest(WTFMove(request), DoSecurityCheck);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,25 +108,25 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- makeCrossOriginAccessRequest(request);
</del><ins>+ makeCrossOriginAccessRequest(WTFMove(request));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::makeCrossOriginAccessRequest(const ResourceRequest& request)
</del><ins>+void DocumentThreadableLoader::makeCrossOriginAccessRequest(ResourceRequest&& request)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_options.mode == FetchOptions::Mode::Cors);
</span><span class="cx">
</span><span class="cx"> if ((m_options.preflightPolicy == ConsiderPreflight && isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields())) || m_options.preflightPolicy == PreventPreflight)
</span><del>- makeSimpleCrossOriginAccessRequest(request);
</del><ins>+ makeSimpleCrossOriginAccessRequest(WTFMove(request));
</ins><span class="cx"> else {
</span><span class="cx"> m_simpleRequest = false;
</span><span class="cx"> if (CrossOriginPreflightResultCache::singleton().canSkipPreflight(securityOrigin().toString(), request.url(), m_options.allowCredentials(), request.httpMethod(), request.httpHeaderFields()))
</span><del>- preflightSuccess(ResourceRequest(request));
</del><ins>+ preflightSuccess(WTFMove(request));
</ins><span class="cx"> else
</span><del>- makeCrossOriginAccessRequestWithPreflight(ResourceRequest(request));
</del><ins>+ makeCrossOriginAccessRequestWithPreflight(WTFMove(request));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest(const ResourceRequest& request)
</del><ins>+void DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest(ResourceRequest&& request)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_options.preflightPolicy != ForcePreflight);
</span><span class="cx"> ASSERT(m_options.preflightPolicy == PreventPreflight || isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields()));
</span><span class="lines">@@ -137,9 +137,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto crossOriginRequest = request;
- updateRequestForAccessControl(crossOriginRequest, securityOrigin(), m_options.allowCredentials());
- loadRequest(crossOriginRequest, DoSecurityCheck);
</del><ins>+ updateRequestForAccessControl(request, securityOrigin(), m_options.allowCredentials());
+ loadRequest(WTFMove(request), DoSecurityCheck);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::makeCrossOriginAccessRequestWithPreflight(ResourceRequest&& request)
</span><span class="lines">@@ -250,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> cleanRedirectedRequestForAccessControl(request);
</span><span class="cx">
</span><del>- makeCrossOriginAccessRequest(request);
</del><ins>+ makeCrossOriginAccessRequest(ResourceRequest(request));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -340,7 +339,7 @@
</span><span class="cx"> m_preflightChecker = Nullopt;
</span><span class="cx">
</span><span class="cx"> // It should be ok to skip the security check since we already asked about the preflight request.
</span><del>- loadRequest(actualRequest, SkipSecurityCheck);
</del><ins>+ loadRequest(WTFMove(actualRequest), SkipSecurityCheck);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const ResourceError& error)
</span><span class="lines">@@ -354,7 +353,7 @@
</span><span class="cx"> m_client->didFail(error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, SecurityCheckPolicy securityCheck)
</del><ins>+void DocumentThreadableLoader::loadRequest(ResourceRequest&& request, SecurityCheckPolicy securityCheck)
</ins><span class="cx"> {
</span><span class="cx"> // Any credential should have been removed from the cross-site requests.
</span><span class="cx"> const URL& requestURL = request.url();
</span><span class="lines">@@ -369,7 +368,7 @@
</span><span class="cx"> // Set to NoCors as CORS checks are done in DocumentThreadableLoader
</span><span class="cx"> options.mode = FetchOptions::Mode::NoCors;
</span><span class="cx">
</span><del>- CachedResourceRequest newRequest(request, options);
</del><ins>+ CachedResourceRequest newRequest(WTFMove(request), options);
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> newRequest.setInitiator(m_options.initiator);
</span><span class="cx"> newRequest.mutableResourceRequest().setAllowCookies(m_options.allowCredentials() == AllowStoredCredentials);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> class DocumentThreadableLoader : public RefCounted<DocumentThreadableLoader>, public ThreadableLoader, private CachedRawResourceClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
- static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
</del><ins>+ static void loadResourceSynchronously(Document&, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
+ static void loadResourceSynchronously(Document&, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
</ins><span class="cx">
</span><del>- static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
- static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&);
</del><ins>+ static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, ResourceRequest&&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
+ static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, ResourceRequest&&, const ThreadableLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> virtual ~DocumentThreadableLoader();
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> LoadAsynchronously
</span><span class="cx"> };
</span><span class="cx">
</span><del>- DocumentThreadableLoader(Document&, ThreadableLoaderClient&, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
</del><ins>+ DocumentThreadableLoader(Document&, ThreadableLoaderClient&, BlockingBehavior, ResourceRequest&&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
</ins><span class="cx">
</span><span class="cx"> void clearResource();
</span><span class="cx">
</span><span class="lines">@@ -86,13 +86,13 @@
</span><span class="cx"> void didReceiveData(unsigned long identifier, const char* data, int dataLength);
</span><span class="cx"> void didFinishLoading(unsigned long identifier, double finishTime);
</span><span class="cx"> void didFail(unsigned long identifier, const ResourceError&);
</span><del>- void makeCrossOriginAccessRequest(const ResourceRequest&);
- void makeSimpleCrossOriginAccessRequest(const ResourceRequest&);
</del><ins>+ void makeCrossOriginAccessRequest(ResourceRequest&&);
+ void makeSimpleCrossOriginAccessRequest(ResourceRequest&&);
</ins><span class="cx"> void makeCrossOriginAccessRequestWithPreflight(ResourceRequest&&);
</span><span class="cx"> void preflightSuccess(ResourceRequest&&);
</span><span class="cx"> void preflightFailure(unsigned long identifier, const ResourceError&);
</span><span class="cx">
</span><del>- void loadRequest(const ResourceRequest&, SecurityCheckPolicy);
</del><ins>+ void loadRequest(ResourceRequest&&, SecurityCheckPolicy);
</ins><span class="cx"> bool isAllowedRedirect(const URL&);
</span><span class="cx"> bool isAllowedByContentSecurityPolicy(const URL&, bool didRedirect = false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -65,8 +65,9 @@
</span><span class="cx"> DataBufferingPolicy bufferingPolicy = options & LoadOption::BufferData ? WebCore::BufferData : WebCore::DoNotBufferData;
</span><span class="cx"> auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching;
</span><span class="cx">
</span><ins>+ // FIXME: We should try to remove the copy of request when crearing cacheRequest.
</ins><span class="cx"> // FIXME: Skip Content Security Policy check if the element that inititated this request is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
</span><del>- CachedResourceRequest cacheRequest(request, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, DoSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</del><ins>+ CachedResourceRequest cacheRequest(ResourceRequest(request), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, DoSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</ins><span class="cx">
</span><span class="cx"> cacheRequest.setAsPotentiallyCrossOrigin(m_crossOriginMode, *m_document);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -58,26 +58,26 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</del><ins>+RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, ResourceRequest&& request, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span><span class="cx"> ASSERT(context);
</span><span class="cx">
</span><span class="cx"> if (is<WorkerGlobalScope>(*context))
</span><del>- return WorkerThreadableLoader::create(downcast<WorkerGlobalScope>(context), client, WorkerRunLoop::defaultMode(), request, options);
</del><ins>+ return WorkerThreadableLoader::create(downcast<WorkerGlobalScope>(context), client, WorkerRunLoop::defaultMode(), WTFMove(request), options);
</ins><span class="cx">
</span><del>- return DocumentThreadableLoader::create(downcast<Document>(*context), *client, request, options);
</del><ins>+ return DocumentThreadableLoader::create(downcast<Document>(*context), *client, WTFMove(request), options);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableLoader::loadResourceSynchronously(ScriptExecutionContext* context, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</del><ins>+void ThreadableLoader::loadResourceSynchronously(ScriptExecutionContext* context, ResourceRequest&& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(context);
</span><span class="cx">
</span><span class="cx"> if (is<WorkerGlobalScope>(*context))
</span><del>- WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(context), request, client, options);
</del><ins>+ WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(context), WTFMove(request), client, options);
</ins><span class="cx"> else
</span><del>- DocumentThreadableLoader::loadResourceSynchronously(downcast<Document>(*context), request, client, options);
- context->didLoadResourceSynchronously(request);
</del><ins>+ DocumentThreadableLoader::loadResourceSynchronously(downcast<Document>(*context), WTFMove(request), client, options);
+ context->didLoadResourceSynchronously();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/ThreadableLoader.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -69,13 +69,13 @@
</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><span class="cx"> };
</span><span class="cx">
</span><del>- // Useful for doing loader operations from any thread (not threadsafe,
</del><ins>+ // Useful for doing loader operations from any thread (not threadsafe,
</ins><span class="cx"> // just able to run on threads other than the main thread).
</span><span class="cx"> class ThreadableLoader {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ThreadableLoader);
</span><span class="cx"> public:
</span><del>- static void loadResourceSynchronously(ScriptExecutionContext*, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
- static RefPtr<ThreadableLoader> create(ScriptExecutionContext*, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&);
</del><ins>+ static void loadResourceSynchronously(ScriptExecutionContext*, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
+ static RefPtr<ThreadableLoader> create(ScriptExecutionContext*, ThreadableLoaderClient*, ResourceRequest&&, const ThreadableLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> virtual void cancel() = 0;
</span><span class="cx"> void ref() { refThreadableLoader(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx">
</span><span class="cx"> static const char loadResourceSynchronouslyMode[] = "loadResourceSynchronouslyMode";
</span><span class="cx">
</span><del>-WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope* workerGlobalScope, ThreadableLoaderClient* client, const String& taskMode, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</del><ins>+WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope* workerGlobalScope, ThreadableLoaderClient* client, const String& taskMode, ResourceRequest&& request, const ThreadableLoaderOptions& options)
</ins><span class="cx"> : m_workerGlobalScope(workerGlobalScope)
</span><span class="cx"> , m_workerClientWrapper(ThreadableLoaderClientWrapper::create(client))
</span><del>- , m_bridge(*new MainThreadBridge(*m_workerClientWrapper, workerGlobalScope->thread().workerLoaderProxy(), taskMode, request, options, workerGlobalScope->url().strippedForUseAsReferrer(), workerGlobalScope->securityOrigin(), workerGlobalScope->contentSecurityPolicy()))
</del><ins>+ , m_bridge(*new MainThreadBridge(*m_workerClientWrapper, workerGlobalScope->thread().workerLoaderProxy(), taskMode, WTFMove(request), options, workerGlobalScope->url().strippedForUseAsReferrer(), workerGlobalScope->securityOrigin(), workerGlobalScope->contentSecurityPolicy()))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> m_bridge.destroy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope* workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</del><ins>+void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope* workerGlobalScope, ResourceRequest&& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> WorkerRunLoop& runLoop = workerGlobalScope->thread().runLoop();
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> String mode = loadResourceSynchronouslyMode;
</span><span class="cx"> mode.append(String::number(runLoop.createUniqueId()));
</span><span class="cx">
</span><del>- RefPtr<WorkerThreadableLoader> loader = WorkerThreadableLoader::create(workerGlobalScope, &client, mode, request, options);
</del><ins>+ RefPtr<WorkerThreadableLoader> loader = WorkerThreadableLoader::create(workerGlobalScope, &client, mode, WTFMove(request), options);
</ins><span class="cx"> MessageQueueWaitResult result = MessageQueueMessageReceived;
</span><span class="cx"> while (!loader->done() && result != MessageQueueTerminated)
</span><span class="cx"> result = runLoop.runInMode(workerGlobalScope, mode);
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerThreadableLoader::MainThreadBridge::MainThreadBridge(ThreadableLoaderClientWrapper& workerClientWrapper, WorkerLoaderProxy& loaderProxy, const String& taskMode,
</span><del>- const ResourceRequest& request, const ThreadableLoaderOptions& options, const String& outgoingReferrer,
</del><ins>+ ResourceRequest&& request, const ThreadableLoaderOptions& options, const String& outgoingReferrer,
</ins><span class="cx"> const SecurityOrigin* securityOrigin, const ContentSecurityPolicy* contentSecurityPolicy)
</span><span class="cx"> : m_workerClientWrapper(&workerClientWrapper)
</span><span class="cx"> , m_loaderProxy(loaderProxy)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx">
</span><span class="cx"> auto optionsCopy = std::make_unique<LoaderTaskOptions>(options, outgoingReferrer, *securityOrigin);
</span><span class="cx">
</span><ins>+ // Can we benefit from request being an r-value to create more efficiently its isolated copy?
</ins><span class="cx"> m_loaderProxy.postTaskToLoader([this, request = request.isolatedCopy(), options = WTFMove(optionsCopy), contentSecurityPolicyCopy = WTFMove(contentSecurityPolicyCopy)](ScriptExecutionContext& context) mutable {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="lines">@@ -120,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: If the site requests a local resource, then this will return a non-zero value but the sync path will return a 0 value.
</span><span class="cx"> // Either this should return 0 or the other code path should call a failure callback.
</span><del>- m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, request, options->options, WTFMove(options->origin), WTFMove(contentSecurityPolicyCopy));
</del><ins>+ m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, WTFMove(request), options->options, WTFMove(options->origin), WTFMove(contentSecurityPolicyCopy));
</ins><span class="cx"> ASSERT(m_mainThreadLoader || m_loadingFinished);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx"> class WorkerThreadableLoader : public RefCounted<WorkerThreadableLoader>, public ThreadableLoader {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static void loadResourceSynchronously(WorkerGlobalScope*, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
- static Ref<WorkerThreadableLoader> create(WorkerGlobalScope* workerGlobalScope, ThreadableLoaderClient* client, const String& taskMode, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</del><ins>+ static void loadResourceSynchronously(WorkerGlobalScope*, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
+ static Ref<WorkerThreadableLoader> create(WorkerGlobalScope* workerGlobalScope, ThreadableLoaderClient* client, const String& taskMode, ResourceRequest&& request, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WorkerThreadableLoader(workerGlobalScope, client, taskMode, request, options));
</del><ins>+ return adoptRef(*new WorkerThreadableLoader(workerGlobalScope, client, taskMode, WTFMove(request), options));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~WorkerThreadableLoader();
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> class MainThreadBridge : public ThreadableLoaderClient {
</span><span class="cx"> public:
</span><span class="cx"> // All executed on the worker context's thread.
</span><del>- MainThreadBridge(ThreadableLoaderClientWrapper&, WorkerLoaderProxy&, const String& taskMode, const ResourceRequest&, const ThreadableLoaderOptions&, const String& outgoingReferrer, const SecurityOrigin*, const ContentSecurityPolicy*);
</del><ins>+ MainThreadBridge(ThreadableLoaderClientWrapper&, WorkerLoaderProxy&, const String& taskMode, ResourceRequest&&, const ThreadableLoaderOptions&, const String& outgoingReferrer, const SecurityOrigin*, const ContentSecurityPolicy*);
</ins><span class="cx"> void cancel();
</span><span class="cx"> void destroy();
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> String m_taskMode;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WorkerThreadableLoader(WorkerGlobalScope*, ThreadableLoaderClient*, const String& taskMode, const ResourceRequest&, const ThreadableLoaderOptions&);
</del><ins>+ WorkerThreadableLoader(WorkerGlobalScope*, ThreadableLoaderClient*, const String& taskMode, ResourceRequest&&, const ThreadableLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<WorkerGlobalScope> m_workerGlobalScope;
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const ResourceLoaderOptions& options)
- : m_resourceRequest(resourceRequest)
</del><ins>+CachedResourceRequest::CachedResourceRequest(ResourceRequest&& resourceRequest, const ResourceLoaderOptions& options)
+ : m_resourceRequest(WTFMove(resourceRequest))
</ins><span class="cx"> , m_options(options)
</span><span class="cx"> , m_forPreload(false)
</span><span class="cx"> , m_defer(NoDefer)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> enum DeferOption { NoDefer, DeferredByClient };
</span><span class="cx">
</span><span class="cx"> explicit CachedResourceRequest(const ResourceRequest&, const String& charset = String(), Optional<ResourceLoadPriority> = Nullopt);
</span><del>- CachedResourceRequest(const ResourceRequest&, const ResourceLoaderOptions&);
</del><ins>+ CachedResourceRequest(ResourceRequest&&, const ResourceLoaderOptions&);
</ins><span class="cx"> CachedResourceRequest(const ResourceRequest&, Optional<ResourceLoadPriority>);
</span><span class="cx"> ~CachedResourceRequest();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/page/EventSource.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> options.setDataBufferingPolicy(DoNotBufferData);
</span><span class="cx"> options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
</span><span class="cx">
</span><del>- m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options);
</del><ins>+ m_loader = ThreadableLoader::create(scriptExecutionContext(), this, WTFMove(request), options);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Can we just use m_loader for this, null it out when it's no longer in flight, and eliminate the m_requestInFlight member?
</span><span class="cx"> if (m_loader)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> options.setSendLoadCallbacks(SendCallbacks);
</span><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><span class="cx">
</span><del>- WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(scriptExecutionContext), *request, *this, options);
</del><ins>+ WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(scriptExecutionContext), WTFMove(*request), *this, options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext* scriptExecutionContext, const URL& url, FetchOptions::Mode mode, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, WorkerScriptLoaderClient* client)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><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><del>- m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, *request, options);
</del><ins>+ m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, WTFMove(*request), options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const URL& WorkerScriptLoader::responseURL() const
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (203970 => 203971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-08-01 06:51:58 UTC (rev 203970)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-08-01 07:02:35 UTC (rev 203971)
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> // ThreadableLoader::create can return null here, for example if we're no longer attached to a page or if a content blocker blocks the load.
</span><span class="cx"> // This is true while running onunload handlers.
</span><span class="cx"> // FIXME: Maybe we need to be able to send XMLHttpRequests from onunload, <http://bugs.webkit.org/show_bug.cgi?id=10904>.
</span><del>- m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options);
</del><ins>+ m_loader = ThreadableLoader::create(scriptExecutionContext(), this, WTFMove(request), options);
</ins><span class="cx">
</span><span class="cx"> // Neither this object nor the JavaScript wrapper should be deleted while
</span><span class="cx"> // a request is in progress because we need to keep the listeners alive,
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
</span><del>- ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);
</del><ins>+ ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), WTFMove(request), *this, options);
</ins><span class="cx"> InspectorInstrumentation::didLoadXHRSynchronously(scriptExecutionContext());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>