Log Message
[Cocoa] Clean up session state API a little https://bugs.webkit.org/show_bug.cgi?id=134871
Reviewed by Darin Adler. * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _sessionState]): (-[WKWebView _restoreFromSessionState:]): Deleted. * UIProcess/API/Cocoa/WKWebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171049 => 171050)
--- trunk/Source/WebKit2/ChangeLog 2014-07-13 17:03:13 UTC (rev 171049)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-13 17:09:13 UTC (rev 171050)
@@ -1,3 +1,15 @@
+2014-07-13 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Clean up session state API a little
+ https://bugs.webkit.org/show_bug.cgi?id=134871
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _sessionState]):
+ (-[WKWebView _restoreFromSessionState:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
2014-07-13 Javier Fernandez <jfernan...@igalia.com>
REGRESSION(r171045) [GTK] Build broken.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (171049 => 171050)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-13 17:03:13 UTC (rev 171049)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-13 17:09:13 UTC (rev 171050)
@@ -1634,8 +1634,7 @@
return [wrapper(*WebKit::encodeLegacySessionState(sessionState).release().leakRef()) autorelease];
}
-// FIXME: This should return a _WKSessionState object.
-- (id)_sessionState
+- (_WKSessionState *)_sessionState
{
return adoptNS([[_WKSessionState alloc] _initWithSessionState:_page->sessionState()]).autorelease();
}
@@ -1653,12 +1652,6 @@
}
}
-// FIXME: Remove this once nobody is using it.
-- (void)_restoreFromSessionState:(id)sessionState
-{
- [self _restoreSessionState:sessionState andNavigate:YES];
-}
-
- (WKNavigation *)_restoreSessionState:(_WKSessionState *)sessionState andNavigate:(BOOL)navigate
{
if (uint64_t navigationID = _page->restoreFromSessionState(sessionState->_sessionState, navigate)) {
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (171049 => 171050)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-07-13 17:03:13 UTC (rev 171049)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-07-13 17:09:13 UTC (rev 171050)
@@ -88,13 +88,9 @@
@property (nonatomic, readonly) NSData *_sessionStateData;
- (void)_restoreFromSessionStateData:(NSData *)sessionStateData;
-// FIXME: This should return a _WKSessionState object, not an id.
-@property (nonatomic, readonly) id _sessionState;
+@property (nonatomic, readonly) _WKSessionState *_sessionState;
- (WKNavigation *)_restoreSessionState:(_WKSessionState *)sessionState andNavigate:(BOOL)navigate;
-// FIXME: Remove this once nobody is using it.
-- (void)_restoreFromSessionState:(id)sessionState;
-
@property (nonatomic, setter=_setAllowsRemoteInspection:) BOOL _allowsRemoteInspection;
@property (nonatomic, setter=_setAddsVisitedLinks:) BOOL _addsVisitedLinks;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
