<!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>[202614] 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/202614">202614</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-28 23:25:59 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ThreadableLoaderOptions origin
https://bugs.webkit.org/show_bug.cgi?id=159221
Patch by Youenn Fablet <youennf@gmail.com> on 2016-06-28
Reviewed by Sam Weinig.
No change of behavior.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadResourceSynchronously): Adding origing parameter.
(WebCore::DocumentThreadableLoader::create): Ditto.
(WebCore::DocumentThreadableLoader::DocumentThreadableLoader): Ditto.
(WebCore::DocumentThreadableLoader::redirectReceived): Setting m_origin.
(WebCore::DocumentThreadableLoader::securityOrigin): Checking m_origin.
* loader/DocumentThreadableLoader.h: Adding m_origin member.
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Removing origin.
(WebCore::ThreadableLoaderOption::isolatedCopy): Deleted.
* loader/ThreadableLoader.h: Removing origin parameter and isolatedCopy function.
* loader/WorkerThreadableLoader.cpp:
(WebCore::LoaderTaskOptions::LoaderTaskOptions): Structure to pass loader task options from one thread to another.
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
* page/EventSource.cpp:
(WebCore::EventSource::connect): Removing setting of the origin.
* workers/WorkerScriptLoader.cpp:
(WebCore::WorkerScriptLoader::loadSynchronously): Ditto.
(WebCore::WorkerScriptLoader::loadAsynchronously): Ditto.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#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="#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 (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-28 Youenn Fablet <youennf@gmail.com>
+
+ Remove ThreadableLoaderOptions origin
+ https://bugs.webkit.org/show_bug.cgi?id=159221
+
+ Reviewed by Sam Weinig.
+
+ No change of behavior.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::loadResourceSynchronously): Adding origing parameter.
+ (WebCore::DocumentThreadableLoader::create): Ditto.
+ (WebCore::DocumentThreadableLoader::DocumentThreadableLoader): Ditto.
+ (WebCore::DocumentThreadableLoader::redirectReceived): Setting m_origin.
+ (WebCore::DocumentThreadableLoader::securityOrigin): Checking m_origin.
+ * loader/DocumentThreadableLoader.h: Adding m_origin member.
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Removing origin.
+ (WebCore::ThreadableLoaderOption::isolatedCopy): Deleted.
+ * loader/ThreadableLoader.h: Removing origin parameter and isolatedCopy function.
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::LoaderTaskOptions::LoaderTaskOptions): Structure to pass loader task options from one thread to another.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+ * page/EventSource.cpp:
+ (WebCore::EventSource::connect): Removing setting of the origin.
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::loadSynchronously): Ditto.
+ (WebCore::WorkerScriptLoader::loadAsynchronously): Ditto.
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest): Ditto.
+
</ins><span class="cx"> 2016-06-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202580.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -56,21 +56,21 @@
</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, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+void DocumentThreadableLoader::loadResourceSynchronously(Document& document, const 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(contentSecurityPolicy)));
</del><ins>+ RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadSynchronously, request, options, WTFMove(origin), WTFMove(contentSecurityPolicy)));
</ins><span class="cx"> ASSERT(loader->hasOneRef());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::loadResourceSynchronously(Document& document, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</span><span class="cx"> {
</span><del>- loadResourceSynchronously(document, request, client, options, nullptr);
</del><ins>+ loadResourceSynchronously(document, 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, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, const 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(contentSecurityPolicy)));
</del><ins>+ RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadAsynchronously, 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="lines">@@ -78,13 +78,14 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</span><span class="cx"> {
</span><del>- return create(document, client, request, options, nullptr);
</del><ins>+ return create(document, client, 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, std::unique_ptr<ContentSecurityPolicy>&& contentSecurityPolicy)
</del><ins>+DocumentThreadableLoader::DocumentThreadableLoader(Document& document, ThreadableLoaderClient& client, BlockingBehavior blockingBehavior, const 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><ins>+ , m_origin(WTFMove(origin))
</ins><span class="cx"> , m_sameOriginRequest(securityOrigin()->canRequest(request.url()))
</span><span class="cx"> , m_simpleRequest(true)
</span><span class="cx"> , m_async(blockingBehavior == LoadAsynchronously)
</span><span class="lines">@@ -239,7 +240,7 @@
</span><span class="cx"> // set the source origin to a globally unique identifier. (If the original request was same-origin, the origin of the new request
</span><span class="cx"> // should be the original URL origin.)
</span><span class="cx"> if (!m_sameOriginRequest && !originalOrigin->isSameSchemeHostPort(requestOrigin.get()))
</span><del>- m_options.securityOrigin = SecurityOrigin::createUnique();
</del><ins>+ m_origin = SecurityOrigin::createUnique();
</ins><span class="cx"> // Force any subsequent request to use these checks.
</span><span class="cx"> m_sameOriginRequest = false;
</span><span class="cx">
</span><span class="lines">@@ -444,7 +445,7 @@
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* DocumentThreadableLoader::securityOrigin() const
</span><span class="cx"> {
</span><del>- return m_options.securityOrigin ? m_options.securityOrigin.get() : m_document.securityOrigin();
</del><ins>+ return m_origin ? m_origin.get() : m_document.securityOrigin();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const ContentSecurityPolicy& DocumentThreadableLoader::contentSecurityPolicy() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #define DocumentThreadableLoader_h
</span><span class="cx">
</span><span class="cx"> #include "CrossOriginPreflightChecker.h"
</span><ins>+#include "SecurityOrigin.h"
</ins><span class="cx"> #include "ThreadableLoader.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,16 +39,15 @@
</span><span class="cx"> class CachedRawResource;
</span><span class="cx"> class ContentSecurityPolicy;
</span><span class="cx"> class Document;
</span><del>- class SecurityOrigin;
</del><span class="cx"> class ThreadableLoaderClient;
</span><span class="cx">
</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&, std::unique_ptr<ContentSecurityPolicy>&&);
</del><ins>+ static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
</ins><span class="cx"> static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
</span><span class="cx">
</span><del>- static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&, std::unique_ptr<ContentSecurityPolicy>&&);
</del><ins>+ static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&, RefPtr<SecurityOrigin>&&, std::unique_ptr<ContentSecurityPolicy>&&);
</ins><span class="cx"> static RefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&);
</span><span class="cx">
</span><span class="cx"> virtual ~DocumentThreadableLoader();
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> LoadAsynchronously
</span><span class="cx"> };
</span><span class="cx">
</span><del>- DocumentThreadableLoader(Document&, ThreadableLoaderClient&, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&, std::unique_ptr<ContentSecurityPolicy>&&);
</del><ins>+ DocumentThreadableLoader(Document&, ThreadableLoaderClient&, BlockingBehavior, const 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">@@ -108,6 +108,7 @@
</span><span class="cx"> ThreadableLoaderClient* m_client;
</span><span class="cx"> Document& m_document;
</span><span class="cx"> ThreadableLoaderOptions m_options;
</span><ins>+ RefPtr<SecurityOrigin> m_origin;
</ins><span class="cx"> bool m_sameOriginRequest;
</span><span class="cx"> bool m_simpleRequest;
</span><span class="cx"> bool m_async;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -49,24 +49,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, CrossOriginRequestPolicy crossOriginRequestPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, RefPtr<SecurityOrigin>&& securityOrigin, String&& initiator)
</del><ins>+ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, CrossOriginRequestPolicy crossOriginRequestPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, String&& initiator)
</ins><span class="cx"> : ResourceLoaderOptions(baseOptions)
</span><span class="cx"> , preflightPolicy(preflightPolicy)
</span><span class="cx"> , crossOriginRequestPolicy(crossOriginRequestPolicy)
</span><span class="cx"> , contentSecurityPolicyEnforcement(contentSecurityPolicyEnforcement)
</span><del>- , securityOrigin(WTFMove(securityOrigin))
</del><span class="cx"> , initiator(WTFMove(initiator))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<ThreadableLoaderOptions> ThreadableLoaderOptions::isolatedCopy() const
-{
- RefPtr<SecurityOrigin> securityOriginCopy;
- if (securityOrigin)
- securityOriginCopy = securityOrigin->isolatedCopy();
- return std::make_unique<ThreadableLoaderOptions>(*this, preflightPolicy, crossOriginRequestPolicy, contentSecurityPolicyEnforcement, WTFMove(securityOriginCopy), initiator.isolatedCopy());
-}
-
</del><span class="cx"> RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.h 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/loader/ThreadableLoader.h 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -67,11 +67,9 @@
</span><span class="cx">
</span><span class="cx"> struct ThreadableLoaderOptions : ResourceLoaderOptions {
</span><span class="cx"> ThreadableLoaderOptions();
</span><del>- ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, CrossOriginRequestPolicy, ContentSecurityPolicyEnforcement, RefPtr<SecurityOrigin>&&, String&& initiator);
</del><ins>+ ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, CrossOriginRequestPolicy, ContentSecurityPolicyEnforcement, String&& initiator);
</ins><span class="cx"> ~ThreadableLoaderOptions();
</span><span class="cx">
</span><del>- std::unique_ptr<ThreadableLoaderOptions> isolatedCopy() const;
-
</del><span class="cx"> PreflightPolicy preflightPolicy { ConsiderPreflight };
</span><span class="cx"> CrossOriginRequestPolicy crossOriginRequestPolicy { DenyCrossOriginRequests };
</span><span class="cx"> ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement { ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -83,6 +83,20 @@
</span><span class="cx"> m_bridge.cancel();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct LoaderTaskOptions {
+ LoaderTaskOptions(const ThreadableLoaderOptions&, const String&, const SecurityOrigin&);
+ ThreadableLoaderOptions options;
+ String referrer;
+ RefPtr<SecurityOrigin> origin;
+};
+
+LoaderTaskOptions::LoaderTaskOptions(const ThreadableLoaderOptions& options, const String& referrer, const SecurityOrigin& origin)
+ : options(options, options.preflightPolicy, options.crossOriginRequestPolicy, options.contentSecurityPolicyEnforcement, options.initiator.isolatedCopy())
+ , referrer(referrer.isolatedCopy())
+ , origin(origin.isolatedCopy())
+{
+}
+
</ins><span class="cx"> WorkerThreadableLoader::MainThreadBridge::MainThreadBridge(ThreadableLoaderClientWrapper& workerClientWrapper, WorkerLoaderProxy& loaderProxy, const String& taskMode,
</span><span class="cx"> const ResourceRequest& request, const ThreadableLoaderOptions& options, const String& outgoingReferrer,
</span><span class="cx"> const SecurityOrigin* securityOrigin, const ContentSecurityPolicy* contentSecurityPolicy)
</span><span class="lines">@@ -96,16 +110,17 @@
</span><span class="cx"> auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin);
</span><span class="cx"> contentSecurityPolicyCopy->copyStateFrom(contentSecurityPolicy);
</span><span class="cx">
</span><del>- m_loaderProxy.postTaskToLoader([this, request = request.isolatedCopy(), options = options.isolatedCopy(), contentSecurityPolicyCopy = WTFMove(contentSecurityPolicyCopy), outgoingReferrer = outgoingReferrer.isolatedCopy()](ScriptExecutionContext& context) mutable {
</del><ins>+ auto optionsCopy = std::make_unique<LoaderTaskOptions>(options, outgoingReferrer, *securityOrigin);
+
+ m_loaderProxy.postTaskToLoader([this, request = request.isolatedCopy(), options = WTFMove(optionsCopy), contentSecurityPolicyCopy = WTFMove(contentSecurityPolicyCopy)](ScriptExecutionContext& context) mutable {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><del>- request.setHTTPReferrer(outgoingReferrer);
</del><ins>+ request.setHTTPReferrer(options->referrer);
</ins><span class="cx">
</span><del>- // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
- // will return a 0 value. Either this should return 0 or the other code path should do a callback with
- // a failure.
- m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, request, *options, WTFMove(contentSecurityPolicyCopy));
</del><ins>+ // 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.
+ // Either this should return 0 or the other code path should call a failure callback.
+ m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, 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="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/page/EventSource.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> options.preflightPolicy = PreventPreflight;
</span><span class="cx"> options.crossOriginRequestPolicy = UseAccessControl;
</span><span class="cx"> options.setDataBufferingPolicy(DoNotBufferData);
</span><del>- options.securityOrigin = &origin;
</del><span class="cx"> options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
</span><span class="cx">
</span><span class="cx"> m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -68,12 +68,11 @@
</span><span class="cx"> options.setAllowCredentials(AllowStoredCredentials);
</span><span class="cx"> options.crossOriginRequestPolicy = crossOriginRequestPolicy;
</span><span class="cx"> options.setSendLoadCallbacks(SendCallbacks);
</span><del>- options.securityOrigin = scriptExecutionContext->securityOrigin();
</del><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><span class="cx">
</span><span class="cx"> WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(scriptExecutionContext), *request, *this, options);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext* scriptExecutionContext, const URL& url, CrossOriginRequestPolicy crossOriginRequestPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, WorkerScriptLoaderClient* client)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span><span class="lines">@@ -88,7 +87,6 @@
</span><span class="cx"> options.setAllowCredentials(AllowStoredCredentials);
</span><span class="cx"> options.crossOriginRequestPolicy = crossOriginRequestPolicy;
</span><span class="cx"> options.setSendLoadCallbacks(SendCallbacks);
</span><del>- options.securityOrigin = scriptExecutionContext->securityOrigin();
</del><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><span class="cx">
</span><span class="cx"> // During create, callbacks may happen which remove the last reference to this object.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (202613 => 202614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-06-29 05:55:37 UTC (rev 202613)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-06-29 06:25:59 UTC (rev 202614)
</span><span class="lines">@@ -715,7 +715,6 @@
</span><span class="cx"> options.setAllowCredentials((m_sameOriginRequest || m_includeCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</span><span class="cx"> options.setCredentialRequest(m_includeCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentials);
</span><span class="cx"> options.crossOriginRequestPolicy = UseAccessControl;
</span><del>- options.securityOrigin = securityOrigin();
</del><span class="cx"> options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
</span><span class="cx"> options.initiator = cachedResourceRequestInitiators().xmlhttprequest;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>