Title: [186092] trunk/Source/WebKit2
- Revision
- 186092
- Author
- timothy_hor...@apple.com
- Date
- 2015-06-29 16:01:30 -0700 (Mon, 29 Jun 2015)
Log Message
Fix the build.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _didFailLoadForMainFrame]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::didFailLoadForMainFrame):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186091 => 186092)
--- trunk/Source/WebKit2/ChangeLog 2015-06-29 22:59:51 UTC (rev 186091)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-29 23:01:30 UTC (rev 186092)
@@ -1,3 +1,14 @@
+2015-06-29 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didFailLoadForMainFrame]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::didFailLoadForMainFrame):
+
2015-06-29 Dean Jackson <d...@apple.com>
Temporarily disable PICTURE_SIZES
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (186091 => 186092)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-29 22:59:51 UTC (rev 186091)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-29 23:01:30 UTC (rev 186092)
@@ -1631,6 +1631,12 @@
_gestureController->didFinishLoadForMainFrame();
}
+- (void)_didFailLoadForMainFrame
+{
+ if (_gestureController)
+ _gestureController->didFailLoadForMainFrame();
+}
+
- (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType
{
[_customContentView web_didSameDocumentNavigation:toAPI(navigationType)];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (186091 => 186092)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2015-06-29 22:59:51 UTC (rev 186091)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2015-06-29 23:01:30 UTC (rev 186092)
@@ -98,6 +98,7 @@
- (void)_updateVisibleContentRects;
- (void)_didFinishLoadForMainFrame;
+- (void)_didFailLoadForMainFrame;
- (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
- (BOOL)_isShowingVideoPictureInPicture;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (186091 => 186092)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-06-29 22:59:51 UTC (rev 186091)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-06-29 23:01:30 UTC (rev 186092)
@@ -181,6 +181,7 @@
virtual void didFirstVisuallyNonEmptyLayoutForMainFrame() override;
virtual void didFinishLoadForMainFrame() override;
+ virtual void didFailLoadForMainFrame() override;
virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) override;
virtual void didChangeBackgroundColor() override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (186091 => 186092)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-06-29 22:59:51 UTC (rev 186091)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-06-29 23:01:30 UTC (rev 186092)
@@ -724,6 +724,11 @@
[m_webView _didFinishLoadForMainFrame];
}
+void PageClientImpl::didFailLoadForMainFrame()
+{
+ [m_webView _didFailLoadForMainFrame];
+}
+
void PageClientImpl::didSameDocumentNavigationForMainFrame(SameDocumentNavigationType navigationType)
{
[m_webView _didSameDocumentNavigationForMainFrame:navigationType];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
