summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuartmorgan <stuartmorgan@chromium.org>2015-06-03 15:03:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-03 22:04:14 +0000
commit0ac44dc9f45c3353fee5075dbc9812a77f06e0b4 (patch)
treef46a451a5b43e881c83044793c2c29569419e9ea
parent77462d9466908defb96b675006f91c4b7a5b7ad3 (diff)
downloadchromium_src-0ac44dc9f45c3353fee5075dbc9812a77f06e0b4.zip
chromium_src-0ac44dc9f45c3353fee5075dbc9812a77f06e0b4.tar.gz
chromium_src-0ac44dc9f45c3353fee5075dbc9812a77f06e0b4.tar.bz2
Ignore post-close redirect calls in WebController
The callback is bounced from a background thread, which means it can be received on the main thread post-close. If that happens, it can just be ignored. BUG=496306 Review URL: https://codereview.chromium.org/1156173009 Cr-Commit-Position: refs/heads/master@{#332706}
-rw-r--r--ios/web/web_state/ui/crw_ui_web_view_web_controller.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm b/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm
index 0bb3deb..1aff4fb 100644
--- a/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm
+++ b/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm
@@ -1353,6 +1353,10 @@ const size_t kMaxMessageQueueSize = 262144;
- (void)wasRedirectedToRequest:(NSURLRequest*)request
redirectResponse:(NSURLResponse*)response {
+ // This callback can be received after -close is called; ignore it.
+ if (self.isBeingDestroyed)
+ return;
+
// Register the redirected load request if it originated from the main page
// load.
GURL redirectedURL = net::GURLWithNSURL(response.URL);