Changeset 284875 in webkit

Timestamp:

Oct 26, 2021, 10:06:43 AM (5 years ago)

Author:

Kate Cheney

Message:

[ App Privacy Report ] Restoring a session after clearing the cache results in app initiated loads in Safari
​https://bugs.webkit.org/show_bug.cgi?id=232292
<rdar://problem/84597422>

Reviewed by Brent Fulgham.

Source/WebKit:

Update session restore code to also set the app initiated value on
the current document loader. Previously, this was only set on the new
document loader. This is a problem because the main resource load
uses the old document loader, so if we restore from a previous session
state, the main resource load will have the incorrect attribution
value.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::goToBackForwardItem):

Tools:

Update API test in 2 ways. First, close the original WebView to
destroy the page's document loader as if the application was being
quit. Second, clear history to make sure there are no cached loads.

• TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-26  Kate Cheney  <katherine_cheney@apple.com>
+
+        [ App Privacy Report ] Restoring a session after clearing the cache results in app initiated loads in Safari
+        https://bugs.webkit.org/show_bug.cgi?id=232292
+        <rdar://problem/84597422>
+
+        Reviewed by Brent Fulgham.
+
+        Update session restore code to also set the app initiated value on
+        the current document loader. Previously, this was only set on the new
+        document loader. This is a problem because the main resource load
+        uses the old document loader, so if we restore from a previous session
+        state, the main resource load will have the incorrect attribution
+        value.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::goToBackForwardItem):
+
 2021-10-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -1895 +1895 @@
 
     m_lastNavigationWasAppInitiated = lastNavigationWasAppInitiated;
+    if (auto* documentLoader = corePage()->mainFrame().loader().documentLoader())
+        documentLoader->setLastNavigationWasAppInitiated(lastNavigationWasAppInitiated);
 
     ASSERT(isBackForwardLoadType(backForwardType));

trunk/Tools/ChangeLog

@@ +1 @@
+2021-10-26  Kate Cheney  <katherine_cheney@apple.com>
+
+        [ App Privacy Report ] Restoring a session after clearing the cache results in app initiated loads in Safari
+        https://bugs.webkit.org/show_bug.cgi?id=232292
+        <rdar://problem/84597422>
+
+        Reviewed by Brent Fulgham.
+
+        Update API test in 2 ways. First, close the original WebView to
+        destroy the page's document loader as if the application was being
+        quit. Second, clear history to make sure there are no cached loads.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm:
+
 2021-10-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm

@@ -748 +748 @@
     RetainPtr<_WKSessionState> sessionState = [webView1 _sessionState];
     sessionState.get().isAppInitiated = isAppInitiated == IsAppInitiated::Yes ? true : false;
-    webView1 = nullptr;
+    [webView1 _close];
+
+    static bool isDone = false;
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+        isDone = true;
+    }];
+    TestWebKitAPI::Util::run(&isDone);
 
     auto webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
-
     [webView2 _restoreSessionState:sessionState.get() andNavigate:YES];
     [webView2 _test_waitForDidFinishNavigation];
@@ -757 +762 @@
     EXPECT_WK_STREQ(@"https://www.apple.com/", [[webView2 URL] absoluteString]);
 
-    static bool isDone = false;
+    isDone = false;
     bool expectingAppInitiatedRequests = isAppInitiated == IsAppInitiated::Yes ? true : false;
     [webView2 _appPrivacyReportTestingData:^(struct WKAppPrivacyReportTestingData data) {