Attachment 249460 Details for Bug 143056 – Patch

[patch] Patch

bug-143056-20150326103736.patch (text/plain), 10.28 KB, created by Joonghun Park on 2015-03-25 18:38:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joonghun Park

Created: 2015-03-25 18:38:15 PDT

Size: 10.28 KB

patch

obsolete

>Subversion Revision: 181958
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 00a83a0a5992ddc9394e15be6da81a263f8750f0..8c417706ae492eb627f0201d62df5587acf72518 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2015-03-25  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 NOBODY (OOPS!).
>+
>+        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-25  Dan Bernstein  <mitz@apple.com>
> 
>         iOS Simulator build fix.
>diff --git a/Source/WebCore/loader/WorkerThreadableLoader.cpp b/Source/WebCore/loader/WorkerThreadableLoader.cpp
>index ea2de6233bf90d8c195bfc85451d29a5e3b988f3..02c75867c6b85910d06df694fdbe63090f5b7b88 100644
>--- a/Source/WebCore/loader/WorkerThreadableLoader.cpp
>+++ b/Source/WebCore/loader/WorkerThreadableLoader.cpp
>@@ -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 @@ WorkerThreadableLoader::MainThreadBridge::MainThreadBridge(PassRefPtr<Threadable
> {
>     ASSERT(m_workerClientWrapper.get());
> 
>-    auto requestData = request.copyData().release();
>+    CrossThreadResourceRequestData* 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::didSendData(unsigned long long by
> void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
> {
>     RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
>-    CrossThreadResourceResponseData* responseData = response.copyData().leakPtr();
>+    CrossThreadResourceResponseData* 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;
>diff --git a/Source/WebCore/platform/CrossThreadCopier.h b/Source/WebCore/platform/CrossThreadCopier.h
>index c98097183687d1d907e4d3dacdb385322a736bed..f38663c2628f1408313cc7221890c802510a2f0d 100644
>--- a/Source/WebCore/platform/CrossThreadCopier.h
>+++ b/Source/WebCore/platform/CrossThreadCopier.h
>@@ -142,7 +142,7 @@ namespace WebCore {
>     };
> 
>     template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
>-        typedef PassOwnPtr<CrossThreadResourceResponseData> Type;
>+        typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
>         static Type copy(const ResourceResponse&);
>     };
> 
>diff --git a/Source/WebCore/platform/network/ResourceResponseBase.cpp b/Source/WebCore/platform/network/ResourceResponseBase.cpp
>index 1b18b8a00f05433478eedc42fb8fc947ccf6bddf..c89ce6676c8d3bab25c8df83647b26f5fc6939ef 100644
>--- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
>@@ -91,9 +91,9 @@ ResourceResponseBase::ResourceResponseBase(const URL& url, const String& mimeTyp
> {
> }
> 
>-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 @@ PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadR
>     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 = adoptPtr(new CrossThreadResourceResponseData);
>+    auto data = std::make_unique<CrossThreadResourceResponseData>();
>     data->m_url = url().copy();
>     data->m_mimeType = mimeType().isolatedCopy();
>     data->m_expectedContentLength = expectedContentLength();
>@@ -120,7 +120,7 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() con
>     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
>diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
>index 2350a4a2c2af4c31e8c8798e7bb399075bf61aa8..754c41ade69cf9dd6d1e1de2f16f52497ef3c5c1 100644
>--- a/Source/WebCore/platform/network/ResourceResponseBase.h
>+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
>@@ -48,10 +48,10 @@ struct CrossThreadResourceResponseData;
> 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;
>diff --git a/Source/WebCore/platform/network/cf/ResourceResponse.h b/Source/WebCore/platform/network/cf/ResourceResponse.h
>index 65284bd274922e439232f2321bbb364b9229a167..acc1d456975cc12f39a338dbb243941e57c26d1a 100644
>--- a/Source/WebCore/platform/network/cf/ResourceResponse.h
>+++ b/Source/WebCore/platform/network/cf/ResourceResponse.h
>@@ -101,8 +101,8 @@ private:
>     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
>diff --git a/Source/WebCore/platform/network/curl/ResourceResponse.h b/Source/WebCore/platform/network/curl/ResourceResponse.h
>index c792f9254e774a2eddc4750adb30344418fcec81..4307f6e40ce19614358e4f03d049c3cedf0f28a3 100644
>--- a/Source/WebCore/platform/network/curl/ResourceResponse.h
>+++ b/Source/WebCore/platform/network/curl/ResourceResponse.h
>@@ -59,8 +59,8 @@ public:
> 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));
>diff --git a/Source/WebCore/platform/network/soup/ResourceResponse.h b/Source/WebCore/platform/network/soup/ResourceResponse.h
>index de35d2a6c7990817c27004c5253f60fe39eebbbe..397e1a12880d4393de44fad98b7d4484b958ec52 100644
>--- a/Source/WebCore/platform/network/soup/ResourceResponse.h
>+++ b/Source/WebCore/platform/network/soup/ResourceResponse.h
>@@ -91,8 +91,8 @@ private:
>     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>

Actions: View | Formatted Diff | Diff

Attachments on bug 143056: 249423 | 249460 | 250630