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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 147963003: DevTools: Avoid browser crash on undock after frontend self reloading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index f64a8f213db2db2c11106a15445dd369e2a8c8d5..7f086ce074018fe65719b085b7d20c887c38278d 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -1481,9 +1481,12 @@ content::WebContents* DevToolsWindow::GetInspectedWebContents() {
}
void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
- // Load is completed when both kIsDockedSet and kOnLoadFired happened.
- // Here we set kOnLoadFired.
- load_state_ = load_state_ == kIsDockedSet ? kLoadCompleted : kOnLoadFired;
+ // We could be in kLoadCompleted state already if frontend reloads itself.
+ if (load_state_ != kLoadCompleted) {
+ // Load is completed when both kIsDockedSet and kOnLoadFired happened.
+ // Here we set kOnLoadFired.
+ load_state_ = load_state_ == kIsDockedSet ? kLoadCompleted : kOnLoadFired;
+ }
if (load_state_ == kLoadCompleted)
LoadCompleted();
}
« 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