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:



Canonical link: https://commits.webkit.org/241407@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: achristensen07

Source/WebKit/ChangeLog

@@ -1,3 +1,20 @@
+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>
 
         Implement origin partitioning (top-origin/frame-origin) for BroadcastChannel

Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -316,7 +316,7 @@ void NetworkSession::storePrivateClickMeasurement(WebCore::PrivateClickMeasureme
 
 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());
 }
 
 void NetworkSession::dumpPrivateClickMeasurement(CompletionHandler<void(String)>&& completionHandler)

Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp

@@ -230,14 +230,11 @@ void PrivateClickMeasurementManager::migratePrivateClickMeasurementFromLegacySto
     store().insertPrivateClickMeasurement(WTFMove(measurement), type);
 }
 
-void PrivateClickMeasurementManager::handleAttribution(AttributionTriggerData&& attributionTriggerData, const URL& requestURL, const WebCore::ResourceRequest& redirectRequest)
+void PrivateClickMeasurementManager::handleAttribution(AttributionTriggerData&& attributionTriggerData, const URL& requestURL, WebCore::RegistrableDomain&& redirectDomain, const URL& firstPartyURL)
 {
     if (!featureEnabled())
         return;
 
-    RegistrableDomain redirectDomain { redirectRequest.url() };
-    auto& firstPartyURL = redirectRequest.firstPartyForCookies();
-
     if (!redirectDomain.matches(requestURL)) {
         m_client->broadcastConsoleMessage(MessageLevel::Warning, "[Private Click Measurement] Triggering event was not accepted because the HTTP redirect was not same-site."_s);
         return;

Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h

@@ -58,7 +58,7 @@ class PrivateClickMeasurementManager : public CanMakeWeakPtr<PrivateClickMeasure
     ~PrivateClickMeasurementManager();
 
     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()>&&);
     void migratePrivateClickMeasurementFromLegacyStorage(PrivateClickMeasurement&&, PrivateClickMeasurementAttributionType);