diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 02:46:48 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 02:46:48 +0000 |
| commit | defa5d66442c79009508f030d0955807dc66d717 (patch) | |
| tree | 7c9f3b044515631d306cc61f078512f4812bc762 | |
| parent | 46b66a0ffa66c7f5e87ce9b43292a574a9585fd9 (diff) | |
| download | chromium_src-defa5d66442c79009508f030d0955807dc66d717.zip chromium_src-defa5d66442c79009508f030d0955807dc66d717.tar.gz chromium_src-defa5d66442c79009508f030d0955807dc66d717.tar.bz2 | |
Merge 177052
> Aura: Run DidCommit callbacks when context is lost.
>
> BUG=170099
>
>
> Review URL: https://chromiumcodereview.appspot.com/11958005
TBR=sievers@chromium.org
Review URL: https://codereview.chromium.org/11970029
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@177322 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index b8ec7b5..b0762e6 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -1791,6 +1791,11 @@ void RenderWidgetHostViewAura::OnLostResources() { UpdateExternalTexture(); locks_pending_commit_.clear(); + // Make sure all ImageTransportClients are deleted now that the context those + // are using is becoming invalid. This sends pending ACKs and needs to happen + // after calling UpdateExternalTexture() which syncs with the impl thread. + RunCompositingDidCommitCallbacks(); + DCHECK(!shared_surface_handle_.is_null()); ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); factory->DestroySharedSurfaceHandle(shared_surface_handle_); |