ios/web/web_state/ui/crw_web_controller.mm - Issue 2601083003: [ios] Correctly determine last seen WKNavigation object.

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2601083003: [ios] Correctly determine last seen WKNavigation object. (Closed)

Patch Set: Self review Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: ios/web/web_state/ui/crw_web_controller.mm

diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm

index c7340bacafe35e9f440418ff16220acbb1eac7bc..016e31331bb50e7f1ee0ed03a360e4619f541f1a 100644

--- a/ios/web/web_state/ui/crw_web_controller.mm

+++ b/ios/web/web_state/ui/crw_web_controller.mm

@@ -88,6 +88,7 @@

#import "ios/web/web_state/ui/crw_swipe_recognizer_provider.h"

#import "ios/web/web_state/ui/crw_web_controller.h"

#import "ios/web/web_state/ui/crw_web_controller_container_view.h"

+#import "ios/web/web_state/ui/crw_wk_navigation_states.h"

#import "ios/web/web_state/ui/crw_wk_script_message_router.h"

#import "ios/web/web_state/ui/wk_back_forward_list_item_holder.h"

#import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"

@@ -448,8 +449,9 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {

base::scoped_nsobject<CRWWebControllerPendingNavigationInfo>

_pendingNavigationInfo;

- // The WKNavigation for the most recent load request.

- base::scoped_nsobject<WKNavigation> _latestWKNavigation;

+ // Holds all WKNavigation objects and their states which are currently in

+ // flight.

+ base::scoped_nsobject<CRWWKNavigationStates> _navigationStates;

// The WKNavigation captured when |stopLoading| was called. Used for reporting

// WebController.EmptyNavigationManagerCausedByStopLoading UMA metric which

@@ -1049,6 +1051,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

initWithBrowserState:browserState]);

_certVerificationErrors.reset(

new CertVerificationErrorsCacheType(kMaxCertErrorsCount));

+ _navigationStates.reset([[CRWWKNavigationStates alloc] init]);

[[NSNotificationCenter defaultCenter]

addObserver:self

selector:@selector(orientationDidChange)

@@ -3586,14 +3589,6 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

if (web::GetWebClient()->IsAppSpecificURL(errorURL))

return NO;

- if (self.sessionController.pendingEntryIndex != -1 &&

Eugene But (OOO till 7-30) 2016/12/29 02:18:50 This is not needed with better tracking of last WK

- ![self isLoadRequestPendingForURL:errorURL]) {

- // Do not cancel the load if there is a pending back forward navigation for

- // another URL (Back forward happened in the middle of WKWebView

- // navigation).

- return NO;

- }

// Don't cancel NSURLErrorCancelled errors originating from navigation

// as the WKWebView will automatically retry these loads.

WKWebViewErrorSource source = WKWebViewErrorSourceFromError(error);

@@ -4831,7 +4826,8 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

}

- (void)loadRequest:(NSMutableURLRequest*)request {

- _latestWKNavigation.reset([[_webView loadRequest:request] retain]);

+ [_navigationStates addNavigation:[_webView loadRequest:request]

+ forState:web::WK_NAVIGATION_STATE_REQUESTED];

}

- (void)loadPOSTRequest:(NSMutableURLRequest*)request {

@@ -4864,7 +4860,10 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

[self ensureWebViewCreated];

DCHECK(_webView) << "_webView null while trying to load HTML";

}

- [_webView loadHTMLString:HTML baseURL:net::NSURLWithGURL(URL)];

+ WKNavigation* navigation =

+ [_webView loadHTMLString:HTML baseURL:net::NSURLWithGURL(URL)];

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_REQUESTED];

}

- (void)loadHTML:(NSString*)HTML forAppSpecificURL:(const GURL&)URL {

@@ -4877,7 +4876,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

}

- (void)stopLoading {

- _stoppedWKNavigation.reset(_latestWKNavigation);

+ _stoppedWKNavigation.reset([_navigationStates lastAddedNavigation]);

base::RecordAction(UserMetricsAction("Stop"));

// Discard the pending and transient entried before notifying the tab model

@@ -5140,6 +5139,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

// superclass, and wire these up to the remaining methods.

- (void)webView:(WKWebView*)webView

didStartProvisionalNavigation:(WKNavigation*)navigation {

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_STARTED];

GURL webViewURL = net::GURLWithNSURL(webView.URL);

if (webViewURL.is_empty()) {

// May happen on iOS9, however in didCommitNavigation: callback the URL

@@ -5176,11 +5178,13 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

// Ensure the URL is registered and loadPhase is as expected.

DCHECK(_lastRegisteredRequestURL == webViewURL);

DCHECK(self.loadPhase == web::LOAD_REQUESTED);

- _latestWKNavigation.reset([navigation retain]);

}

- (void)webView:(WKWebView*)webView

didReceiveServerRedirectForProvisionalNavigation:(WKNavigation*)navigation {

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_REDIRECTED];

[self registerLoadRequest:net::GURLWithNSURL(webView.URL)

referrer:[self currentReferrer]

transition:ui::PAGE_TRANSITION_SERVER_REDIRECT];

@@ -5189,10 +5193,14 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

- (void)webView:(WKWebView*)webView

didFailProvisionalNavigation:(WKNavigation*)navigation

withError:(NSError*)error {

+ [_navigationStates

+ addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_PROVISIONALY_FAILED];

// Ignore provisional navigation failure if a new navigation has been started,

// for example, if a page is reloaded after the start of the provisional

// load but before the load has been committed.

- if (![_latestWKNavigation isEqual:navigation]) {

+ if (![[_navigationStates lastAddedNavigation] isEqual:navigation]) {

return;

}

@@ -5234,6 +5242,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

- (void)webView:(WKWebView*)webView

didCommitNavigation:(WKNavigation*)navigation {

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_COMMITTED];

// This method will crash if |currentSessionEntry| is null. If this check is

// hit it means that |didStartProvisionalNavigation| was called as expected

// but it did not call |registerLoadRequest|. TODO(crbug.com/676721): remove

@@ -5241,7 +5252,8 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

// |didStartProvisionalNavigation| did not call |registerLoadRequest| and it

// should be fixed.

CHECK([self currentSessionEntry] ||

- ![_latestWKNavigation isEqual:navigation]);

+ [_navigationStates stateForNavigation:navigation] ==

+ web::WK_NAVIGATION_STATE_STARTED);

DCHECK_EQ(_webView, webView);

_certVerificationErrors->Clear();

@@ -5302,6 +5314,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

- (void)webView:(WKWebView*)webView

didFinishNavigation:(WKNavigation*)navigation {

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_FINISHED];

DCHECK(!_isHalted);

// Trigger JavaScript driven post-document-load-completion tasks.

// TODO(crbug.com/546350): Investigate using

@@ -5314,6 +5329,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

- (void)webView:(WKWebView*)webView

didFailNavigation:(WKNavigation*)navigation

withError:(NSError*)error {

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_FAILED];

[self handleLoadError:WKWebViewErrorWithSource(error, NAVIGATION)

inMainFrame:YES];

_certVerificationErrors->Clear();

@@ -5681,12 +5699,16 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

referrer:[self currentSessionEntryReferrer]

transition:[self currentTransition]];

if (navigationURL == net::GURLWithNSURL([_webView URL])) {

- [_webView reload];

+ [_navigationStates addNavigation:[_webView reload]

+ forState:web::WK_NAVIGATION_STATE_REQUESTED];

} else {

// |didCommitNavigation:| may not be called for fast navigation, so update

// the navigation type now as it is already known.

holder->set_navigation_type(WKNavigationTypeBackForward);

- [_webView goToBackForwardListItem:holder->back_forward_list_item()];

+ WKNavigation* navigation =

+ [_webView goToBackForwardListItem:holder->back_forward_list_item()];

+ [_navigationStates addNavigation:navigation

+ forState:web::WK_NAVIGATION_STATE_REQUESTED];

}

};

« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/web_state/ui/crw_wk_navigation_states.h » ('j') | no next file with comments »