Changeset 231465 in webkit

Timestamp:

May 7, 2018 4:57:22 PM (6 years ago)

Author:

achristensen@apple.com

Message:

WebResourceLoadStatisticsStore::requestStorageAccess should call its completion handler on the main thread
​https://bugs.webkit.org/show_bug.cgi?id=185403

Reviewed by Brent Fulgham.

• UIProcess/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::requestStorageAccess):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-07  Alex Christensen  <achristensen@webkit.org>
+
+        WebResourceLoadStatisticsStore::requestStorageAccess should call its completion handler on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=185403
+
+        Reviewed by Brent Fulgham.
+
+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::requestStorageAccess):
+
 2018-05-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -372 +372 @@
         auto& subFrameStatistic = ensureResourceStatisticsForPrimaryDomain(subFramePrimaryDomain);
         if (shouldBlockCookies(subFrameStatistic)) {
-            callback(false);
+            callOnMainThread([callback = WTFMove(callback)] {
+                callback(false);
+            });
             return;
         }
         
         if (!shouldPartitionCookies(subFrameStatistic)) {
-            callback(true);
+            callOnMainThread([callback = WTFMove(callback)] {
+                callback(true);
+            });
             return;
         }
@@ -383 +387 @@
         subFrameStatistic.timesAccessedAsFirstPartyDueToStorageAccessAPI++;
 
-        m_grantStorageAccessHandler(subFramePrimaryDomain, topFramePrimaryDomain, frameID, pageID, WTFMove(callback));
+        m_grantStorageAccessHandler(subFramePrimaryDomain, topFramePrimaryDomain, frameID, pageID, [callback = WTFMove(callback)] (bool value) mutable {
+            callOnMainThread([value, callback = WTFMove(callback)] {
+                callback(value);
+            });
+        });
     });
 }