Changeset 167572 in webkit

Timestamp:

Apr 20, 2014 1:53:39 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Remove unused -webView:didFinishLoadingNavigation: delegate method
​https://bugs.webkit.org/show_bug.cgi?id=131914

Reviewed by Sam Weinig.

• UIProcess/Cocoa/NavigationState.h: Removed flag from m_navigationDelegateMethods struct.
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::setNavigationDelegate): Removed check for whether the method is
implemented.
(WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): Stopped calling the method
if implemented.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.h (modified) (2 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-20  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Remove unused -webView:didFinishLoadingNavigation: delegate method
+        https://bugs.webkit.org/show_bug.cgi?id=131914
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/Cocoa/NavigationState.h: Removed flag from m_navigationDelegateMethods struct.
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::setNavigationDelegate): Removed check for whether the method is
+        implemented.
+        (WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): Stopped calling the method
+        if implemented.
+
 2014-04-19  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h

@@ -42 +42 @@
 @protocol WKHistoryDelegatePrivate;
 @protocol WKNavigationDelegate;
-
-@interface NSObject (WKNavigationDelegateToBeRemoved)
-- (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation;
-@end
 
 namespace WebKit {
@@ -143 +139 @@
         bool webViewDidReceiveAuthenticationChallenge : 1;
         bool webViewWebProcessDidCrash : 1;
-
-        // FIXME: Remove this once no clients depend on it being called.
-        bool webViewDidFinishLoadingNavigation : 1;
     } m_navigationDelegateMethods;
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -121 +121 @@
     m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge = [delegate respondsToSelector:@selector(_webView:didReceiveAuthenticationChallenge:)];
     m_navigationDelegateMethods.webViewWebProcessDidCrash = [delegate respondsToSelector:@selector(_webViewWebProcessDidCrash:)];
-
-    // FIXME: Remove this once no clients depend on it being called.
-    m_navigationDelegateMethods.webViewDidFinishLoadingNavigation = [delegate respondsToSelector:@selector(webView:didFinishLoadingNavigation:)];
 }
 
@@ -422 +419 @@
         return;
 
-    if (!m_navigationState.m_navigationDelegateMethods.webViewDidFinishNavigation && !m_navigationState.m_navigationDelegateMethods.webViewDidFinishLoadingNavigation)
+    if (!m_navigationState.m_navigationDelegateMethods.webViewDidFinishNavigation)
         return;
 
@@ -434 +431 @@
         navigation = m_navigationState.m_navigations.get(navigationID).get();
 
-    // FIXME: Remove this once no clients depend on it being called.
-    if (m_navigationState.m_navigationDelegateMethods.webViewDidFinishLoadingNavigation) {
-        [static_cast<id>(navigationDelegate) webView:m_navigationState.m_webView didFinishLoadingNavigation:navigation];
-        return;
-    }
-
     [navigationDelegate webView:m_navigationState.m_webView didFinishNavigation:navigation];
 }