⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 184079 in webkit


Ignore:
Timestamp:
May 11, 2015, 4:49:10 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r181136 - Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
​https://bugs.webkit.org/show_bug.cgi?id=142349

Patch by Joonghun Park <​jh718.park@samsung.com> on 2015-03-05
Reviewed by Darin Adler.

No new tests, no behavior changes.

  • loader/WorkerThreadableLoader.cpp:

(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):

  • loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::removeRequestFromSessionCaches):

  • platform/CrossThreadCopier.h:
  • platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::adopt):
(WebCore::ResourceRequestBase::copyData):

  • platform/network/ResourceRequestBase.h:
  • platform/network/cf/ResourceRequest.h:
  • platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):

  • platform/network/curl/ResourceRequest.h:

(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):

  • platform/network/soup/ResourceRequest.h:

(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):

Location:
releases/WebKitGTK/webkit-2.8/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r184077 r184079  
     12015-03-05  Joonghun Park  <jh718.park@samsung.com>
     2
     3        Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
     4        https://bugs.webkit.org/show_bug.cgi?id=142349
     5
     6        Reviewed by Darin Adler.
     7
     8        No new tests, no behavior changes.
     9
     10        * loader/WorkerThreadableLoader.cpp:
     11        (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
     12        * loader/cache/MemoryCache.cpp:
     13        (WebCore::MemoryCache::removeRequestFromSessionCaches):
     14        * platform/CrossThreadCopier.h:
     15        * platform/network/ResourceRequestBase.cpp:
     16        (WebCore::ResourceRequestBase::adopt):
     17        (WebCore::ResourceRequestBase::copyData):
     18        * platform/network/ResourceRequestBase.h:
     19        * platform/network/cf/ResourceRequest.h:
     20        * platform/network/cf/ResourceRequestCFNet.cpp:
     21        (WebCore::ResourceRequest::doPlatformCopyData):
     22        (WebCore::ResourceRequest::doPlatformAdopt):
     23        * platform/network/curl/ResourceRequest.h:
     24        (WebCore::ResourceRequest::doPlatformCopyData):
     25        (WebCore::ResourceRequest::doPlatformAdopt):
     26        * platform/network/soup/ResourceRequest.h:
     27        (WebCore::ResourceRequest::doPlatformCopyData):
     28        (WebCore::ResourceRequest::doPlatformAdopt):
     29
    1302015-04-14  Zalan Bujtas  <zalan@apple.com>
    231

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

    r179473 r184079  
    9292    ASSERT(m_workerClientWrapper.get());
    9393
    94     CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
     94    auto requestData = request.copyData().release();
    9595    StringCapture capturedOutgoingReferrer(outgoingReferrer);
    9696    m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
    … …  
    9898        Document& document = downcast<Document>(context);
    9999
    100         OwnPtr<ResourceRequest> request = ResourceRequest::adopt(adoptPtr(requestData));
     100        auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
    101101        request->setHTTPReferrer(capturedOutgoingReferrer.string());
    102102

  • releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp

    r180207 r184079  
    601601{
    602602    if (is<WorkerGlobalScope>(context)) {
    603         CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
     603        CrossThreadResourceRequestData* requestData = request.copyData().release();
    604604        downcast<WorkerGlobalScope>(context).thread().workerLoaderProxy().postTaskToLoader([requestData] (ScriptExecutionContext& context) {
    605             OwnPtr<ResourceRequest> request(ResourceRequest::adopt(adoptPtr(requestData)));
     605            auto request(ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData)));
    606606            MemoryCache::removeRequestFromSessionCaches(context, *request);
    607607        });

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

    r179861 r184079  
    138138
    139139    template<> struct CrossThreadCopierBase<false, false, ResourceRequest> {
    140         typedef PassOwnPtr<CrossThreadResourceRequestData> Type;
     140        typedef std::unique_ptr<CrossThreadResourceRequestData> Type;
    141141        static Type copy(const ResourceRequest&);
    142142    };

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

    r179584 r184079  
    2929#include "HTTPHeaderNames.h"
    3030#include "ResourceRequest.h"
    31 #include <wtf/PassOwnPtr.h>
    3231
    3332namespace WebCore {
    … …  
    5049}
    5150
    52 PassOwnPtr<ResourceRequest> ResourceRequestBase::adopt(PassOwnPtr<CrossThreadResourceRequestData> data)
    53 {
    54     OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest());
     51std::unique_ptr<ResourceRequest> ResourceRequestBase::adopt(std::unique_ptr<CrossThreadResourceRequestData> data)
     52{
     53    auto request = std::make_unique<ResourceRequest>();
    5554    request->setURL(data->m_url);
    5655    request->setCachePolicy(data->m_cachePolicy);
    … …  
    7877    request->setHTTPBody(data->m_httpBody);
    7978    request->setAllowCookies(data->m_allowCookies);
    80     request->doPlatformAdopt(data);
    81     return request.release();
    82 }
    83 
    84 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
    85 {
    86     OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());
     79    request->doPlatformAdopt(WTF::move(data));
     80    return request;
     81}
     82
     83std::unique_ptr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
     84{
     85    auto data = std::make_unique<CrossThreadResourceRequestData>();
    8786    data->m_url = url().copy();
    8887    data->m_cachePolicy = cachePolicy();
    … …  
    101100        data->m_httpBody = m_httpBody->deepCopy();
    102101    data->m_allowCookies = m_allowCookies;
    103     return asResourceRequest().doPlatformCopyData(data.release());
     102    return asResourceRequest().doPlatformCopyData(WTF::move(data));
    104103}
    105104

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

    r179861 r184079  
    5555        WTF_MAKE_FAST_ALLOCATED;
    5656    public:
    57         static PassOwnPtr<ResourceRequest> adopt(PassOwnPtr<CrossThreadResourceRequestData>);
     57        static std::unique_ptr<ResourceRequest> adopt(std::unique_ptr<CrossThreadResourceRequestData>);
    5858
    5959        // Gets a copy of the data suitable for passing to another thread.
    60         PassOwnPtr<CrossThreadResourceRequestData> copyData() const;
     60        std::unique_ptr<CrossThreadResourceRequestData> copyData() const;
    6161
    6262        WEBCORE_EXPORT bool isNull() const;

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

    r175171 r184079  
    142142#endif
    143143
    144         PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData>) const;
    145         void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>);
     144        std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData>) const;
     145        void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>);
    146146
    147147#if USE(CFNETWORK)

  • releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r179584 r184079  
    2929#include "HTTPHeaderNames.h"
    3030#include "ResourceRequest.h"
    31 #include <wtf/PassOwnPtr.h>
    3231
    3332#if ENABLE(PUBLIC_SUFFIX_LIST)
    … …  
    367366#endif
    368367
    369 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const
     368std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const
    370369{
    371370#if ENABLE(CACHE_PARTITIONING)
    … …  
    375374}
    376375
    377 void ResourceRequest::doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData> data)
     376void ResourceRequest::doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData> data)
    378377{
    379378#if ENABLE(CACHE_PARTITIONING)

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

    r169797 r184079  
    2929
    3030#include "ResourceRequestBase.h"
    31 
    32 #include <wtf/PassOwnPtr.h>
    3331
    3432typedef const struct _CFURLRequest* CFURLRequestRef;
    … …  
    8179        void doUpdateResourceHTTPBody() { }
    8280
    83         PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
    84         void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
     81        std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
     82        void doPlatformAdopt(std:unique_ptr<CrossThreadResourceRequestData>) { }
    8583 
    8684        static bool s_httpPipeliningEnabled;

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

    r179584 r184079  
    3131#include "ResourceRequestBase.h"
    3232#include <libsoup/soup.h>
    33 #include <wtf/PassOwnPtr.h>
    3433
    3534namespace WebCore {
    … …  
    122121        void doUpdateResourceHTTPBody() { }
    123122
    124         PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
    125         void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
     123        std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
     124        void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>) { }
    126125    };
    127126
Note: See TracChangeset for help on using the changeset viewer.