Title: [170711] trunk/Source/WebKit2
- Revision
- 170711
- Author
- [email protected]
- Date
- 2014-07-02 10:40:38 -0700 (Wed, 02 Jul 2014)
Log Message
Add -[WKWebView _sessionStateData] and -[WKWebView _restoreFromSessionStateData:]
https://bugs.webkit.org/show_bug.cgi?id=134549
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _sessionState]):
(-[WKWebView _sessionStateData]):
(-[WKWebView _restoreFromSessionState:]):
(-[WKWebView _restoreFromSessionStateData:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170710 => 170711)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 17:33:32 UTC (rev 170710)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 17:40:38 UTC (rev 170711)
@@ -1,3 +1,17 @@
+2014-07-02 Anders Carlsson <[email protected]>
+
+ Add -[WKWebView _sessionStateData] and -[WKWebView _restoreFromSessionStateData:]
+ https://bugs.webkit.org/show_bug.cgi?id=134549
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _sessionState]):
+ (-[WKWebView _sessionStateData]):
+ (-[WKWebView _restoreFromSessionState:]):
+ (-[WKWebView _restoreFromSessionStateData:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
2014-07-02 Carlos Garcia Campos <[email protected]>
[GTK] WebKitVersion.h should be shared between UI and Web Process APIs
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170710 => 170711)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-02 17:33:32 UTC (rev 170710)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-02 17:40:38 UTC (rev 170711)
@@ -1562,6 +1562,11 @@
#endif
}
+- (NSData *)_sessionStateData
+{
+ return [self _sessionState];
+}
+
- (NSData *)_sessionState
{
return [wrapper(*_page->sessionStateData(nullptr).leakRef()) autorelease];
@@ -1572,10 +1577,15 @@
[(NSData *)data release];
}
-- (void)_restoreFromSessionState:(NSData *)sessionState
+- (void)_restoreFromSessionStateData:(NSData *)sessionState
{
- [sessionState retain];
- uint64_t navigationID = _page->restoreFromSessionStateData(API::Data::createWithoutCopying((const unsigned char*)sessionState.bytes, sessionState.length, releaseNSData, sessionState).get());
+ [self _restoreFromSessionState:sessionState];
+}
+
+- (void)_restoreFromSessionState:(NSData *)sessionStateData
+{
+ [sessionStateData retain];
+ uint64_t navigationID = _page->restoreFromSessionStateData(API::Data::createWithoutCopying((const unsigned char*)sessionStateData.bytes, sessionStateData.length, releaseNSData, sessionStateData).get());
if (navigationID)
_navigationState->createReloadNavigation(navigationID);
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (170710 => 170711)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-07-02 17:33:32 UTC (rev 170710)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-07-02 17:40:38 UTC (rev 170711)
@@ -85,6 +85,10 @@
@property (nonatomic, readonly) pid_t _webProcessIdentifier;
+@property (nonatomic, readonly) NSData *_sessionStateData;
+- (void)_restoreFromSessionStateData:(NSData *)sessionStateData;
+
+// FIXME: Remove these once nobody is using them.
@property (nonatomic, readonly) NSData *_sessionState;
- (void)_restoreFromSessionState:(NSData *)sessionState;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
