Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

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

Issue 2919473004: Remove _URLOnStartLoading from crw_web_controller (Closed)
Patch Set: move description to other cl Created 3 years, 7 months 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
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ccd31a039220858dec9b95c4540a465aae73177c..c5ac44335a6b95cefd88eea9778cfbdc2488d514 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -302,9 +302,6 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {
// Last URL change reported to webWill/DidStartLoadingURL. Used to detect page
// location changes (client redirects) in practice.
GURL _lastRegisteredRequestURL;
- // Last URL change reported to webDidStartLoadingURL. Used to detect page
- // location changes in practice.
- GURL _URLOnStartLoading;
// Page loading phase.
web::LoadPhase _loadPhase;
// The web::PageDisplayState recorded when the page starts loading.
@@ -1636,7 +1633,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
return;
base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
- strongSelf.get()->_URLOnStartLoading = URL;
strongSelf.get()->_lastRegisteredRequestURL = URL;
}];
}
@@ -2742,7 +2738,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
return NO;
}
NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON);
- _URLOnStartLoading = pushURL;
_lastRegisteredRequestURL = pushURL;
// If the user interacted with the page, categorize it as a link navigation.
@@ -2809,7 +2804,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
return NO;
}
NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON);
- _URLOnStartLoading = replaceURL;
_lastRegisteredRequestURL = replaceURL;
[self replaceStateWithPageURL:replaceURL stateObject:stateObject];
NSString* replaceStateJS = [self javaScriptToReplaceWebViewURL:replaceURL
@@ -2872,7 +2866,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
- (void)didStartLoadingURL:(const GURL&)URL {
_loadPhase = web::PAGE_LOADING;
- _URLOnStartLoading = URL;
_displayStateOnStartLoading = self.pageDisplayState;
self.userInteractionRegistered = NO;
@@ -4019,8 +4012,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
[_webView addGestureRecognizer:recognizer];
}
- _URLOnStartLoading = _defaultURL;
-
// WKWebViews with invalid or empty frames have exhibited rendering bugs, so
// resize the view to match the container view upon creation.
[_webView setFrame:[_containerView bounds]];
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698