| 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 c4fdb62f4b1a2fbfb66795bda96b72ed4d52fce8..7c5646e589729321b8ecb0dfda50216fbfa44c25 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| @@ -55,7 +55,6 @@ scoped_ptr<gpu::GLInProcessContext> CreateOffscreenContext(
|
| }
|
|
|
| scoped_ptr<gpu::GLInProcessContext> CreateContext(
|
| - scoped_refptr<gfx::GLSurface> surface,
|
| scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
|
| gpu::GLInProcessContext* share_context) {
|
| const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
|
| @@ -64,20 +63,12 @@ scoped_ptr<gpu::GLInProcessContext> CreateContext(
|
| GetDefaultAttribs(), &in_process_attribs);
|
| in_process_attribs.lose_context_when_out_of_memory = 1;
|
|
|
| -
|
| - bool is_offscreen = false;
|
| - gfx::Size size(1, 1);
|
| - if (surface) {
|
| - is_offscreen = surface->IsOffscreen();
|
| - size = surface->GetSize();
|
| - }
|
| -
|
| scoped_ptr<gpu::GLInProcessContext> context(
|
| gpu::GLInProcessContext::Create(service,
|
| - surface,
|
| - is_offscreen,
|
| + NULL /* surface */,
|
| + false /* is_offscreen */,
|
| gfx::kNullAcceleratedWidget,
|
| - size,
|
| + gfx::Size(1, 1),
|
| share_context,
|
| false /* share_resources */,
|
| in_process_attribs,
|
| @@ -177,14 +168,13 @@ scoped_refptr<ContextProviderWebContext> SynchronousCompositorFactoryImpl::
|
| }
|
|
|
| scoped_refptr<cc::ContextProvider> SynchronousCompositorFactoryImpl::
|
| - CreateOnscreenContextProviderForCompositorThread(
|
| - scoped_refptr<gfx::GLSurface> surface) {
|
| + CreateOnscreenContextProviderForCompositorThread() {
|
| DCHECK(service_);
|
|
|
| if (!share_context_.get())
|
| - share_context_ = CreateContext(NULL, service_, NULL);
|
| + share_context_ = CreateContext(service_, NULL);
|
| return webkit::gpu::ContextProviderInProcess::Create(
|
| - WrapContext(CreateContext(surface, service_, share_context_.get())),
|
| + WrapContext(CreateContext(service_, share_context_.get())),
|
| "Child-Compositor");
|
| }
|
|
|
| @@ -239,7 +229,7 @@ SynchronousCompositorFactoryImpl::TryCreateStreamTextureFactory() {
|
| DCHECK(share_context_.get());
|
|
|
| video_context_provider_ = new VideoContextProvider(
|
| - CreateContext(NULL, service_, share_context_.get()));
|
| + CreateContext(service_, share_context_.get()));
|
| }
|
| return video_context_provider_;
|
| }
|
|
|