Changeset 184080 in webkit

Timestamp:

May 11, 2015, 5:00:19 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r182707 - 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):

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/WorkerThreadableLoader.cpp (modified) (3 diffs)
• platform/CrossThreadCopier.h (modified) (1 diff)
• platform/network/ResourceResponseBase.cpp (modified) (3 diffs)
• platform/network/ResourceResponseBase.h (modified) (1 diff)
• platform/network/cf/ResourceResponse.h (modified) (1 diff)
• platform/network/curl/ResourceResponse.h (modified) (1 diff)
• platform/network/soup/ResourceResponse.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-03-05  Joonghun Park  <jh718.park@samsung.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp

@@ -43 +43 @@
 #include "WorkerThread.h"
 #include <wtf/MainThread.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
@@ -92 +91 @@
     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) {
@@ -162 +161 @@
 {
     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))

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h

@@ -143 +143 @@
 
     template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
-        typedef PassOwnPtr<CrossThreadResourceResponseData> Type;
+        typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
         static Type copy(const ResourceResponse&);
     };

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.cpp

@@ -92 +92 @@
 }
 
-PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadResourceResponseData> data)
-{
-    OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
+std::unique_ptr<ResourceResponse> ResourceResponseBase::adopt(std::unique_ptr<CrossThreadResourceResponseData> data)
+{
+    auto response = std::make_unique<ResourceResponse>();
     response->setURL(data->m_url);
     response->setMimeType(data->m_mimeType);
@@ -106 +106 @@
     response->m_httpHeaderFields.adopt(WTF::move(data->m_httpHeaders));
     response->m_resourceLoadTiming = data->m_resourceLoadTiming;
-    response->doPlatformAdopt(data);
-    return response.release();
-}
-
-PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
-{
-    OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResourceResponseData);
+    response->doPlatformAdopt(WTF::move(data));
+    return response;
+}
+
+std::unique_ptr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
+{
+    auto data = std::make_unique<CrossThreadResourceResponseData>();
     data->m_url = url().copy();
     data->m_mimeType = mimeType().isolatedCopy();
@@ -121 +121 @@
     data->m_httpHeaders = httpHeaderFields().copyData();
     data->m_resourceLoadTiming = m_resourceLoadTiming;
-    return asResourceResponse().doPlatformCopyData(data.release());
+    return asResourceResponse().doPlatformCopyData(WTF::move(data));
 }
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceResponseBase.h

@@ -49 +49 @@
     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; }

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceResponse.h

@@ -102 +102 @@
     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;

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceResponse.h

@@ -60 +60 @@
     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
     {

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceResponse.h

@@ -92 +92 @@
     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>) { }
 };