Changeset 243809 in webkit

Timestamp:

Apr 3, 2019, 10:23:33 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Resurrect and fix layout test http/tests/adClickAttribution/store-ad-click-attribution.html
​https://bugs.webkit.org/show_bug.cgi?id=196476

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-04-03
Reviewed by Chris Dumez.

Source/WebKit:

Re-apply a change I reverted in r241754 now that it's safe to do so.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didCommitLoadForFrame):

LayoutTests:

• http/tests/adClickAttribution/store-ad-click-attribution-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/adClickAttribution/store-ad-click-attribution-expected.txt (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-03  Alex Christensen  <achristensen@webkit.org>
+
+        Resurrect and fix layout test http/tests/adClickAttribution/store-ad-click-attribution.html
+        https://bugs.webkit.org/show_bug.cgi?id=196476
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/adClickAttribution/store-ad-click-attribution-expected.txt:
+
 2019-04-03  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/http/tests/adClickAttribution/store-ad-click-attribution-expected.txt

@@ -2 +2 @@
 
 
-No stored Ad Click Attribution data.
+WebCore::AdClickAttribution 1
+Source: 127.0.0.1
+Destination: localhost
+Campaign ID: 3
+No conversion data.

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-03  Alex Christensen  <achristensen@webkit.org>
+
+        Resurrect and fix layout test http/tests/adClickAttribution/store-ad-click-attribution.html
+        https://bugs.webkit.org/show_bug.cgi?id=196476
+
+        Reviewed by Chris Dumez.
+
+        Re-apply a change I reverted in r241754 now that it's safe to do so.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didCommitLoadForFrame):
+
 2019-04-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -4146 +4146 @@
     frame->didCommitLoad(mimeType, webCertificateInfo, containsPluginDocument);
 
+    if (navigation && frame->isMainFrame()) {
+        if (auto& adClickAttribution = navigation->adClickAttribution()) {
+            if (adClickAttribution->destination().matches(frame->url()))
+                m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::StoreAdClickAttribution(m_websiteDataStore->sessionID(), *adClickAttribution));
+        }
+    }
+
     if (frame->isMainFrame()) {
         m_mainFrameHasCustomContentProvider = frameHasCustomContentProvider;