| 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 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #import <WebKit/WebKit.h> | 8 #import <WebKit/WebKit.h> |
| 9 | 9 |
| 10 #include "base/containers/mru_cache.h" | 10 #include "base/containers/mru_cache.h" |
| (...skipping 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1609 return; | 1609 return; |
| 1610 } | 1610 } |
| 1611 [self updateSSLStatusForCurrentNavigationItem]; | 1611 [self updateSSLStatusForCurrentNavigationItem]; |
| 1612 } | 1612 } |
| 1613 | 1613 |
| 1614 - (void)webViewLoadingStateDidChange { | 1614 - (void)webViewLoadingStateDidChange { |
| 1615 if ([_wkWebView isLoading]) { | 1615 if ([_wkWebView isLoading]) { |
| 1616 [self addActivityIndicatorTask]; | 1616 [self addActivityIndicatorTask]; |
| 1617 } else { | 1617 } else { |
| 1618 [self clearActivityIndicatorTasks]; | 1618 [self clearActivityIndicatorTasks]; |
| 1619 if ([self currentBackForwardListItemHolder]->navigation_type() == |
| 1620 WKNavigationTypeBackForward) { |
| 1621 // A fast back/forward may not call |webView:didFinishNavigation:|, so |
| 1622 // finishing the navigation should be signalled explicitly. |
| 1623 [self didFinishNavigation]; |
| 1624 } |
| 1619 } | 1625 } |
| 1620 } | 1626 } |
| 1621 | 1627 |
| 1622 - (void)webViewTitleDidChange { | 1628 - (void)webViewTitleDidChange { |
| 1623 // WKWebView's title becomes empty when the web process dies; ignore that | 1629 // WKWebView's title becomes empty when the web process dies; ignore that |
| 1624 // update. | 1630 // update. |
| 1625 if (_webProcessIsDead) { | 1631 if (_webProcessIsDead) { |
| 1626 DCHECK_EQ(self.title.length, 0U); | 1632 DCHECK_EQ(self.title.length, 0U); |
| 1627 return; | 1633 return; |
| 1628 } | 1634 } |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2068 runJavaScriptTextInputPanelWithPrompt:prompt | 2074 runJavaScriptTextInputPanelWithPrompt:prompt |
| 2069 defaultText:defaultText | 2075 defaultText:defaultText |
| 2070 requestURL:requestURL | 2076 requestURL:requestURL |
| 2071 completionHandler:completionHandler]; | 2077 completionHandler:completionHandler]; |
| 2072 } else if (completionHandler) { | 2078 } else if (completionHandler) { |
| 2073 completionHandler(nil); | 2079 completionHandler(nil); |
| 2074 } | 2080 } |
| 2075 } | 2081 } |
| 2076 | 2082 |
| 2077 @end | 2083 @end |
| OLD | NEW |