diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 07:35:10 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 07:35:10 +0000 |
| commit | 68eada292a7f57f007533366b08b9d5a3e5f6dab (patch) | |
| tree | 65baf493adc39141d9b8f329f704c6e8855ef5d6 | |
| parent | 3dfb40134e6d9aa928cc94de46dea8f881d915e2 (diff) | |
| download | chromium_src-68eada292a7f57f007533366b08b9d5a3e5f6dab.zip chromium_src-68eada292a7f57f007533366b08b9d5a3e5f6dab.tar.gz chromium_src-68eada292a7f57f007533366b08b9d5a3e5f6dab.tar.bz2 | |
Speculative workaround for a crash in DisplayController::GetRootWindowForDisplayId
BUG=379239
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/324203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276296 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/display/display_controller.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index f289ff8..d091921 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -582,6 +582,11 @@ void DisplayController::OnDisplayRemoved(const gfx::Display& display) { // is deleted by the Shell. window_tree_hosts_.erase(display.id()); + // TODO(oshima): This should not happen. Investigate if this fixed + // crbug.com/379239. + if (!host_to_delete) + return; + // When the primary root window's display is removed, move the primary // root to the other display. if (primary_display_id == display.id()) { |