diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 22:57:03 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 22:57:03 +0000 |
| commit | 1274aaf877d6e9244c37330ce7c2334aaed9079b (patch) | |
| tree | 29e3eef5cb9a8cc1b95ea01f108bbf2f85c01d15 /content | |
| parent | edadf1536bc250d4d8456300be5117ebee62f682 (diff) | |
| download | chromium_src-1274aaf877d6e9244c37330ce7c2334aaed9079b.zip chromium_src-1274aaf877d6e9244c37330ce7c2334aaed9079b.tar.gz chromium_src-1274aaf877d6e9244c37330ce7c2334aaed9079b.tar.bz2 | |
Fix crash on win_aura buildbot because a RootWindow was getting multiple AddRootWindowObserver calls for the same window. The issue is that the observer wasn't unregistering itself at destruction. If another one happened to be created at the same memory address, then this check would trigger.
BUG=163506
Review URL: https://codereview.chromium.org/11418262
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index bd41383..c3d194c 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -264,6 +264,8 @@ class WebContentsViewAura::WindowObserver virtual ~WindowObserver() { view_->window_->RemoveObserver(this); + if (view_->window_->GetRootWindow()) + view_->window_->GetRootWindow()->RemoveRootWindowObserver(this); if (parent_) parent_->RemoveObserver(this); } |