diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 01:11:18 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 01:11:18 +0000 |
| commit | 91c8a64f50024620d2f87c2f1502b10a81d61eae (patch) | |
| tree | 4adc4bde742a65f416962bae7cc0a17bd41095e2 /content | |
| parent | ae3146650d0dad82759dfee3bf15079d98431be6 (diff) | |
| download | chromium_src-91c8a64f50024620d2f87c2f1502b10a81d61eae.zip chromium_src-91c8a64f50024620d2f87c2f1502b10a81d61eae.tar.gz chromium_src-91c8a64f50024620d2f87c2f1502b10a81d61eae.tar.bz2 | |
Android: Fix DCHECK() for 'root window destroyed'
There is no reason the WindowAndroid cannot outlive the compositor.
NOTRY=True
Review URL: https://codereview.chromium.org/224403004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.cc | 5 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index ddbcc78..3f5f584 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -1263,10 +1263,13 @@ void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { void RenderWidgetHostViewAndroid::OnDetachCompositor() { DCHECK(content_view_core_); DCHECK(!using_synchronous_compositor_); - root_window_destroyed_ = true; RunAckCallbacks(); } +void RenderWidgetHostViewAndroid::OnWillDestroyWindow() { + root_window_destroyed_ = true; +} + void RenderWidgetHostViewAndroid::OnLostResources() { ReleaseLocksOnSurface(); if (layer_.get()) diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index e75f61e..0f1cecb 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h @@ -194,6 +194,7 @@ class RenderWidgetHostViewAndroid virtual void OnCompositingDidCommit() OVERRIDE; virtual void OnAttachCompositor() OVERRIDE {} virtual void OnDetachCompositor() OVERRIDE; + virtual void OnWillDestroyWindow() OVERRIDE; // ImageTransportFactoryAndroidObserver implementation. virtual void OnLostResources() OVERRIDE; |