Unreviewed, rolling out r219828.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Jul 2017 21:42:51 +0000 (21:42 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Jul 2017 21:42:51 +0000 (21:42 +0000)
Causes debug assertions to be hit on iOS

Reverted changeset:

"Fix lifetime management issue in
ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore()"
https://bugs.webkit.org/show_bug.cgi?id=174790
http://trac.webkit.org/changeset/219828

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp
Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h

index fa166bd..8978090 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-24  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r219828.
+
+        Causes debug assertions to be hit on iOS
+
+        Reverted changeset:
+
+        "Fix lifetime management issue in
+        ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore()"
+        https://bugs.webkit.org/show_bug.cgi?id=174790
+        http://trac.webkit.org/changeset/219828
+
 2017-07-24  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [GTK][WPE] Stop using AutodrainedPool in IconDatabase
index 7c80114..58ea1aa 100644 (file)
@@ -83,8 +83,7 @@ static std::unique_ptr<KeyedDecoder> createDecoderForFile(const String& path)
 }
 
 ResourceLoadStatisticsPersistentStorage::ResourceLoadStatisticsPersistentStorage(WebResourceLoadStatisticsStore& store, const String& storageDirectoryPath)
-    : m_weakPtrFactory(this)
-    , m_memoryStore(store)
+    : m_memoryStore(store)
     , m_storageDirectoryPath(storageDirectoryPath)
 {
 }
@@ -281,10 +280,8 @@ void ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore()
         if (!m_hasPendingWrite) {
             m_hasPendingWrite = true;
             Seconds delay = minimumWriteInterval - timeSinceLastWrite + 1_s;
-            // WorkQueue::dispatchAfter() keeps the WorkQueue alive so the dispatched lambda may get executed after the store has been destroyed.
-            m_memoryStore.statisticsQueue().dispatchAfter(delay, [weakThis = createWeakPtr()] () mutable {
-                if (weakThis)
-                    weakThis->writeMemoryStoreToDisk();
+            m_memoryStore.statisticsQueue().dispatchAfter(delay, [this] () mutable {
+                writeMemoryStoreToDisk();
             });
         }
         return;
index 5453be8..e3544f5 100644 (file)
@@ -28,7 +28,6 @@
 #include <wtf/Forward.h>
 #include <wtf/MonotonicTime.h>
 #include <wtf/WallTime.h>
-#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -63,9 +62,6 @@ private:
     void excludeFromBackup() const;
     void refreshMemoryStoreFromDisk();
 
-    WeakPtr<ResourceLoadStatisticsPersistentStorage> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
-
-    WeakPtrFactory<ResourceLoadStatisticsPersistentStorage> m_weakPtrFactory;
     WebResourceLoadStatisticsStore& m_memoryStore;
     const String m_storageDirectoryPath;
     std::unique_ptr<WebCore::FileMonitor> m_fileMonitor;