Revert functional part of r241451
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Feb 2019 03:03:02 +0000 (03:03 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Feb 2019 03:03:02 +0000 (03:03 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194510

Source/WebKit:

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
It caused crashes and assertions on Linux and Cocoa without safe browsing, which
means it's fundamentally flawed in some way.  The testing piping was fine.

LayoutTests:

* platform/wk2/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/wk2/TestExpectations
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebPageProxy.cpp

index 589a9cd..78d68ae 100644 (file)
@@ -1,3 +1,10 @@
+2019-02-18  Alex Christensen  <achristensen@webkit.org>
+
+        Revert functional part of r241451
+        https://bugs.webkit.org/show_bug.cgi?id=194510
+
+        * platform/wk2/TestExpectations:
+
 2019-02-18  Daniel Bates  <dabates@apple.com>
 
         [iOS] Focus ring for checkboxes, radio buttons, buttons and search fields should hug tighter to the contour
index 4779d14..8a88ce5 100644 (file)
@@ -749,7 +749,7 @@ storage/indexeddb/modern/opendatabase-after-storage-crash.html [ Pass ]
 
 fast/forms/call-text-did-change-in-text-field-when-typing.html [ Pass ]
 
-http/tests/adClickAttribution [ Pass ]
+http/tests/adClickAttribution [ Failure ]
 
 ### END OF (5) Progressions, expected successes that are expected failures in WebKit1.
 ########################################
index e514294..6256c8a 100644 (file)
@@ -1,3 +1,13 @@
+2019-02-18  Alex Christensen  <achristensen@webkit.org>
+
+        Revert functional part of r241451
+        https://bugs.webkit.org/show_bug.cgi?id=194510
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
+        It caused crashes and assertions on Linux and Cocoa without safe browsing, which
+        means it's fundamentally flawed in some way.  The testing piping was fine.
+
 2019-02-18  Chris Dumez  <cdumez@apple.com>
 
         REGRESSION (PSON): Can't access optumbank.com from myuhc.com
index 9413fc4..52b4c8e 100644 (file)
@@ -4144,15 +4144,8 @@ void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navi
 
     // FIXME: We should message check that navigationID is not zero here, but it's currently zero for some navigations through the page cache.
     RefPtr<API::Navigation> navigation;
-    if (frame->isMainFrame() && navigationID) {
+    if (frame->isMainFrame() && navigationID)
         navigation = navigationState().navigation(navigationID);
-        if (navigation) {
-            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_navigationClient->didFinishDocumentLoad(*this, navigation.get(), m_process->transformHandlesToObjects(userData.object()).get());