<!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>[184080] 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/184080">184080</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 05:00:19 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182707">r182707</a> - Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceResponse
https://bugs.webkit.org/show_bug.cgi?id=143056
Patch by Joonghun Park <jh718.park@samsung.com> on 2015-04-13
Reviewed by Gyuyoung Kim.
No new tests, no behavior changes.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
* platform/CrossThreadCopier.h:
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::adopt):
(WebCore::ResourceResponseBase::copyData):
* platform/network/ResourceResponseBase.h:
* platform/network/cf/ResourceResponse.h:
(WebCore::ResourceResponse::doPlatformCopyData):
(WebCore::ResourceResponse::doPlatformAdopt):
* platform/network/curl/ResourceResponse.h:
(WebCore::ResourceResponse::doPlatformCopyData):
(WebCore::ResourceResponse::doPlatformAdopt):
* platform/network/soup/ResourceResponse.h:
(WebCore::ResourceResponse::doPlatformCopyData):
(WebCore::ResourceResponse::doPlatformAdopt):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</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>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceResponseBasecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceResponseBaseh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceResponseh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcurlResourceResponseh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworksoupResourceResponseh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.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 (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-04-13 Joonghun Park <jh718.park@samsung.com>
+
+ Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceResponse
+ https://bugs.webkit.org/show_bug.cgi?id=143056
+
+ Reviewed by Gyuyoung Kim.
+
+ No new tests, no behavior changes.
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
+ * platform/CrossThreadCopier.h:
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::adopt):
+ (WebCore::ResourceResponseBase::copyData):
+ * platform/network/ResourceResponseBase.h:
+ * platform/network/cf/ResourceResponse.h:
+ (WebCore::ResourceResponse::doPlatformCopyData):
+ (WebCore::ResourceResponse::doPlatformAdopt):
+ * platform/network/curl/ResourceResponse.h:
+ (WebCore::ResourceResponse::doPlatformCopyData):
+ (WebCore::ResourceResponse::doPlatformAdopt):
+ * platform/network/soup/ResourceResponse.h:
+ (WebCore::ResourceResponse::doPlatformCopyData):
+ (WebCore::ResourceResponse::doPlatformAdopt):
+
</ins><span class="cx"> 2015-03-05 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "WorkerLoaderProxy.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -91,7 +90,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_workerClientWrapper.get());
</span><span class="cx">
</span><del>- auto requestData = request.copyData().release();
</del><ins>+ auto* requestData = request.copyData().release();
</ins><span class="cx"> StringCapture capturedOutgoingReferrer(outgoingReferrer);
</span><span class="cx"> m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -161,10 +160,10 @@
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- CrossThreadResourceResponseData* responseData = response.copyData().leakPtr();
</del><ins>+ auto* responseData = response.copyData().release();
</ins><span class="cx"> if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, identifier, responseData] (ScriptExecutionContext& context) {
</span><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- OwnPtr<ResourceResponse> response(ResourceResponse::adopt(adoptPtr(responseData)));
</del><ins>+ auto response(ResourceResponse::adopt(std::unique_ptr<CrossThreadResourceResponseData>(responseData)));
</ins><span class="cx"> workerClientWrapper->didReceiveResponse(identifier, *response);
</span><span class="cx"> }, m_taskMode))
</span><span class="cx"> delete responseData;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
</span><del>- typedef PassOwnPtr<CrossThreadResourceResponseData> Type;
</del><ins>+ typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
</ins><span class="cx"> static Type copy(const ResourceResponse&);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -91,9 +91,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadResourceResponseData> data)
</del><ins>+std::unique_ptr<ResourceResponse> ResourceResponseBase::adopt(std::unique_ptr<CrossThreadResourceResponseData> data)
</ins><span class="cx"> {
</span><del>- OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
</del><ins>+ auto response = std::make_unique<ResourceResponse>();
</ins><span class="cx"> response->setURL(data->m_url);
</span><span class="cx"> response->setMimeType(data->m_mimeType);
</span><span class="cx"> response->setExpectedContentLength(data->m_expectedContentLength);
</span><span class="lines">@@ -105,13 +105,13 @@
</span><span class="cx"> response->lazyInit(AllFields);
</span><span class="cx"> response->m_httpHeaderFields.adopt(WTF::move(data->m_httpHeaders));
</span><span class="cx"> response->m_resourceLoadTiming = data->m_resourceLoadTiming;
</span><del>- response->doPlatformAdopt(data);
- return response.release();
</del><ins>+ response->doPlatformAdopt(WTF::move(data));
+ return response;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
</del><ins>+std::unique_ptr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
</ins><span class="cx"> {
</span><del>- OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResourceResponseData);
</del><ins>+ auto data = std::make_unique<CrossThreadResourceResponseData>();
</ins><span class="cx"> data->m_url = url().copy();
</span><span class="cx"> data->m_mimeType = mimeType().isolatedCopy();
</span><span class="cx"> data->m_expectedContentLength = expectedContentLength();
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> data->m_httpStatusText = httpStatusText().isolatedCopy();
</span><span class="cx"> data->m_httpHeaders = httpHeaderFields().copyData();
</span><span class="cx"> data->m_resourceLoadTiming = m_resourceLoadTiming;
</span><del>- return asResourceResponse().doPlatformCopyData(data.release());
</del><ins>+ return asResourceResponse().doPlatformCopyData(WTF::move(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ResourceResponseBase::isHTTP() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx"> class ResourceResponseBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ResourceResponse> adopt(PassOwnPtr<CrossThreadResourceResponseData>);
</del><ins>+ static std::unique_ptr<ResourceResponse> adopt(std::unique_ptr<CrossThreadResourceResponseData>);
</ins><span class="cx">
</span><span class="cx"> // Gets a copy of the data suitable for passing to another thread.
</span><del>- PassOwnPtr<CrossThreadResourceResponseData> copyData() const;
</del><ins>+ std::unique_ptr<CrossThreadResourceResponseData> copyData() const;
</ins><span class="cx">
</span><span class="cx"> bool isNull() const { return m_isNull; }
</span><span class="cx"> WEBCORE_EXPORT bool isHTTP() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> String platformSuggestedFilename() const;
</span><span class="cx"> CertificateInfo platformCertificateInfo() const;
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
</del><ins>+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void initNSURLResponse() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcurlResourceResponseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class ResourceResponseBase;
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
</del><ins>+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
</ins><span class="cx"> String platformSuggestedFilename() const
</span><span class="cx"> {
</span><span class="cx"> return filenameFromHTTPContentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworksoupResourceResponseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.h (184079 => 184080)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.h 2015-05-11 11:49:10 UTC (rev 184079)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.h 2015-05-11 12:00:19 UTC (rev 184080)
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> String platformSuggestedFilename() const;
</span><span class="cx"> CertificateInfo platformCertificateInfo() const;
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
</del><ins>+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<class Encoder>
</span></span></pre>
</div>
</div>
</body>
</html>