Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc |
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc |
index 62aa33e256462bc2c671714f1c9649b053edfb55..6792951b070fad3956fbac39b4bdbc7f171cce0d 100644 |
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc |
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc |
@@ -179,14 +179,18 @@ scoped_refptr<ContextProviderWebContext> SynchronousCompositorFactoryImpl:: |
scoped_refptr<cc::ContextProvider> SynchronousCompositorFactoryImpl:: |
CreateOnscreenContextProviderForCompositorThread( |
scoped_refptr<gfx::GLSurface> surface) { |
- DCHECK(surface); |
DCHECK(service_); |
if (!share_context_.get()) |
share_context_ = CreateContext(NULL, service_, NULL); |
return webkit::gpu::ContextProviderInProcess::Create( |
WrapContext(CreateContext(surface, service_, share_context_.get())), |
- "Compositor-Onscreen"); |
+ "Child-Compositor"); |
+} |
+ |
+gpu::GLInProcessContext* SynchronousCompositorFactoryImpl::GetShareContext() { |
+ DCHECK(share_context_.get()); |
+ return share_context_.get(); |
} |
scoped_refptr<StreamTextureFactory> |