Title: [243809] trunk
- Revision
- 243809
- Author
- [email protected]
- Date
- 2019-04-03 10:23:33 -0700 (Wed, 03 Apr 2019)
Log 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 <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (243808 => 243809)
--- trunk/LayoutTests/ChangeLog 2019-04-03 17:06:04 UTC (rev 243808)
+++ trunk/LayoutTests/ChangeLog 2019-04-03 17:23:33 UTC (rev 243809)
@@ -1,3 +1,12 @@
+2019-04-03 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[iOS] Should be able to dismiss picker or popover using the keyboard
Modified: trunk/LayoutTests/http/tests/adClickAttribution/store-ad-click-attribution-expected.txt (243808 => 243809)
--- trunk/LayoutTests/http/tests/adClickAttribution/store-ad-click-attribution-expected.txt 2019-04-03 17:06:04 UTC (rev 243808)
+++ trunk/LayoutTests/http/tests/adClickAttribution/store-ad-click-attribution-expected.txt 2019-04-03 17:23:33 UTC (rev 243809)
@@ -1,4 +1,8 @@
Tests storage of ad click attribution.
-No stored Ad Click Attribution data.
\ No newline at end of file
+WebCore::AdClickAttribution 1
+Source: 127.0.0.1
+Destination: localhost
+Campaign ID: 3
+No conversion data.
Modified: trunk/Source/WebKit/ChangeLog (243808 => 243809)
--- trunk/Source/WebKit/ChangeLog 2019-04-03 17:06:04 UTC (rev 243808)
+++ trunk/Source/WebKit/ChangeLog 2019-04-03 17:23:33 UTC (rev 243809)
@@ -1,3 +1,15 @@
+2019-04-03 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[iOS] Should be able to dismiss picker or popover using the keyboard
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (243808 => 243809)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-04-03 17:06:04 UTC (rev 243808)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-04-03 17:23:33 UTC (rev 243809)
@@ -4145,6 +4145,13 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
