<!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>[201637] 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/201637">201637</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 22:40:40 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix AtomicString regression caused by <a href="http://trac.webkit.org/projects/webkit/changeset/201603">r201603</a>.
https://bugs.webkit.org/show_bug.cgi?id=158338
Reviewed by Chris Dumez.
No new tests (Refactor, plus already caught by existing test configs).
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::crossThreadData): Re-introduce the cross thread data concept,
but more modern and clean this time.
(WebCore::ResourceResponseBase::fromCrossThreadData):
(WebCore::ResourceResponseBase::isolatedCopy): Deleted.
* platform/network/ResourceResponseBase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201636 => 201637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-03 05:38:44 UTC (rev 201636)
+++ trunk/Source/WebCore/ChangeLog 2016-06-03 05:40:40 UTC (rev 201637)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-02 Brady Eidson <beidson@apple.com>
+
+ Fix AtomicString regression caused by r201603.
+ https://bugs.webkit.org/show_bug.cgi?id=158338
+
+ Reviewed by Chris Dumez.
+
+ No new tests (Refactor, plus already caught by existing test configs).
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
+
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::crossThreadData): Re-introduce the cross thread data concept,
+ but more modern and clean this time.
+ (WebCore::ResourceResponseBase::fromCrossThreadData):
+ (WebCore::ResourceResponseBase::isolatedCopy): Deleted.
+ * platform/network/ResourceResponseBase.h:
+
</ins><span class="cx"> 2016-06-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop BlobRegistryContext class as it is no longer needed
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (201636 => 201637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-03 05:38:44 UTC (rev 201636)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-06-03 05:40:40 UTC (rev 201637)
</span><span class="lines">@@ -162,9 +162,9 @@
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> Ref<ThreadableLoaderClientWrapper> protectedWorkerClientWrapper = *m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([protectedWorkerClientWrapper = WTFMove(protectedWorkerClientWrapper), identifier, response = response.isolatedCopy()] (ScriptExecutionContext& context) mutable {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([protectedWorkerClientWrapper = WTFMove(protectedWorkerClientWrapper), identifier, responseData = response.crossThreadData()] (ScriptExecutionContext& context) mutable {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- protectedWorkerClientWrapper->didReceiveResponse(identifier, response);
</del><ins>+ protectedWorkerClientWrapper->didReceiveResponse(identifier, ResourceResponse::fromCrossThreadData(WTFMove(responseData)));
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (201636 => 201637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2016-06-03 05:38:44 UTC (rev 201636)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2016-06-03 05:40:40 UTC (rev 201637)
</span><span class="lines">@@ -63,23 +63,42 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceResponse ResourceResponseBase::isolatedCopy() const
</del><ins>+std::unique_ptr<ResourceResponseBase::CrossThreadData> ResourceResponseBase::crossThreadData() const
</ins><span class="cx"> {
</span><ins>+ auto data = std::make_unique<CrossThreadData>();
+
+ data->url = url().isolatedCopy();
+ data->mimeType = mimeType().isolatedCopy();
+ data->expectedContentLength = expectedContentLength();
+ data->textEncodingName = textEncodingName().isolatedCopy();
+
+ data->httpStatusCode = httpStatusCode();
+ data->httpStatusText = httpStatusText().isolatedCopy();
+ data->httpVersion = httpVersion().isolatedCopy();
+
+ data->httpHeaderFields = httpHeaderFields().isolatedCopy();
+ data->resourceLoadTiming = m_resourceLoadTiming.isolatedCopy();
+ data->type = m_type;
+
+ return data;
+}
+
+ResourceResponse ResourceResponseBase::fromCrossThreadData(std::unique_ptr<CrossThreadData>&& data)
+{
</ins><span class="cx"> ResourceResponse response;
</span><span class="cx">
</span><del>- response.setURL(url().isolatedCopy());
- response.setMimeType(mimeType().isolatedCopy());
- response.setExpectedContentLength(expectedContentLength());
- response.setTextEncodingName(textEncodingName().isolatedCopy());
</del><ins>+ response.setURL(data->url);
+ response.setMimeType(data->mimeType);
+ response.setExpectedContentLength(data->expectedContentLength);
+ response.setTextEncodingName(data->textEncodingName);
</ins><span class="cx">
</span><del>- response.setHTTPStatusCode(httpStatusCode());
- response.setHTTPStatusText(httpStatusText().isolatedCopy());
- response.setHTTPVersion(httpVersion().isolatedCopy());
</del><ins>+ response.setHTTPStatusCode(data->httpStatusCode);
+ response.setHTTPStatusText(data->httpStatusText);
+ response.setHTTPVersion(data->httpVersion);
</ins><span class="cx">
</span><del>- response.lazyInit(AllFields);
- response.m_httpHeaderFields = httpHeaderFields().isolatedCopy();
- response.m_resourceLoadTiming = m_resourceLoadTiming.isolatedCopy();
- response.m_type = m_type;
</del><ins>+ response.m_httpHeaderFields = WTFMove(data->httpHeaderFields);
+ response.m_resourceLoadTiming = data->resourceLoadTiming;
+ response.m_type = data->type;
</ins><span class="cx">
</span><span class="cx"> return response;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (201636 => 201637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2016-06-03 05:38:44 UTC (rev 201636)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2016-06-03 05:40:40 UTC (rev 201637)
</span><span class="lines">@@ -45,8 +45,24 @@
</span><span class="cx"> class ResourceResponseBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- ResourceResponse isolatedCopy() const;
</del><ins>+ enum class Type;
</ins><span class="cx">
</span><ins>+ struct CrossThreadData {
+ URL url;
+ String mimeType;
+ long long expectedContentLength;
+ String textEncodingName;
+ int httpStatusCode;
+ String httpStatusText;
+ String httpVersion;
+ HTTPHeaderMap httpHeaderFields;
+ ResourceLoadTiming resourceLoadTiming;
+ Type type;
+ };
+
+ std::unique_ptr<CrossThreadData> crossThreadData() const;
+ static ResourceResponse fromCrossThreadData(std::unique_ptr<CrossThreadData>&&);
+
</ins><span class="cx"> bool isNull() const { return m_isNull; }
</span><span class="cx"> WEBCORE_EXPORT bool isHTTP() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>