Changeset 235169 in webkit


Ignore:
Timestamp:
Aug 22, 2018 7:19:48 AM (6 years ago)
Author:
Antti Koivisto
Message:

Use OptionSet for NetworkCache::Storage::TraverseFlags
​https://bugs.webkit.org/show_bug.cgi?id=188837

Reviewed by Anders Carlsson.

Type safe flags.

  • NetworkProcess/cache/CacheStorageEngineCaches.cpp:

(WebKit::CacheStorage::Caches::initializeSize):
(WebKit::CacheStorage::Caches::readRecordsList):

  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::traverse):
(WebKit::NetworkCache::Cache::dumpContentsToFile):

  • NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::TraverseOperation::TraverseOperation):
(WebKit::NetworkCache::Storage::traverse):

  • NetworkProcess/cache/NetworkCacheStorage.h:
  • WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:

(WebKit::UserMediaPermissionRequestManager::captureDevicesChanged):
(WebKit::UserMediaPermissionRequestManager::activityStateDidChange):

Also use OptionSet<>::containsAll() in a few places.

Location:
trunk/Source/WebKit
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r235166 r235169  
     12018-08-22  Antti Koivisto  <antti@apple.com>
     2
     3        Use OptionSet for NetworkCache::Storage::TraverseFlags
     4        https://bugs.webkit.org/show_bug.cgi?id=188837
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Type safe flags.
     9
     10        * NetworkProcess/cache/CacheStorageEngineCaches.cpp:
     11        (WebKit::CacheStorage::Caches::initializeSize):
     12        (WebKit::CacheStorage::Caches::readRecordsList):
     13        * NetworkProcess/cache/NetworkCache.cpp:
     14        (WebKit::NetworkCache::Cache::traverse):
     15        (WebKit::NetworkCache::Cache::dumpContentsToFile):
     16        * NetworkProcess/cache/NetworkCacheStorage.cpp:
     17        (WebKit::NetworkCache::Storage::TraverseOperation::TraverseOperation):
     18        (WebKit::NetworkCache::Storage::traverse):
     19        * NetworkProcess/cache/NetworkCacheStorage.h:
     20        * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
     21        (WebKit::UserMediaPermissionRequestManager::captureDevicesChanged):
     22        (WebKit::UserMediaPermissionRequestManager::activityStateDidChange):
     23
     24        Also use OptionSet<>::containsAll() in a few places.
     25
    1262018-08-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    227

  • trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp

    r235101 r235169  
    187187
    188188    uint64_t size = 0;
    189     m_storage->traverse({ }, 0, [protectedThis = makeRef(*this), this, protectedStorage = makeRef(*m_storage), size](const auto* storage, const auto& information) mutable {
     189    m_storage->traverse({ }, { }, [protectedThis = makeRef(*this), this, protectedStorage = makeRef(*m_storage), size](const auto* storage, const auto& information) mutable {
    190190        if (!storage) {
    191191            if (m_pendingInitializationCallbacks.isEmpty()) {
    … …  
    461461        return;
    462462    }
    463     m_storage->traverse(cache.uniqueName(), 0, [protectedStorage = makeRef(*m_storage), callback = WTFMove(callback)](const auto* storage, const auto& information) {
     463    m_storage->traverse(cache.uniqueName(), { }, [protectedStorage = makeRef(*m_storage), callback = WTFMove(callback)](const auto* storage, const auto& information) {
    464464        callback(storage, information);
    465465    });

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

    r235101 r235169  
    484484    ++m_traverseCount;
    485485
    486     m_storage->traverse(resourceType(), 0, [this, protectedThis = makeRef(*this), traverseHandler = WTFMove(traverseHandler)](const Storage::Record* record, const Storage::RecordInfo& recordInfo) {
     486    m_storage->traverse(resourceType(), { }, [this, protectedThis = makeRef(*this), traverseHandler = WTFMove(traverseHandler)](const Storage::Record* record, const Storage::RecordInfo& recordInfo) {
    487487        if (!record) {
    488488            --m_traverseCount;
    … …  
    519519    };
    520520    Totals totals;
    521     auto flags = Storage::TraverseFlag::ComputeWorth | Storage::TraverseFlag::ShareCount;
     521    auto flags = { Storage::TraverseFlag::ComputeWorth, Storage::TraverseFlag::ShareCount };
    522522    size_t capacity = m_storage->capacity();
    523523    m_storage->traverse(resourceType(), flags, [fd, totals, capacity](const Storage::Record* record, const Storage::RecordInfo& info) mutable {

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

    r232759 r235169  
    124124    WTF_MAKE_FAST_ALLOCATED;
    125125public:
    126     TraverseOperation(Storage& storage, const String& type, TraverseFlags flags, TraverseHandler&& handler)
     126    TraverseOperation(Storage& storage, const String& type, OptionSet<TraverseFlag> flags, TraverseHandler&& handler)
    127127        : storage(storage)
    128128        , type(type)
    … …  
    133133
    134134    const String type;
    135     const TraverseFlags flags;
     135    const OptionSet<TraverseFlag> flags;
    136136    const TraverseHandler handler;
    137137
    … …  
    903903}
    904904
    905 void Storage::traverse(const String& type, TraverseFlags flags, TraverseHandler&& traverseHandler)
     905void Storage::traverse(const String& type, OptionSet<TraverseFlag> flags, TraverseHandler&& traverseHandler)
    906906{
    907907    ASSERT(RunLoop::isMain());

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h

    r235133 r235169  
    9999        ShareCount = 1 << 1,
    100100    };
    101     typedef unsigned TraverseFlags;
    102     typedef Function<void (const Record*, const RecordInfo&)> TraverseHandler;
     101    using TraverseHandler = Function<void (const Record*, const RecordInfo&)>;
    103102    // Null record signals end.
    104     void traverse(const String& type, TraverseFlags, TraverseHandler&&);
     103    void traverse(const String& type, OptionSet<TraverseFlag>, TraverseHandler&&);
    105104
    106105    void setCapacity(size_t);

  • trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp

    r235086 r235169  
    255255    // * the active document is fully active and has focus.
    256256
    257     bool isActive = (m_page.corePage()->activityState() & focusedActiveWindow) == focusedActiveWindow;
     257    bool isActive = m_page.corePage()->activityState().containsAll(focusedActiveWindow);
    258258    if (!isActive && accessState == DeviceAccessState::NoAccess) {
    259259        if (!isActive) {
    … …  
    278278void UserMediaPermissionRequestManager::activityStateDidChange(OptionSet<WebCore::ActivityState::Flag> oldActivityState, OptionSet<WebCore::ActivityState::Flag> newActivityState)
    279279{
    280     if ((newActivityState & focusedActiveWindow) != focusedActiveWindow)
     280    if (!newActivityState.containsAll(focusedActiveWindow))
    281281        return;
    282282
Note: See TracChangeset for help on using the changeset viewer.