Changeset 273180 in webkit

Timestamp:

Feb 19, 2021 4:18:55 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

CrashTracer: com.apple.WebKit.Networking at WebKit: WTF::Detail::CallableWrapper<WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests()
​https://bugs.webkit.org/show_bug.cgi?id=222201

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-02-19
Reviewed by Chris Dumez.

• NetworkProcess/PrivateClickMeasurementManager.cpp:

(WebKit::PrivateClickMeasurementManager::attribute):
(WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurementManager.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-19  Alex Christensen  <achristensen@webkit.org>
+
+        CrashTracer: com.apple.WebKit.Networking at WebKit: WTF::Detail::CallableWrapper<WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests()
+        https://bugs.webkit.org/show_bug.cgi?id=222201
+
+        Reviewed by Chris Dumez.
+
+        * NetworkProcess/PrivateClickMeasurementManager.cpp:
+        (WebKit::PrivateClickMeasurementManager::attribute):
+        (WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
+
 2021-02-19  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp

@@ -231 +231 @@
 
     if (auto* resourceLoadStatistics = m_networkSession->resourceLoadStatistics()) {
-        resourceLoadStatistics->attributePrivateClickMeasurement(sourceSite, attributeOnSite, WTFMove(attributionTriggerData), [this] (auto optionalSecondsUntilSend) {
+        resourceLoadStatistics->attributePrivateClickMeasurement(sourceSite, attributeOnSite, WTFMove(attributionTriggerData), [this, weakThis = makeWeakPtr(*this)] (auto optionalSecondsUntilSend) {
+            if (!weakThis)
+                return;
             if (optionalSecondsUntilSend) {
                 auto secondsUntilSend = *optionalSecondsUntilSend;
@@ -295 +297 @@
         return;
 
-    resourceLoadStatistics->allAttributedPrivateClickMeasurement([this] (auto&& attributions) {
+    resourceLoadStatistics->allAttributedPrivateClickMeasurement([this, weakThis = makeWeakPtr(*this)] (auto&& attributions) {
+        if (!weakThis)
+            return;
         auto nextTimeToFire = Seconds::infinity();
         bool hasSentAttribution = false;