Changeset 218022 in webkit

Timestamp:

Jun 9, 2017, 3:16:55 PM (8 years ago)

Author:

Chris Dumez

Message:

Make sure we protect |this| in lambdas in WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver()
​https://bugs.webkit.org/show_bug.cgi?id=173174
<rdar://problem/32598919>

Reviewed by Darin Adler.

Follow-up fix to r218006, which caused a crash on the bots. We cannot WTFMove() protectedThis
here because the callback gets called several times.

• UIProcess/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-09  Chris Dumez  <cdumez@apple.com>
+
+        Make sure we protect |this| in lambdas in WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver()
+        https://bugs.webkit.org/show_bug.cgi?id=173174
+        <rdar://problem/32598919>
+
+        Reviewed by Darin Adler.
+
+        Follow-up fix to r218006, which caused a crash on the bots. We cannot WTFMove() protectedThis
+        here because the callback gets called several times.
+
+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver):
+
 2017-06-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -186 +186 @@
         processStatisticsAndDataRecords();
     });
-    m_resourceLoadStatisticsStore->setWritePersistentStoreCallback([this, protectedThis = makeRef(*this)]() mutable {
-        m_statisticsQueue->dispatch([this, protectedThis = WTFMove(protectedThis)] {
+    m_resourceLoadStatisticsStore->setWritePersistentStoreCallback([this, protectedThis = makeRef(*this)] {
+        m_statisticsQueue->dispatch([this, protectedThis = protectedThis.copyRef()] {
             writeStoreToDisk();
         });