Changeset 164313 in webkit

Timestamp:

Feb 18, 2014 1:59:43 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add more WKWebView SPI
​https://bugs.webkit.org/show_bug.cgi?id=128994

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _unreachableURL]):
(-[WKWebView _loadAlternateHTMLString:baseURL:forUnreachableURL:]):

• UIProcess/API/Cocoa/WKWebViewPrivate.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-18  Anders Carlsson  <andersca@apple.com>
+
+        Add more WKWebView SPI
+        https://bugs.webkit.org/show_bug.cgi?id=128994
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _unreachableURL]):
+        (-[WKWebView _loadAlternateHTMLString:baseURL:forUnreachableURL:]):
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
 2014-02-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h

@@ -35 +35 @@
 @protocol WKHistoryDelegatePrivate <NSObject>
 
+@optional
+
 - (void)_webView:(WKWebView *)webView didNavigateWithNavigationData:(WKNavigationData *)navigationData;
 - (void)_webView:(WKWebView *)webView didPerformClientRedirectFromURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -473 +473 @@
 }
 
+- (NSURL *)_unreachableURL
+{
+    return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL()];
+}
+
+- (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL
+{
+    _page->loadAlternateHTMLString(string, [baseURL _web_originalDataAsWTFString], [unreachableURL _web_originalDataAsWTFString]);
+}
+
 static inline WebCore::LayoutMilestones layoutMilestones(_WKRenderingProgressEvents events)
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -46 +46 @@
 @property (nonatomic, weak, setter=_setHistoryDelegate:) id <WKHistoryDelegatePrivate> _historyDelegate;
 
+@property (nonatomic, readonly) NSURL *_unreachableURL;
+
+- (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
+
 #if TARGET_OS_IPHONE
 @property (nonatomic, setter=_setMinimumLayoutSizeOverride:) CGSize _minimumLayoutSizeOverride;