| Index: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| index 5f2ebefe6293a0bd0e075c57d7b8d2b5fc81b940..2337d9e855f326061577abf34c871465d7c8d1bf 100644
|
| --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| @@ -21,6 +21,7 @@
|
| #include "base/logging.h"
|
| #include "gpu/command_buffer/client/gles2_implementation.h"
|
| #include "gpu/command_buffer/client/gles2_lib.h"
|
| +#include "gpu/command_buffer/common/gles2_cmd_utils.h"
|
| #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
|
| #include "ui/gfx/size.h"
|
| #include "ui/gl/gl_implementation.h"
|
| @@ -110,26 +111,14 @@ WebGraphicsContext3DInProcessCommandBufferImpl::
|
| window_(window),
|
| context_(context.Pass()) {
|
| ConvertAttributes(attributes, &attribs_);
|
| - attribs_.lose_context_when_out_of_memory = lose_context_when_out_of_memory;
|
| + attribs_.lose_context_when_out_of_memory_ = lose_context_when_out_of_memory;
|
| + attribs_.bind_generates_resource_ = false;
|
| }
|
|
|
| WebGraphicsContext3DInProcessCommandBufferImpl::
|
| ~WebGraphicsContext3DInProcessCommandBufferImpl() {
|
| }
|
|
|
| -// static
|
| -void WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
|
| - const blink::WebGraphicsContext3D::Attributes& attributes,
|
| - ::gpu::GLInProcessContextAttribs* output_attribs) {
|
| - output_attribs->alpha_size = attributes.alpha ? 8 : 0;
|
| - output_attribs->depth_size = attributes.depth ? 24 : 0;
|
| - output_attribs->stencil_size = attributes.stencil ? 8 : 0;
|
| - output_attribs->samples = attributes.antialias ? 4 : 0;
|
| - output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
|
| - output_attribs->fail_if_major_perf_caveat =
|
| - attributes.failIfMajorPerformanceCaveat ? 1 : 0;
|
| -}
|
| -
|
| bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() {
|
| if (initialized_)
|
| return true;
|
|
|