| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h" | 5 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h" |
| 6 | 6 |
| 7 #import <WebKit/WebKit.h> | 7 #import <WebKit/WebKit.h> |
| 8 | 8 |
| 9 #include "base/containers/mru_cache.h" | 9 #include "base/containers/mru_cache.h" |
| 10 #include "base/ios/ios_util.h" | 10 #include "base/ios/ios_util.h" |
| (...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1647 [self updateSSLStatusForCurrentNavigationItem]; | 1647 [self updateSSLStatusForCurrentNavigationItem]; |
| 1648 } | 1648 } |
| 1649 | 1649 |
| 1650 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) | 1650 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) |
| 1651 | 1651 |
| 1652 - (void)webViewLoadingStateDidChange { | 1652 - (void)webViewLoadingStateDidChange { |
| 1653 if ([_wkWebView isLoading]) { | 1653 if ([_wkWebView isLoading]) { |
| 1654 [self addActivityIndicatorTask]; | 1654 [self addActivityIndicatorTask]; |
| 1655 } else { | 1655 } else { |
| 1656 [self clearActivityIndicatorTasks]; | 1656 [self clearActivityIndicatorTasks]; |
| 1657 if ([self currentBackForwardListItemHolder]->navigation_type() == |
| 1658 WKNavigationTypeBackForward) { |
| 1659 // A fast back/forward may not call |webView:didFinishNavigation:|, so |
| 1660 // finishing the navigation should be signalled explicitly. |
| 1661 [self didFinishNavigation]; |
| 1662 } |
| 1657 } | 1663 } |
| 1658 } | 1664 } |
| 1659 | 1665 |
| 1660 - (void)webViewTitleDidChange { | 1666 - (void)webViewTitleDidChange { |
| 1661 // WKWebView's title becomes empty when the web process dies; ignore that | 1667 // WKWebView's title becomes empty when the web process dies; ignore that |
| 1662 // update. | 1668 // update. |
| 1663 if (_webProcessIsDead) { | 1669 if (_webProcessIsDead) { |
| 1664 DCHECK_EQ(self.title.length, 0U); | 1670 DCHECK_EQ(self.title.length, 0U); |
| 1665 return; | 1671 return; |
| 1666 } | 1672 } |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2123 runJavaScriptTextInputPanelWithPrompt:prompt | 2129 runJavaScriptTextInputPanelWithPrompt:prompt |
| 2124 defaultText:defaultText | 2130 defaultText:defaultText |
| 2125 requestURL:requestURL | 2131 requestURL:requestURL |
| 2126 completionHandler:completionHandler]; | 2132 completionHandler:completionHandler]; |
| 2127 } else if (completionHandler) { | 2133 } else if (completionHandler) { |
| 2128 completionHandler(nil); | 2134 completionHandler(nil); |
| 2129 } | 2135 } |
| 2130 } | 2136 } |
| 2131 | 2137 |
| 2132 @end | 2138 @end |
| OLD | NEW |