summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 20:25:27 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 20:25:27 +0000
commit352d0c147e2262730a686bddd42f240ac1111b81 (patch)
treeeadccd11a492e4f22ac363f73ceeae0171ed7b28 /content
parente0e72d354c7f682fe2e8b12b75b3187d8d7f77e6 (diff)
downloadchromium_src-352d0c147e2262730a686bddd42f240ac1111b81.zip
chromium_src-352d0c147e2262730a686bddd42f240ac1111b81.tar.gz
chromium_src-352d0c147e2262730a686bddd42f240ac1111b81.tar.bz2
aura: Context loss callback stops after removing all compositors.
We should allow this callback to continue functioning if we drop all compositors, but are still using other GL resources with the shared context, or we create another compositor. R=piman@chromium.org BUG=258625 Review URL: https://codereview.chromium.org/21163002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/aura/gpu_process_transport_factory.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/aura/gpu_process_transport_factory.cc b/content/browser/aura/gpu_process_transport_factory.cc
index 61bbeb4..0a4a8fa 100644
--- a/content/browser/aura/gpu_process_transport_factory.cc
+++ b/content/browser/aura/gpu_process_transport_factory.cc
@@ -311,10 +311,8 @@ void GpuProcessTransportFactory::RemoveCompositor(ui::Compositor* compositor) {
GpuSurfaceTracker::Get()->RemoveSurface(data->surface_id);
delete data;
per_compositor_data_.erase(it);
- if (per_compositor_data_.empty()) {
+ if (per_compositor_data_.empty())
gl_helper_.reset();
- callback_factory_.InvalidateWeakPtrs();
- }
}
ui::ContextFactory* GpuProcessTransportFactory::AsContextFactory() {