Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184079 => 184080)
--- 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)
@@ -1,3 +1,30 @@
+2015-04-13 Joonghun Park <[email protected]>
+
+ 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):
+
2015-03-05 Joonghun Park <[email protected]>
Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp (184079 => 184080)
--- 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)
@@ -42,7 +42,6 @@
#include "WorkerLoaderProxy.h"
#include "WorkerThread.h"
#include <wtf/MainThread.h>
-#include <wtf/OwnPtr.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -91,7 +90,7 @@
{
ASSERT(m_workerClientWrapper.get());
- auto requestData = request.copyData().release();
+ auto* requestData = request.copyData().release();
StringCapture capturedOutgoingReferrer(outgoingReferrer);
m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
ASSERT(isMainThread());
@@ -161,10 +160,10 @@
void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
{
RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
- CrossThreadResourceResponseData* responseData = response.copyData().leakPtr();
+ auto* responseData = response.copyData().release();
if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, identifier, responseData] (ScriptExecutionContext& context) {
ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- OwnPtr<ResourceResponse> response(ResourceResponse::adopt(adoptPtr(responseData)));
+ auto response(ResourceResponse::adopt(std::unique_ptr<CrossThreadResourceResponseData>(responseData)));
workerClientWrapper->didReceiveResponse(identifier, *response);
}, m_taskMode))
delete responseData;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h (184079 => 184080)
--- 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)
@@ -142,7 +142,7 @@
};
template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
- typedef PassOwnPtr<CrossThreadResourceResponseData> Type;
+ typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
static Type copy(const ResourceResponse&);
};
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp (184079 => 184080)
--- 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)
@@ -91,9 +91,9 @@
{
}
-PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadResourceResponseData> data)
+std::unique_ptr<ResourceResponse> ResourceResponseBase::adopt(std::unique_ptr<CrossThreadResourceResponseData> data)
{
- OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
+ auto response = std::make_unique<ResourceResponse>();
response->setURL(data->m_url);
response->setMimeType(data->m_mimeType);
response->setExpectedContentLength(data->m_expectedContentLength);
@@ -105,13 +105,13 @@
response->lazyInit(AllFields);
response->m_httpHeaderFields.adopt(WTF::move(data->m_httpHeaders));
response->m_resourceLoadTiming = data->m_resourceLoadTiming;
- response->doPlatformAdopt(data);
- return response.release();
+ response->doPlatformAdopt(WTF::move(data));
+ return response;
}
-PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
+std::unique_ptr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
{
- OwnPtr<CrossThreadResourceResponseData> data = "" CrossThreadResourceResponseData);
+ auto data = ""
data->m_url = url().copy();
data->m_mimeType = mimeType().isolatedCopy();
data->m_expectedContentLength = expectedContentLength();
@@ -120,7 +120,7 @@
data->m_httpStatusText = httpStatusText().isolatedCopy();
data->m_httpHeaders = httpHeaderFields().copyData();
data->m_resourceLoadTiming = m_resourceLoadTiming;
- return asResourceResponse().doPlatformCopyData(data.release());
+ return asResourceResponse().doPlatformCopyData(WTF::move(data));
}
bool ResourceResponseBase::isHTTP() const
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h (184079 => 184080)
--- 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)
@@ -48,10 +48,10 @@
class ResourceResponseBase {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassOwnPtr<ResourceResponse> adopt(PassOwnPtr<CrossThreadResourceResponseData>);
+ static std::unique_ptr<ResourceResponse> adopt(std::unique_ptr<CrossThreadResourceResponseData>);
// Gets a copy of the data suitable for passing to another thread.
- PassOwnPtr<CrossThreadResourceResponseData> copyData() const;
+ std::unique_ptr<CrossThreadResourceResponseData> copyData() const;
bool isNull() const { return m_isNull; }
WEBCORE_EXPORT bool isHTTP() const;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h (184079 => 184080)
--- 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)
@@ -101,8 +101,8 @@
String platformSuggestedFilename() const;
CertificateInfo platformCertificateInfo() const;
- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
#if PLATFORM(COCOA)
void initNSURLResponse() const;
#endif
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h (184079 => 184080)
--- 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)
@@ -59,8 +59,8 @@
private:
friend class ResourceResponseBase;
- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
String platformSuggestedFilename() const
{
return filenameFromHTTPContentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.h (184079 => 184080)
--- 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)
@@ -91,8 +91,8 @@
String platformSuggestedFilename() const;
CertificateInfo platformCertificateInfo() const;
- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
+ std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
};
template<class Encoder>
