Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / gpu / command_buffer / client / gl_in_process_context.h

diff --git a/src/gpu/command_buffer/client/gl_in_process_context.h b/src/gpu/command_buffer/client/gl_in_process_context.h
index c1478b1..6175cc5 100644 (file)
--- a/src/gpu/command_buffer/client/gl_in_process_context.h
+++ b/src/gpu/command_buffer/client/gl_in_process_context.h
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "gl_in_process_context_export.h"
+#include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/in_process_command_buffer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_surface.h"
@@ -29,22 +30,6 @@ namespace gles2 {
 class GLES2Implementation;
 }
 
-// The default uninitialized value is -1.
-struct GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContextAttribs {
-  GLInProcessContextAttribs();
-
-  int32 alpha_size;
-  int32 blue_size;
-  int32 green_size;
-  int32 red_size;
-  int32 depth_size;
-  int32 stencil_size;
-  int32 samples;
-  int32 sample_buffers;
-  int32 fail_if_major_perf_caveat;
-  int32 lose_context_when_out_of_memory;
-};
-
 class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext {
  public:
   virtual ~GLInProcessContext() {}
@@ -52,15 +37,6 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext {
   // Create a GLInProcessContext, if |is_offscreen| is true, renders to an
   // offscreen context. |attrib_list| must be NULL or a NONE-terminated list
   // of attribute/value pairs.
-  // TODO(boliu): Fix all callsites to use Create and remove this.
-  static GLInProcessContext* CreateContext(
-      bool is_offscreen,
-      gfx::AcceleratedWidget window,
-      const gfx::Size& size,
-      bool share_resources,
-      const GLInProcessContextAttribs& attribs,
-      gfx::GpuPreference gpu_preference);
-
   // If |surface| is not NULL, then it must match |is_offscreen| and |size|,
   // |window| must be gfx::kNullAcceleratedWidget, and the command buffer
   // service must run on the same thread as this client because GLSurface is
@@ -76,7 +52,7 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext {
       const gfx::Size& size,
       GLInProcessContext* share_context,
       bool use_global_share_group,
-      const GLInProcessContextAttribs& attribs,
+      const gpu::gles2::ContextCreationAttribHelper& attribs,
       gfx::GpuPreference gpu_preference);
 
   virtual void SetContextLostCallback(const base::Closure& callback) = 0;