Title: [285163] trunk
Revision
285163
Author
katherine_che...@apple.com
Date
2021-11-02 09:37:09 -0700 (Tue, 02 Nov 2021)

Log Message

https://bugs.webkit.org/show_bug.cgi?id=232593
Remove isAppInitiated from _WKSessionState

Reviewed by Brent Fulgham.

Source/WebKit:

After https://bugs.webkit.org/show_bug.cgi?id=232486 we no longer need
the isAppInitiated value on _WKSessionState. It will be set
automatically when session state is retrieved.

No new tests. Confirmed by existing RestoreFromSessionState* API
tests.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _restoreSessionState:andNavigate:]):
* UIProcess/API/Cocoa/_WKSessionState.h:
* UIProcess/API/Cocoa/_WKSessionState.mm:
(-[_WKSessionState _sessionStateWithAppInitiatedValue]): Deleted.
* UIProcess/API/Cocoa/_WKSessionStateInternal.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (285162 => 285163)


--- trunk/Source/WebKit/ChangeLog	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Source/WebKit/ChangeLog	2021-11-02 16:37:09 UTC (rev 285163)
@@ -1,3 +1,24 @@
+2021-11-02  Kate Cheney  <katherine_che...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=232593
+        Remove isAppInitiated from _WKSessionState
+
+        Reviewed by Brent Fulgham.
+
+        After https://bugs.webkit.org/show_bug.cgi?id=232486 we no longer need
+        the isAppInitiated value on _WKSessionState. It will be set
+        automatically when session state is retrieved.
+
+        No new tests. Confirmed by existing RestoreFromSessionState* API
+        tests.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _restoreSessionState:andNavigate:]):
+        * UIProcess/API/Cocoa/_WKSessionState.h:
+        * UIProcess/API/Cocoa/_WKSessionState.mm:
+        (-[_WKSessionState _sessionStateWithAppInitiatedValue]): Deleted.
+        * UIProcess/API/Cocoa/_WKSessionStateInternal.h:
+
 2021-11-02  Chris Dumez  <cdu...@apple.com>
 
         Use higher QoS for WheelEvent and DisplayWasRefreshed IPCs

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (285162 => 285163)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2021-11-02 16:37:09 UTC (rev 285163)
@@ -2646,7 +2646,7 @@
 - (WKNavigation *)_restoreSessionState:(_WKSessionState *)sessionState andNavigate:(BOOL)navigate
 {
     THROW_IF_SUSPENDED;
-    return wrapper(_page->restoreFromSessionState(sessionState ? sessionState._sessionStateWithAppInitiatedValue : WebKit::SessionState { }, navigate));
+    return wrapper(_page->restoreFromSessionState(sessionState ? sessionState->_sessionState : WebKit::SessionState { }, navigate));
 }
 
 - (void)_close

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.h (285162 => 285163)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.h	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.h	2021-11-02 16:37:09 UTC (rev 285163)
@@ -33,6 +33,5 @@
 - (instancetype)initWithData:(NSData *)data;
 
 @property (nonatomic, readonly, copy) NSData *data;
-@property (nonatomic) BOOL isAppInitiated;
 
 @end

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.mm (285162 => 285163)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.mm	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionState.mm	2021-11-02 16:37:09 UTC (rev 285163)
@@ -58,10 +58,4 @@
     return WebKit::encodeSessionState(_sessionState).autorelease();
 }
 
-- (WebKit::SessionState)_sessionStateWithAppInitiatedValue
-{
-    _sessionState.isAppInitiated = _isAppInitiated;
-    return _sessionState;
-}
-
 @end

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionStateInternal.h (285162 => 285163)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionStateInternal.h	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSessionStateInternal.h	2021-11-02 16:37:09 UTC (rev 285163)
@@ -32,7 +32,6 @@
     WebKit::SessionState _sessionState;
 }
 
-- (WebKit::SessionState)_sessionStateWithAppInitiatedValue;
 - (instancetype)_initWithSessionState:(WebKit::SessionState)sessionState;
 
 @end

Modified: trunk/Tools/ChangeLog (285162 => 285163)


--- trunk/Tools/ChangeLog	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Tools/ChangeLog	2021-11-02 16:37:09 UTC (rev 285163)
@@ -1,3 +1,12 @@
+2021-11-02  Kate Cheney  <katherine_che...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=232593
+        Remove isAppInitiated from _WKSessionState
+
+        Reviewed by Brent Fulgham.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm:
+
 2021-11-02  Jonathan Bedard  <jbed...@apple.com>
 
         [webkitscmpy] Generalize pull-request title generation.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm (285162 => 285163)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm	2021-11-02 16:01:26 UTC (rev 285162)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AppPrivacyReport.mm	2021-11-02 16:37:09 UTC (rev 285163)
@@ -746,7 +746,6 @@
     [webView1 _test_waitForDidFinishNavigation];
 
     RetainPtr<_WKSessionState> sessionState = [webView1 _sessionState];
-    sessionState.get().isAppInitiated = isAppInitiated == IsAppInitiated::Yes ? true : false;
     [webView1 _close];
 
     static bool isDone = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to