Attachment 348449 Details for Bug 189130 – Patch

[patch] Patch

bug-189130-20180829165036.patch (text/plain), 3.18 KB, created by Chris Dumez on 2018-08-29 16:50:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-08-29 16:50:37 PDT

Size: 3.18 KB

patch

obsolete

>Subversion Revision: 235487
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 439ed38a61be4d855abb1d77e74f1c6d6dbff62d..46480476c92b2facd26ca5aa262f89c81ee79849 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-29  Chris Dumez  <cdumez@apple.com>
>+
>+        Avoid code duplication in ResourceLoadStatisticsMemoryStore::processStatisticsAndDataRecords()
>+        https://bugs.webkit.org/show_bug.cgi?id=189130
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move if check inside the lambda instead of outside to avoid code duplication.
>+
>+        * UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
>+        (WebKit::ResourceLoadStatisticsMemoryStore::processStatisticsAndDataRecords):
>+
> 2018-08-29  Chris Dumez  <cdumez@apple.com>
> 
>         Crash under WebKit: WTF::Function<void ()>::CallableWrapper<WebKit::ResourceLoadStatisticsMemoryStore::removeDataRecords(WTF::CompletionHandler<void ()>&&)::$_1>::call()
>diff --git a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>index e589f85bc750b26c7345f1f27fbf0a75bc1cbdf2..17ce7bd05c9453985930ce4e362e3a542f539b2b 100644
>--- a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>+++ b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>@@ -345,31 +345,22 @@ void ResourceLoadStatisticsMemoryStore::processStatisticsAndDataRecords()
>         }
>     }
> 
>-    if (m_parameters.shouldNotifyPagesWhenDataRecordsWereScanned) {
>-        removeDataRecords([this, weakThis = makeWeakPtr(*this)] {
>-            ASSERT(!RunLoop::isMain());
>-            if (!weakThis)
>-                return;
>-
>-            pruneStatisticsIfNeeded();
>-            if (m_persistentStorage)
>-                m_persistentStorage->scheduleOrWriteMemoryStore(ResourceLoadStatisticsPersistentStorage::ForceImmediateWrite::No);
>-
>-            RunLoop::main().dispatch([] {
>-                WebProcessProxy::notifyPageStatisticsAndDataRecordsProcessed();
>-            });
>-        });
>-    } else {
>-        removeDataRecords([this, weakThis = makeWeakPtr(*this)] {
>-            ASSERT(!RunLoop::isMain());
>-            if (!weakThis)
>-                return;
>-
>-            pruneStatisticsIfNeeded();
>-            if (m_persistentStorage)
>-                m_persistentStorage->scheduleOrWriteMemoryStore(ResourceLoadStatisticsPersistentStorage::ForceImmediateWrite::No);
>+    removeDataRecords([this, weakThis = makeWeakPtr(*this)] {
>+        ASSERT(!RunLoop::isMain());
>+        if (!weakThis)
>+            return;
>+
>+        pruneStatisticsIfNeeded();
>+        if (m_persistentStorage)
>+            m_persistentStorage->scheduleOrWriteMemoryStore(ResourceLoadStatisticsPersistentStorage::ForceImmediateWrite::No);
>+
>+        if (!m_parameters.shouldNotifyPagesWhenDataRecordsWereScanned)
>+            return;
>+
>+        RunLoop::main().dispatch([] {
>+            WebProcessProxy::notifyPageStatisticsAndDataRecordsProcessed();
>         });
>-    }
>+    });
> }
> 
> void ResourceLoadStatisticsMemoryStore::hasStorageAccess(const String& subFramePrimaryDomain, const String& topFramePrimaryDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& completionHandler)

Actions: View | Formatted Diff | Diff

Attachments on bug 189130: 348449