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

Unified Diff: chrome/browser/prerender/prerender_handle.cc

Issue 2554573012: Fix early prerender cancellation not working with PlzNavigate. (Closed)
Patch Set: 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
Download patch
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_link_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_handle.cc
diff --git a/chrome/browser/prerender/prerender_handle.cc b/chrome/browser/prerender/prerender_handle.cc
index cdec568d7d60f8ede6745a4da0cc5ea23c0ff992..f15a148802a4889419fa8d979225cd07c09214c1 100644
--- a/chrome/browser/prerender/prerender_handle.cc
+++ b/chrome/browser/prerender/prerender_handle.cc
@@ -48,7 +48,8 @@ void PrerenderHandle::OnCancel() {
bool PrerenderHandle::IsPrerendering() const {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- return prerender_data_.get() != nullptr;
+ return prerender_data_.get() != nullptr &&
+ !prerender_data_->contents()->prerendering_has_been_cancelled();
}
bool PrerenderHandle::IsFinishedLoading() const {
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_link_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698