Remove GLInProcessContext::CreateContext()

webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

 // 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.
 
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 129 matching lines @@
   // Ensure the gles2 library is initialized first in a thread safe way.
   g_gles2_initializer.Get();
 
   if (!context_) {
     // TODO(kbr): More work will be needed in this implementation to
     // properly support GPU switching. Like in the out-of-process
     // command buffer implementation, all previously created contexts
     // will need to be lost either when the first context requesting the
     // discrete GPU is created, or the last one is destroyed.
     gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
-
-    context_.reset(GLInProcessContext::CreateContext(
+    context_.reset(GLInProcessContext::Create(
+        scoped_refptr< ::gpu::InProcessCommandBuffer::Service>(),

[piman, 2014/07/31 02:42:29]

nit: NULL

[hj.r.chung, 2014/07/31 08:35:35]

Done.

+        NULL, /* surface */
         is_offscreen_,
-        window_,

[piman, 2014/07/31 02:42:29]

aren't there callers that pass a non-NULL window?
ui::InProcessContextFactory::CreateOutputSurface seems to be one.

[hj.r.chung, 2014/07/31 03:05:32]

yes, it's called with a non-NULL window but kNullAcceleratedWidget is used
instead of the passed window when initializing the context

[piman, 2014/07/31 03:41:11]

I don't follow.
ui::InProcessContextFactory::CreateOutputSurface calls
WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext with a
non-NULL window. That calls
WebGraphicsContext3DInProcessCommandBufferImpl::WebGraphicsContext3DInProcessCommandBufferImpl
that keeps window into the field window_. When we get to MaybeInitializeGL,
window_ is non-NULL.

What am I missing?

Taken another way, some of the tests/demos that use InProcessContextFactory
display their results into the window. How else would it be possible, if not
passing the window to the GL context?

[hj.r.chung, 2014/07/31 08:35:35]

oops, I was looking at GLInProcessContext::Create instead of ::CreateContext.
Sorry about the confusion. adding 'window' back

         gfx::Size(1, 1),
+        NULL, /* share_context */
         share_resources_,
         attribs_,
         gpu_preference));
   }
 
   if (context_) {
     base::Closure context_lost_callback = base::Bind(
         &WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost,
         base::Unretained(this));
     context_->SetContextLostCallback(context_lost_callback);
@@ skipping 36 matching lines @@
 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
   // TODO(kbr): improve the precision here.
   context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit