Changeset 202357 in webkit


Ignore:
Timestamp:
Jun 22, 2016 4:31:42 PM (8 years ago)
Author:
Chris Dumez
Message:

Stop using PassRefPtr in ShareableResource
​https://bugs.webkit.org/show_bug.cgi?id=159043

Reviewed by Alex Christensen.

Stop using PassRefPtr in ShareableResource.

  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::store):

  • NetworkProcess/cache/NetworkCacheEntry.cpp:

(WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord):

  • Shared/ShareableResource.cpp:

(WebKit::shareableResourceDeallocate):
(WebKit::ShareableResource::wrapInSharedBuffer):
(WebKit::ShareableResource::Handle::tryWrapInSharedBuffer):
(WebKit::ShareableResource::create):
(WebKit::ShareableResource::map):
(WebKit::ShareableResource::ShareableResource):

  • Shared/ShareableResource.h:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r202354 r202357  
     12016-06-22  Chris Dumez  <cdumez@apple.com>
     2
     3        Stop using PassRefPtr in ShareableResource
     4        https://bugs.webkit.org/show_bug.cgi?id=159043
     5
     6        Reviewed by Alex Christensen.
     7
     8        Stop using PassRefPtr in ShareableResource.
     9
     10        * NetworkProcess/cache/NetworkCache.cpp:
     11        (WebKit::NetworkCache::Cache::store):
     12        * NetworkProcess/cache/NetworkCacheEntry.cpp:
     13        (WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord):
     14        * Shared/ShareableResource.cpp:
     15        (WebKit::shareableResourceDeallocate):
     16        (WebKit::ShareableResource::wrapInSharedBuffer):
     17        (WebKit::ShareableResource::Handle::tryWrapInSharedBuffer):
     18        (WebKit::ShareableResource::create):
     19        (WebKit::ShareableResource::map):
     20        (WebKit::ShareableResource::ShareableResource):
     21        * Shared/ShareableResource.h:
     22
    1232016-06-17  Dean Jackson  <dino@apple.com>
    224

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

    r202154 r202357  
    413413        MappedBody mappedBody;
    414414#if ENABLE(SHAREABLE_RESOURCE)
    415         if (RefPtr<SharedMemory> sharedMemory = bodyData.tryCreateSharedMemory()) {
    416             mappedBody.shareableResource = ShareableResource::create(WTFMove(sharedMemory), 0, bodyData.size());
     415        if (auto sharedMemory = bodyData.tryCreateSharedMemory()) {
     416            mappedBody.shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, bodyData.size());
    417417            ASSERT(mappedBody.shareableResource);
    418418            mappedBody.shareableResource->createHandle(mappedBody.shareableResourceHandle);

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp

    r202242 r202357  
    150150        return;
    151151
    152     auto shareableResource = ShareableResource::create(WTFMove(sharedMemory), 0, m_sourceStorageRecord.body.size());
     152    auto shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, m_sourceStorageRecord.body.size());
    153153    shareableResource->createHandle(m_shareableResourceHandle);
    154154}

  • trunk/Source/WebKit2/Shared/ShareableResource.cpp

    r202242 r202357  
    6161static void shareableResourceDeallocate(void *ptr, void *info)
    6262{
    63     (static_cast<ShareableResource*>(info))->deref(); // Balanced by ref() in createShareableResourceDeallocator()
     63    static_cast<ShareableResource*>(info)->deref(); // Balanced by ref() in createShareableResourceDeallocator()
    6464}
    6565   
    … …  
    8181#endif
    8282
    83 PassRefPtr<SharedBuffer> ShareableResource::wrapInSharedBuffer()
     83RefPtr<SharedBuffer> ShareableResource::wrapInSharedBuffer()
    8484{
    8585    ref(); // Balanced by deref when SharedBuffer is deallocated.
    … …  
    9797}
    9898
    99 PassRefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
     99RefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
    100100{
    101101    RefPtr<ShareableResource> resource = ShareableResource::map(*this);
    … …  
    108108}
    109109
    110 Ref<ShareableResource> ShareableResource::create(PassRefPtr<SharedMemory> sharedMemory, unsigned offset, unsigned size)
     110Ref<ShareableResource> ShareableResource::create(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
    111111{
    112     return adoptRef(*new ShareableResource(sharedMemory, offset, size));
     112    return adoptRef(*new ShareableResource(WTFMove(sharedMemory), offset, size));
    113113}
    114114
    115 PassRefPtr<ShareableResource> ShareableResource::map(const Handle& handle)
     115RefPtr<ShareableResource> ShareableResource::map(const Handle& handle)
    116116{
    117117    auto sharedMemory = SharedMemory::map(handle.m_handle, SharedMemory::Protection::ReadOnly);
    118118    if (!sharedMemory)
    119         return 0;
     119        return nullptr;
    120120
    121     return create(WTFMove(sharedMemory), handle.m_offset, handle.m_size);
     121    return create(sharedMemory.releaseNonNull(), handle.m_offset, handle.m_size);
    122122}
    123123
    124 ShareableResource::ShareableResource(PassRefPtr<SharedMemory> sharedMemory, unsigned offset, unsigned size)
    125     : m_sharedMemory(sharedMemory)
     124ShareableResource::ShareableResource(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
     125    : m_sharedMemory(WTFMove(sharedMemory))
    126126    , m_offset(offset)
    127127    , m_size(size)
    128128{
    129     ASSERT(m_sharedMemory);
    130129    ASSERT(m_offset + m_size <= m_sharedMemory->size());
    131130   

  • trunk/Source/WebKit2/Shared/ShareableResource.h

    r186566 r202357  
    3131#include "SharedMemory.h"
    3232
    33 #include <wtf/PassRefPtr.h>
    3433#include <wtf/RefCounted.h>
    3534#include <wtf/RefPtr.h>
    … …  
    5756        static bool decode(IPC::ArgumentDecoder&, Handle&);
    5857
    59         PassRefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
     58        RefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
    6059
    6160    private:
    … …  
    6867
    6968    // Create a shareable resource that uses malloced memory.
    70     static Ref<ShareableResource> create(PassRefPtr<SharedMemory>, unsigned offset, unsigned size);
     69    static Ref<ShareableResource> create(Ref<SharedMemory>&&, unsigned offset, unsigned size);
    7170
    7271    // Create a shareable resource from a handle.
    73     static PassRefPtr<ShareableResource> map(const Handle&);
     72    static RefPtr<ShareableResource> map(const Handle&);
    7473
    7574    // Create a handle.
    … …  
    8281   
    8382private:
    84     ShareableResource(PassRefPtr<SharedMemory>, unsigned offset, unsigned size);
    85     PassRefPtr<WebCore::SharedBuffer> wrapInSharedBuffer();
     83    ShareableResource(Ref<SharedMemory>&&, unsigned offset, unsigned size);
     84    RefPtr<WebCore::SharedBuffer> wrapInSharedBuffer();
    8685
    87     RefPtr<SharedMemory> m_sharedMemory;
     86    Ref<SharedMemory> m_sharedMemory;
    8887
    8988    unsigned m_offset;
Note: See TracChangeset for help on using the changeset viewer.