Changeset 182707 in webkit


Ignore:
Timestamp:
Apr 13, 2015 4:18:04 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

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:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r182704 r182707  
     12015-04-13  Joonghun Park  <jh718.park@samsung.com>
     2
     3        Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceResponse
     4        https://bugs.webkit.org/show_bug.cgi?id=143056
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        No new tests, no behavior changes.
     9
     10        * loader/WorkerThreadableLoader.cpp:
     11        (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
     12        (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
     13        * platform/CrossThreadCopier.h:
     14        * platform/network/ResourceResponseBase.cpp:
     15        (WebCore::ResourceResponseBase::adopt):
     16        (WebCore::ResourceResponseBase::copyData):
     17        * platform/network/ResourceResponseBase.h:
     18        * platform/network/cf/ResourceResponse.h:
     19        (WebCore::ResourceResponse::doPlatformCopyData):
     20        (WebCore::ResourceResponse::doPlatformAdopt):
     21        * platform/network/curl/ResourceResponse.h:
     22        (WebCore::ResourceResponse::doPlatformCopyData):
     23        (WebCore::ResourceResponse::doPlatformAdopt):
     24        * platform/network/soup/ResourceResponse.h:
     25        (WebCore::ResourceResponse::doPlatformCopyData):
     26        (WebCore::ResourceResponse::doPlatformAdopt):
     27
    1282015-04-10  Sergio Villar Senin  <svillar@igalia.com>
    229

  • trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp

    r181136 r182707  
    4343#include "WorkerThread.h"
    4444#include <wtf/MainThread.h>
    45 #include <wtf/OwnPtr.h>
    4645#include <wtf/Vector.h>
    4746
    … …  
    9291    ASSERT(m_workerClientWrapper.get());
    9392
    94     auto requestData = request.copyData().release();
     93    auto* requestData = request.copyData().release();
    9594    StringCapture capturedOutgoingReferrer(outgoingReferrer);
    9695    m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
    … …  
    162161{
    163162    RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
    164     CrossThreadResourceResponseData* responseData = response.copyData().leakPtr();
     163    auto* responseData = response.copyData().release();
    165164    if (!m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, identifier, responseData] (ScriptExecutionContext& context) {
    166165        ASSERT_UNUSED(context, context.isWorkerGlobalScope());
    167         OwnPtr<ResourceResponse> response(ResourceResponse::adopt(adoptPtr(responseData)));
     166        auto response(ResourceResponse::adopt(std::unique_ptr<CrossThreadResourceResponseData>(responseData)));
    168167        workerClientWrapper->didReceiveResponse(identifier, *response);
    169168    }, m_taskMode))

  • trunk/Source/WebCore/platform/CrossThreadCopier.h

    r181136 r182707  
    143143
    144144    template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
    145         typedef PassOwnPtr<CrossThreadResourceResponseData> Type;
     145        typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
    146146        static Type copy(const ResourceResponse&);
    147147    };

  • trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

    r182271 r182707  
    6363}
    6464
    65 PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadResourceResponseData> data)
    66 {
    67     OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
     65std::unique_ptr<ResourceResponse> ResourceResponseBase::adopt(std::unique_ptr<CrossThreadResourceResponseData> data)
     66{
     67    auto response = std::make_unique<ResourceResponse>();
    6868    response->setURL(data->m_url);
    6969    response->setMimeType(data->m_mimeType);
    … …  
    7777    response->m_httpHeaderFields.adopt(WTF::move(data->m_httpHeaders));
    7878    response->m_resourceLoadTiming = data->m_resourceLoadTiming;
    79     response->doPlatformAdopt(data);
    80     return response.release();
    81 }
    82 
    83 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
    84 {
    85     OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResourceResponseData);
     79    response->doPlatformAdopt(WTF::move(data));
     80    return response;
     81}
     82
     83std::unique_ptr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
     84{
     85    auto data = std::make_unique<CrossThreadResourceResponseData>();
    8686    data->m_url = url().copy();
    8787    data->m_mimeType = mimeType().isolatedCopy();
    … …  
    9292    data->m_httpHeaders = httpHeaderFields().copyData();
    9393    data->m_resourceLoadTiming = m_resourceLoadTiming;
    94     return asResourceResponse().doPlatformCopyData(data.release());
     94    return asResourceResponse().doPlatformCopyData(WTF::move(data));
    9595}
    9696

  • trunk/Source/WebCore/platform/network/ResourceResponseBase.h

    r182271 r182707  
    5050    WTF_MAKE_FAST_ALLOCATED;
    5151public:
    52     static PassOwnPtr<ResourceResponse> adopt(PassOwnPtr<CrossThreadResourceResponseData>);
     52    static std::unique_ptr<ResourceResponse> adopt(std::unique_ptr<CrossThreadResourceResponseData>);
    5353
    5454    // Gets a copy of the data suitable for passing to another thread.
    55     PassOwnPtr<CrossThreadResourceResponseData> copyData() const;
     55    std::unique_ptr<CrossThreadResourceResponseData> copyData() const;
    5656
    5757    bool isNull() const { return m_isNull; }

  • trunk/Source/WebCore/platform/network/cf/ResourceResponse.h

    r173423 r182707  
    102102    CertificateInfo platformCertificateInfo() const;
    103103
    104     PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
    105     void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
     104    std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
     105    void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
    106106#if PLATFORM(COCOA)
    107107    void initNSURLResponse() const;

  • trunk/Source/WebCore/platform/network/curl/ResourceResponse.h

    r173329 r182707  
    6060    friend class ResourceResponseBase;
    6161
    62     PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
    63     void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
     62    std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
     63    void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
    6464    String platformSuggestedFilename() const
    6565    {

  • trunk/Source/WebCore/platform/network/soup/ResourceResponse.h

    r173423 r182707  
    9292    CertificateInfo platformCertificateInfo() const;
    9393
    94     PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
    95     void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
     94    std::unique_ptr<CrossThreadResourceResponseData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceResponseData> data) const { return data; }
     95    void doPlatformAdopt(std::unique_ptr<CrossThreadResourceResponseData>) { }
    9696};
    9797
Note: See TracChangeset for help on using the changeset viewer.