<!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>[184081] releases/WebKitGTK/webkit-2.8/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/184081">184081</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 05:01:21 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182866">r182866</a> - No thread safety when passing ThreadableLoaderOptions from a worker thread
https://bugs.webkit.org/show_bug.cgi?id=143790
Reviewed by Geoffrey Garen.
* loader/ThreadableLoader.h:
* loader/ThreadableLoader.cpp: (WebCore::ThreadableLoaderOptions::isolatedCopy): Added.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge): Don't just send
a structure with strings to a different thread, that's bad.
* platform/CrossThreadCopier.h: I think that this is dead code, but for this bug,
just removing a clearly wrong specialization.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderThreadableLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderThreadableLoaderh">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderWorkerThreadableLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformCrossThreadCopierh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184080 => 184081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 12:00:19 UTC (rev 184080)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 12:01:21 UTC (rev 184081)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-15 Alexey Proskuryakov <ap@apple.com>
+
+ No thread safety when passing ThreadableLoaderOptions from a worker thread
+ https://bugs.webkit.org/show_bug.cgi?id=143790
+
+ Reviewed by Geoffrey Garen.
+
+ * loader/ThreadableLoader.h:
+ * loader/ThreadableLoader.cpp: (WebCore::ThreadableLoaderOptions::isolatedCopy): Added.
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge): Don't just send
+ a structure with strings to a different thread, that's bad.
+
+ * platform/CrossThreadCopier.h: I think that this is dead code, but for this bug,
+ just removing a clearly wrong specialization.
+
</ins><span class="cx"> 2015-04-13 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceResponse
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp (184080 => 184081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-05-11 12:00:19 UTC (rev 184080)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-05-11 12:01:21 UTC (rev 184081)
</span><span class="lines">@@ -51,6 +51,17 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<ThreadableLoaderOptions> ThreadableLoaderOptions::isolatedCopy() const
+{
+ std::unique_ptr<ThreadableLoaderOptions> copy = std::make_unique<ThreadableLoaderOptions>();
+ copy->preflightPolicy = preflightPolicy;
+ copy->crossOriginRequestPolicy = crossOriginRequestPolicy;
+ if (securityOrigin)
+ copy->securityOrigin = securityOrigin->isolatedCopy();
+ copy->initiator = initiator.string().isolatedCopy();
+ return copy;
+}
+
</ins><span class="cx"> PassRefPtr<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="releasesWebKitGTKwebkit28SourceWebCoreloaderThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h (184080 => 184081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-05-11 12:00:19 UTC (rev 184080)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-05-11 12:01:21 UTC (rev 184081)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> ThreadableLoaderOptions();
</span><span class="cx"> ~ThreadableLoaderOptions();
</span><span class="cx">
</span><ins>+ std::unique_ptr<ThreadableLoaderOptions> isolatedCopy() const;
+
</ins><span class="cx"> PreflightPolicy preflightPolicy; // If AccessControl is used, how to determine if a preflight is needed.
</span><span class="cx"> CrossOriginRequestPolicy crossOriginRequestPolicy;
</span><span class="cx"> RefPtr<SecurityOrigin> securityOrigin;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp (184080 => 184081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 12:00:19 UTC (rev 184080)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 12:01:21 UTC (rev 184081)
</span><span class="lines">@@ -91,18 +91,21 @@
</span><span class="cx"> ASSERT(m_workerClientWrapper.get());
</span><span class="cx">
</span><span class="cx"> auto* requestData = request.copyData().release();
</span><ins>+ auto* optionsCopy = options.isolatedCopy().release();
</ins><span class="cx"> StringCapture capturedOutgoingReferrer(outgoingReferrer);
</span><del>- m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([this, requestData, optionsCopy, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><span class="cx"> auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
</span><span class="cx"> request->setHTTPReferrer(capturedOutgoingReferrer.string());
</span><span class="cx">
</span><ins>+ auto options = std::unique_ptr<ThreadableLoaderOptions>(optionsCopy);
+
</ins><span class="cx"> // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
</span><span class="cx"> // will return a 0 value. Either this should return 0 or the other code path should do a callback with
</span><span class="cx"> // a failure.
</span><del>- m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, *request, options);
</del><ins>+ m_mainThreadLoader = DocumentThreadableLoader::create(document, *this, *request, *options);
</ins><span class="cx"> ASSERT(m_mainThreadLoader);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h (184080 => 184081)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 12:00:19 UTC (rev 184080)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 12:01:21 UTC (rev 184081)
</span><span class="lines">@@ -92,9 +92,6 @@
</span><span class="cx">
</span><span class="cx"> // To allow a type to be passed across threads using its copy constructor, add a forward declaration of the type and
</span><span class="cx"> // a CopyThreadCopierBase<false, false, TypeName> : public CrossThreadCopierPassThrough<TypeName> { }; to this file.
</span><del>- template<> struct CrossThreadCopierBase<false, false, ThreadableLoaderOptions> : public CrossThreadCopierPassThrough<ThreadableLoaderOptions> {
- };
-
</del><span class="cx"> template<> struct CrossThreadCopierBase<false, false, IntRect> : public CrossThreadCopierPassThrough<IntRect> {
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>