Commit ae0d1121 authored by mrefaat's avatar mrefaat Committed by Commit Bot

Remove _URLOnStartLoading from crw_web_controller

Remove _URLOnStartLoading from crw_web_controller as its not read anywhere.

BUG=

Review-Url: https://codereview.chromium.org/2919473004
Cr-Commit-Position: refs/heads/master@{#476451}
parent a58bf8c9
...@@ -302,9 +302,6 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) { ...@@ -302,9 +302,6 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {
// Last URL change reported to webWill/DidStartLoadingURL. Used to detect page // Last URL change reported to webWill/DidStartLoadingURL. Used to detect page
// location changes (client redirects) in practice. // location changes (client redirects) in practice.
GURL _lastRegisteredRequestURL; GURL _lastRegisteredRequestURL;
// Last URL change reported to webDidStartLoadingURL. Used to detect page
// location changes in practice.
GURL _URLOnStartLoading;
// Page loading phase. // Page loading phase.
web::LoadPhase _loadPhase; web::LoadPhase _loadPhase;
// The web::PageDisplayState recorded when the page starts loading. // The web::PageDisplayState recorded when the page starts loading.
...@@ -1636,7 +1633,6 @@ registerLoadRequestForURL:(const GURL&)requestURL ...@@ -1636,7 +1633,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
if (!weakSelf || weakSelf.get()->_isBeingDestroyed) if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
return; return;
base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]); base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
strongSelf.get()->_URLOnStartLoading = URL;
strongSelf.get()->_lastRegisteredRequestURL = URL; strongSelf.get()->_lastRegisteredRequestURL = URL;
}]; }];
} }
...@@ -2742,7 +2738,6 @@ registerLoadRequestForURL:(const GURL&)requestURL ...@@ -2742,7 +2738,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
return NO; return NO;
} }
NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON); NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON);
_URLOnStartLoading = pushURL;
_lastRegisteredRequestURL = pushURL; _lastRegisteredRequestURL = pushURL;
// If the user interacted with the page, categorize it as a link navigation. // If the user interacted with the page, categorize it as a link navigation.
...@@ -2809,7 +2804,6 @@ registerLoadRequestForURL:(const GURL&)requestURL ...@@ -2809,7 +2804,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
return NO; return NO;
} }
NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON); NSString* stateObject = base::SysUTF8ToNSString(stateObjectJSON);
_URLOnStartLoading = replaceURL;
_lastRegisteredRequestURL = replaceURL; _lastRegisteredRequestURL = replaceURL;
[self replaceStateWithPageURL:replaceURL stateObject:stateObject]; [self replaceStateWithPageURL:replaceURL stateObject:stateObject];
NSString* replaceStateJS = [self javaScriptToReplaceWebViewURL:replaceURL NSString* replaceStateJS = [self javaScriptToReplaceWebViewURL:replaceURL
...@@ -2872,7 +2866,6 @@ registerLoadRequestForURL:(const GURL&)requestURL ...@@ -2872,7 +2866,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
- (void)didStartLoadingURL:(const GURL&)URL { - (void)didStartLoadingURL:(const GURL&)URL {
_loadPhase = web::PAGE_LOADING; _loadPhase = web::PAGE_LOADING;
_URLOnStartLoading = URL;
_displayStateOnStartLoading = self.pageDisplayState; _displayStateOnStartLoading = self.pageDisplayState;
self.userInteractionRegistered = NO; self.userInteractionRegistered = NO;
...@@ -4019,8 +4012,6 @@ registerLoadRequestForURL:(const GURL&)requestURL ...@@ -4019,8 +4012,6 @@ registerLoadRequestForURL:(const GURL&)requestURL
[_webView addGestureRecognizer:recognizer]; [_webView addGestureRecognizer:recognizer];
} }
_URLOnStartLoading = _defaultURL;
// WKWebViews with invalid or empty frames have exhibited rendering bugs, so // WKWebViews with invalid or empty frames have exhibited rendering bugs, so
// resize the view to match the container view upon creation. // resize the view to match the container view upon creation.
[_webView setFrame:[_containerView bounds]]; [_webView setFrame:[_containerView bounds]];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment