Fix the build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2015 23:01:30 +0000 (23:01 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2015 23:01:30 +0000 (23:01 +0000)
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _didFailLoadForMainFrame]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::didFailLoadForMainFrame):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

index 039c251..ea02120 100644 (file)
@@ -1,3 +1,14 @@
+2015-06-29  Tim Horton  <timothy_horton@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  <dino@apple.com>
 
         Temporarily disable PICTURE_SIZES
index 3fd26d6..a6b60e2 100644 (file)
@@ -1631,6 +1631,12 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
         _gestureController->didFinishLoadForMainFrame();
 }
 
+- (void)_didFailLoadForMainFrame
+{
+    if (_gestureController)
+        _gestureController->didFailLoadForMainFrame();
+}
+
 - (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType
 {
     [_customContentView web_didSameDocumentNavigation:toAPI(navigationType)];
index f8ac451..9c1e591 100644 (file)
@@ -98,6 +98,7 @@ struct PrintInfo;
 - (void)_updateVisibleContentRects;
 
 - (void)_didFinishLoadForMainFrame;
+- (void)_didFailLoadForMainFrame;
 - (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
 
 - (BOOL)_isShowingVideoPictureInPicture;
index 8fe0dd9..87ab7a2 100644 (file)
@@ -181,6 +181,7 @@ private:
 
     virtual void didFirstVisuallyNonEmptyLayoutForMainFrame() override;
     virtual void didFinishLoadForMainFrame() override;
+    virtual void didFailLoadForMainFrame() override;
     virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) override;
 
     virtual void didChangeBackgroundColor() override;
index 423ea41..238b275 100644 (file)
@@ -724,6 +724,11 @@ void PageClientImpl::didFinishLoadForMainFrame()
     [m_webView _didFinishLoadForMainFrame];
 }
 
+void PageClientImpl::didFailLoadForMainFrame()
+{
+    [m_webView _didFailLoadForMainFrame];
+}
+
 void PageClientImpl::didSameDocumentNavigationForMainFrame(SameDocumentNavigationType navigationType)
 {
     [m_webView _didSameDocumentNavigationForMainFrame:navigationType];