Changeset 282109 in webkit

Timestamp:

Sep 7, 2021, 3:13:17 PM (4 years ago)

Author:

achristensen@apple.com

Message:

Simplify PrivateClickMeasurementManager interface
​https://bugs.webkit.org/show_bug.cgi?id=230014

Reviewed by John Wilander.

ResourceRequest serialization is excessive and complicated.
Let's just serialize the parts we need instead.

• NetworkProcess/NetworkSession.cpp:

(WebKit::NetworkSession::handlePrivateClickMeasurementConversion):

• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp:

(WebKit::PrivateClickMeasurementManager::handleAttribution):

• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkSession.cpp (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-07  Alex Christensen  <achristensen@webkit.org>
+
+        Simplify PrivateClickMeasurementManager interface
+        https://bugs.webkit.org/show_bug.cgi?id=230014
+
+        Reviewed by John Wilander.
+
+        ResourceRequest serialization is excessive and complicated.
+        Let's just serialize the parts we need instead.
+
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::handlePrivateClickMeasurementConversion):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClient.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp:
+        (WebKit::PrivateClickMeasurementManager::handleAttribution):
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h:
+
 2021-09-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -317 +317 @@
 void NetworkSession::handlePrivateClickMeasurementConversion(PrivateClickMeasurement::AttributionTriggerData&& attributionTriggerData, const URL& requestURL, const WebCore::ResourceRequest& redirectRequest)
 {
-    privateClickMeasurement().handleAttribution(WTFMove(attributionTriggerData), requestURL, redirectRequest);
+    privateClickMeasurement().handleAttribution(WTFMove(attributionTriggerData), requestURL, RegistrableDomain(redirectRequest.url()), redirectRequest.firstPartyForCookies());
 }
 

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp

@@ -231 +231 @@
 }
 
-void PrivateClickMeasurementManager::handleAttribution(AttributionTriggerData&& attributionTriggerData, const URL& requestURL, const WebCore::ResourceRequest& redirectRequest)
-{
-    if (!featureEnabled())
-        return;
-
-    RegistrableDomain redirectDomain { redirectRequest.url() };
-    auto& firstPartyURL = redirectRequest.firstPartyForCookies();
+void PrivateClickMeasurementManager::handleAttribution(AttributionTriggerData&& attributionTriggerData, const URL& requestURL, WebCore::RegistrableDomain&& redirectDomain, const URL& firstPartyURL)
+{
+    if (!featureEnabled())
+        return;
 
     if (!redirectDomain.matches(requestURL)) {

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h

@@ -59 +59 @@
 
     void storeUnattributed(PrivateClickMeasurement&&);
-    void handleAttribution(AttributionTriggerData&&, const URL& requestURL, const WebCore::ResourceRequest& redirectRequest);
+    void handleAttribution(AttributionTriggerData&&, const URL& requestURL, WebCore::RegistrableDomain&& redirectDomain, const URL& firstPartyURL);
     void clear(CompletionHandler<void()>&&);
     void clearForRegistrableDomain(const RegistrableDomain&, CompletionHandler<void()>&&);