Title: [167572] trunk/Source/WebKit2
- Revision
- 167572
- Author
- [email protected]
- Date
- 2014-04-20 13:53:39 -0700 (Sun, 20 Apr 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167571 => 167572)
--- trunk/Source/WebKit2/ChangeLog 2014-04-20 20:43:35 UTC (rev 167571)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-20 20:53:39 UTC (rev 167572)
@@ -1,3 +1,17 @@
+2014-04-20 Dan Bernstein <[email protected]>
+
+ [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 <[email protected]>
Plug-in process crashes if NP_Initialize returns an error the second time it's called
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (167571 => 167572)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-04-20 20:43:35 UTC (rev 167571)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-04-20 20:53:39 UTC (rev 167572)
@@ -42,10 +42,6 @@
@protocol WKHistoryDelegatePrivate;
@protocol WKNavigationDelegate;
-@interface NSObject (WKNavigationDelegateToBeRemoved)
-- (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation;
-@end
-
namespace WebKit {
struct WebNavigationDataStore;
@@ -142,9 +138,6 @@
bool webViewCanAuthenticateAgainstProtectionSpace : 1;
bool webViewDidReceiveAuthenticationChallenge : 1;
bool webViewWebProcessDidCrash : 1;
-
- // FIXME: Remove this once no clients depend on it being called.
- bool webViewDidFinishLoadingNavigation : 1;
} m_navigationDelegateMethods;
HashMap<uint64_t, RetainPtr<WKNavigation>> m_navigations;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (167571 => 167572)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-04-20 20:43:35 UTC (rev 167571)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-04-20 20:53:39 UTC (rev 167572)
@@ -120,9 +120,6 @@
m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace = [delegate respondsToSelector:@selector(_webView:canAuthenticateAgainstProtectionSpace:)];
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:)];
}
RetainPtr<id <WKHistoryDelegatePrivate> > NavigationState::historyDelegate()
@@ -421,7 +418,7 @@
if (!webFrameProxy->isMainFrame())
return;
- if (!m_navigationState.m_navigationDelegateMethods.webViewDidFinishNavigation && !m_navigationState.m_navigationDelegateMethods.webViewDidFinishLoadingNavigation)
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDidFinishNavigation)
return;
auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
@@ -433,12 +430,6 @@
if (navigationID)
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];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
