Commit 478ba983 authored by vsevik@chromium.org's avatar vsevik@chromium.org

DevTools: Avoid browser crash on undock after frontend self reloading.

R=pfeldman, dgozman

Review URL: https://codereview.chromium.org/147963003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247988 0039d316-1c4b-4281-b951-d872f2087c98
parent f49722fc
......@@ -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();
}
......
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