Pass initial size and GPU preference via context attributes

gpu/command_buffer/client/gl_in_process_context.cc

Index: gpu/command_buffer/client/gl_in_process_context.cc
diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
index 72e1eaf715a568042a037dcb2d62d632784656a7..c87f23396c7d7d5096f012fd9d4962715d78ac8d 100644
--- a/gpu/command_buffer/client/gl_in_process_context.cc
+++ b/gpu/command_buffer/client/gl_in_process_context.cc
@@ -54,9 +54,7 @@ class GLInProcessContextImpl
                   bool is_offscreen,
                   GLInProcessContext* share_context,
                   gfx::AcceleratedWidget window,
-                  const gfx::Size& size,
                   const gpu::gles2::ContextCreationAttribHelper& attribs,
-                  gl::GpuPreference gpu_preference,
                   const scoped_refptr<InProcessCommandBuffer::Service>& service,
                   const SharedMemoryLimits& mem_limits,
                   GpuMemoryBufferManager* gpu_memory_buffer_manager,
@@ -97,14 +95,13 @@ bool GLInProcessContextImpl::Initialize(
     bool is_offscreen,
     GLInProcessContext* share_context,
     gfx::AcceleratedWidget window,
-    const gfx::Size& size,
     const gles2::ContextCreationAttribHelper& attribs,
-    gl::GpuPreference gpu_preference,
     const scoped_refptr<InProcessCommandBuffer::Service>& service,
     const SharedMemoryLimits& mem_limits,
     GpuMemoryBufferManager* gpu_memory_buffer_manager,
     ImageFactory* image_factory) {
-  DCHECK(size.width() >= 0 && size.height() >= 0);
+  DCHECK_GE(attribs.offscreen_framebuffer_size.width(), 0);
+  DCHECK_GE(attribs.offscreen_framebuffer_size.height(), 0);
 
   command_buffer_.reset(new InProcessCommandBuffer(service));
 
@@ -122,9 +119,7 @@ bool GLInProcessContextImpl::Initialize(
   if (!command_buffer_->Initialize(surface,
                                    is_offscreen,
                                    window,
-                                   size,
                                    attribs,
-                                   gpu_preference,
                                    share_command_buffer,
                                    gpu_memory_buffer_manager,
                                    image_factory)) {
@@ -194,22 +189,19 @@ GLInProcessContext* GLInProcessContext::Create(
     scoped_refptr<gl::GLSurface> surface,
     bool is_offscreen,
     gfx::AcceleratedWidget window,
-    const gfx::Size& size,
     GLInProcessContext* share_context,
     const ::gpu::gles2::ContextCreationAttribHelper& attribs,
-    gl::GpuPreference gpu_preference,
     const SharedMemoryLimits& memory_limits,
     GpuMemoryBufferManager* gpu_memory_buffer_manager,
     ImageFactory* image_factory) {
   if (surface.get()) {
     DCHECK_EQ(surface->IsOffscreen(), is_offscreen);
-    DCHECK(surface->GetSize() == size);
     DCHECK_EQ(gfx::kNullAcceleratedWidget, window);
   }
 
   std::unique_ptr<GLInProcessContextImpl> context(new GLInProcessContextImpl);
-  if (!context->Initialize(surface, is_offscreen, share_context, window, size,
-                           attribs, gpu_preference, service, memory_limits,
+  if (!context->Initialize(surface, is_offscreen, share_context, window,
+                           attribs, service, memory_limits,
                            gpu_memory_buffer_manager, image_factory))
     return NULL;