Title: [164313] trunk/Source/WebKit2
- Revision
- 164313
- Author
- ander...@apple.com
- Date
- 2014-02-18 13:59:43 -0800 (Tue, 18 Feb 2014)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164312 => 164313)
--- trunk/Source/WebKit2/ChangeLog 2014-02-18 21:44:52 UTC (rev 164312)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-18 21:59:43 UTC (rev 164313)
@@ -1,5 +1,18 @@
2014-02-18 Anders Carlsson <ander...@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 <ander...@apple.com>
+
Fix build.
* UIProcess/API/Cocoa/WKProcessClassConfiguration.mm:
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h (164312 => 164313)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h 2014-02-18 21:44:52 UTC (rev 164312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h 2014-02-18 21:59:43 UTC (rev 164313)
@@ -34,6 +34,8 @@
@protocol WKHistoryDelegatePrivate <NSObject>
+@optional
+
- (void)_webView:(WKWebView *)webView didNavigateWithNavigationData:(WKNavigationData *)navigationData;
- (void)_webView:(WKWebView *)webView didPerformClientRedirectFromURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL;
- (void)_webView:(WKWebView *)webView didPerformServerRedirectFromURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164312 => 164313)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-18 21:44:52 UTC (rev 164312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-18 21:59:43 UTC (rev 164313)
@@ -472,6 +472,16 @@
_navigationState->setHistoryDelegate(historyDelegate);
}
+- (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)
{
WebCore::LayoutMilestones milestones = 0;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (164312 => 164313)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-02-18 21:44:52 UTC (rev 164312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-02-18 21:59:43 UTC (rev 164313)
@@ -45,6 +45,10 @@
@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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
