| 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 45e5aa14d4621f2568fcee9c727eb2d5f7b45407..8d185799cb4133e21cab6e024550e0a810a1a26b 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| @@ -8,6 +8,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/renderer/gpu/frame_swap_message_queue.h"
|
| #include "gpu/command_buffer/client/gl_in_process_context.h"
|
| +#include "gpu/command_buffer/common/gles2_cmd_utils.h"
|
| #include "ui/gl/android/surface_texture.h"
|
| #include "ui/gl/gl_surface.h"
|
| #include "ui/gl/gl_surface_stub.h"
|
| @@ -32,15 +33,17 @@ blink::WebGraphicsContext3D::Attributes GetDefaultAttribs() {
|
| }
|
|
|
| using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
|
| +using webkit::gpu::WebGraphicsContext3DImpl;
|
|
|
| scoped_ptr<gpu::GLInProcessContext> CreateOffscreenContext(
|
| const blink::WebGraphicsContext3D::Attributes& attributes) {
|
| const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
|
|
|
| - gpu::GLInProcessContextAttribs in_process_attribs;
|
| - WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
|
| + gpu::gles2::ContextCreationAttribHelper in_process_attribs;
|
| + WebGraphicsContext3DImpl::ConvertAttributes(
|
| attributes, &in_process_attribs);
|
| - in_process_attribs.lose_context_when_out_of_memory = 1;
|
| + in_process_attribs.lose_context_when_out_of_memory_ = true;
|
| + in_process_attribs.bind_generates_resource_ = false;
|
|
|
| scoped_ptr<gpu::GLInProcessContext> context(
|
| gpu::GLInProcessContext::Create(NULL /* service */,
|
| @@ -59,10 +62,11 @@ scoped_ptr<gpu::GLInProcessContext> CreateContext(
|
| scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
|
| gpu::GLInProcessContext* share_context) {
|
| const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
|
| - gpu::GLInProcessContextAttribs in_process_attribs;
|
| - WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
|
| + gpu::gles2::ContextCreationAttribHelper in_process_attribs;
|
| + WebGraphicsContext3DImpl::ConvertAttributes(
|
| GetDefaultAttribs(), &in_process_attribs);
|
| - in_process_attribs.lose_context_when_out_of_memory = 1;
|
| + in_process_attribs.lose_context_when_out_of_memory_ = true;
|
| + in_process_attribs.bind_generates_resource_ = false;
|
|
|
| scoped_ptr<gpu::GLInProcessContext> context(
|
| gpu::GLInProcessContext::Create(service,
|
|
|