Move attributes and context type out to ContextProviderCommandBuffer.

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 48 matching lines @@
 
   // If surface_handle is not kNullSurfaceHandle, this creates a
   // CommandBufferProxy that renders directly to a view. The view and
   // the associated window must not be destroyed until the returned
   // CommandBufferProxy has been destroyed, otherwise the GPU process might
   // attempt to render to an invalid window handle.
   CONTENT_EXPORT WebGraphicsContext3DCommandBufferImpl(
       gpu::SurfaceHandle surface_handle,
       const GURL& active_url,
       scoped_refptr<gpu::GpuChannelHost> host,
-      const gpu::gles2::ContextCreationAttribHelper& attributes,
       gfx::GpuPreference gpu_preference,
       bool automatic_flushes);
 
   CONTENT_EXPORT ~WebGraphicsContext3DCommandBufferImpl();
 
   gpu::CommandBufferProxyImpl* GetCommandBufferProxy() {
     return command_buffer_.get();
   }
 
   CONTENT_EXPORT gpu::ContextSupport* GetContextSupport();
 
   gpu::gles2::GLES2Implementation* GetImplementation() {
     return real_gl_.get();
   }
 
   void SetContextLostCallback(WebGraphicsContextLostCallback* callback) {
     context_lost_callback_ = callback;
   }
 
   CONTENT_EXPORT bool InitializeOnCurrentThread(
       const gpu::SharedMemoryLimits& memory_limits,
       gpu::CommandBufferProxyImpl* shared_command_buffer,
-      scoped_refptr<gpu::gles2::ShareGroup> share_group);
+      scoped_refptr<gpu::gles2::ShareGroup> share_group,
+      const gpu::gles2::ContextCreationAttribHelper& attributes,
+      command_buffer_metrics::ContextType context_type);
 
-  void SetContextType(CommandBufferContextType type) {
-    context_type_ = type;
-  }
  private:
-  // These are the same error codes as used by EGL.
-  enum Error {
-    SUCCESS               = 0x3000,
-    BAD_ATTRIBUTE         = 0x3004,
-    CONTEXT_LOST          = 0x300E
-  };
-
   // Initialize the underlying GL context. May be called multiple times; second
   // and subsequent calls are ignored. Must be called from the thread that is
   // going to use this object to issue GL commands (which might not be the main
   // thread).
-  bool MaybeInitializeGL(const gpu::SharedMemoryLimits& memory_limits,
-                         gpu::CommandBufferProxyImpl* shared_command_buffer,
-                         scoped_refptr<gpu::gles2::ShareGroup> share_group);
+  bool MaybeInitializeGL(
+      const gpu::SharedMemoryLimits& memory_limits,
+      gpu::CommandBufferProxyImpl* shared_command_buffer,
+      scoped_refptr<gpu::gles2::ShareGroup> share_group,
+      const gpu::gles2::ContextCreationAttribHelper& attributes,
+      command_buffer_metrics::ContextType context_type);
 
   bool InitializeCommandBuffer(
-      gpu::CommandBufferProxyImpl* shared_command_buffer);
+      gpu::CommandBufferProxyImpl* shared_command_buffer,
+      const gpu::gles2::ContextCreationAttribHelper& attributes,
+      command_buffer_metrics::ContextType context_type);
 
   void Destroy();
 
   bool CreateContext(const gpu::SharedMemoryLimits& memory_limits,
                      gpu::CommandBufferProxyImpl* shared_command_buffer,
-                     scoped_refptr<gpu::gles2::ShareGroup> share_group);
+                     scoped_refptr<gpu::gles2::ShareGroup> share_group,
+                     const gpu::gles2::ContextCreationAttribHelper& attributes,
+                     command_buffer_metrics::ContextType context_type);
 
   void OnContextLost();
 
   bool initialized_ = false;
   bool initialize_failed_ = false;
   WebGraphicsContextLostCallback* context_lost_callback_ = nullptr;
 
   bool automatic_flushes_;
-  gpu::gles2::ContextCreationAttribHelper attributes_;
 
   // State needed by MaybeInitializeGL.
   scoped_refptr<gpu::GpuChannelHost> host_;
   gpu::SurfaceHandle surface_handle_;
   GURL active_url_;
-  CommandBufferContextType context_type_;
 
   gfx::GpuPreference gpu_preference_;
 
   std::unique_ptr<gpu::CommandBufferProxyImpl> command_buffer_;
   std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
   std::unique_ptr<gpu::gles2::GLES2Implementation> real_gl_;
   std::unique_ptr<gpu::gles2::GLES2Interface> trace_gl_;
 
   // Member variables should appear before the WeakPtrFactory, to ensure
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_