Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl

webkit/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.
 
-#if defined(ENABLE_GPU)
-
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
 #include <GLES2/gl2ext.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 66 matching lines @@
 
   // Terminate the library. This must be called after any other functions
   // have completed.
   static bool Terminate();
 
   ~GLInProcessContext();
 
   void PumpCommands();
   bool GetBufferChanged(int32 transfer_buffer_id);
 
-  // Create a GLInProcessContext that renders directly to a view. The view and
-  // the associated window must not be destroyed until the returned
-  // GLInProcessContext has been destroyed, otherwise the GPU process might
-  // attempt to render to an invalid window handle.
-  //
-  // NOTE: on Mac OS X, this entry point is only used to set up the
-  // accelerated compositor's output. On this platform, we actually pass
-  // a gfx::PluginWindowHandle in place of the gfx::NativeViewId,
-  // because the facility to allocate a fake PluginWindowHandle is
-  // already in place. We could add more entry points and messages to
-  // allocate both fake PluginWindowHandles and NativeViewIds and map
-  // from fake NativeViewIds to PluginWindowHandles, but this seems like
-  // unnecessary complexity at the moment.
-  //
-  static GLInProcessContext* CreateViewContext(
-      gfx::PluginWindowHandle render_surface,
-      GLInProcessContext* context_group,
-      const char* allowed_extensions,
-      const int32* attrib_list,
-      const GURL& active_url,
-      gfx::GpuPreference gpu_preference);
-
   // Create a GLInProcessContext that renders to an offscreen frame buffer. If
   // parent is not NULL, that GLInProcessContext can access a copy of the
   // created GLInProcessContext's frame buffer that is updated every time
   // SwapBuffers is called. It is not as general as shared GLInProcessContexts
   // in other implementations of OpenGL. If parent is not NULL, it must be used
   // on the same thread as the parent. A child GLInProcessContext may not
   // outlive its parent.  attrib_list must be NULL or a NONE-terminated list of
   // attribute/value pairs.
   static GLInProcessContext* CreateOffscreenContext(
       GLInProcessContext* parent,
@@ skipping 39 matching lines @@
 
   // Return true if GPU process reported GLInProcessContext lost or there was a
   // problem communicating with the GPU process.
   bool IsCommandBufferContextLost();
 
   CommandBufferService* GetCommandBufferService();
 
  private:
   explicit GLInProcessContext(GLInProcessContext* parent);
 
-  bool Initialize(bool onscreen,
-                  gfx::PluginWindowHandle render_surface,
-                  const gfx::Size& size,
+  bool Initialize(const gfx::Size& size,
                   GLInProcessContext* context_group,
                   const char* allowed_extensions,
                   const int32* attrib_list,
                   const GURL& active_url,
                   gfx::GpuPreference gpu_preference);
   void Destroy();
 
   void OnContextLost();
 
   base::WeakPtr<GLInProcessContext> parent_;
@@ skipping 46 matching lines @@
 
 static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace anonymous
 
 GLInProcessContext::~GLInProcessContext() {
   Destroy();
 }
 
-GLInProcessContext* GLInProcessContext::CreateViewContext(
-    gfx::PluginWindowHandle render_surface,
-    GLInProcessContext* context_group,
-    const char* allowed_extensions,
-    const int32* attrib_list,
-    const GURL& active_url,
-    gfx::GpuPreference gpu_preference) {
-#if defined(ENABLE_GPU)
-  scoped_ptr<GLInProcessContext> context(new GLInProcessContext(NULL));
-  if (!context->Initialize(
-      true,
-      render_surface,
-      gfx::Size(),
-      context_group,
-      allowed_extensions,
-      attrib_list,
-      active_url,
-      gpu_preference))
-    return NULL;
-
-  return context.release();
-#else
-  return NULL;
-#endif
-}
-
 GLInProcessContext* GLInProcessContext::CreateOffscreenContext(
     GLInProcessContext* parent,
     const gfx::Size& size,
     GLInProcessContext* context_group,
     const char* allowed_extensions,
     const int32* attrib_list,
     const GURL& active_url,
     gfx::GpuPreference gpu_preference) {
-#if defined(ENABLE_GPU)
   scoped_ptr<GLInProcessContext> context(new GLInProcessContext(parent));
   if (!context->Initialize(
-      false,
-      gfx::kNullPluginWindow,
       size,
       context_group,
       allowed_extensions,
       attrib_list,
       active_url,
       gpu_preference))
     return NULL;
 
   return context.release();
-#else
-  return NULL;
-#endif
 }
 
 // In the normal command buffer implementation, all commands are passed over IPC
 // to the gpu process where they are fed to the GLES2Decoder from a single
 // thread. In layout tests, any thread could call this function. GLES2Decoder,
 // and in particular the GL implementations behind it, are not generally
 // threadsafe, so we guard entry points with a mutex.
 static base::LazyInstance<base::Lock> g_decoder_lock =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 88 matching lines @@
   return gles2_implementation_.get();
 }
 
 GLInProcessContext::GLInProcessContext(GLInProcessContext* parent)
     : parent_(parent ?
           parent->AsWeakPtr() : base::WeakPtr<GLInProcessContext>()),
       parent_texture_id_(0),
       last_error_(SUCCESS) {
 }
 
-bool GLInProcessContext::Initialize(bool onscreen,
-                                    gfx::PluginWindowHandle render_surface,
-                                    const gfx::Size& size,
+bool GLInProcessContext::Initialize(const gfx::Size& size,
                                     GLInProcessContext* context_group,
                                     const char* allowed_extensions,
                                     const int32* attrib_list,
                                     const GURL& active_url,
                                     gfx::GpuPreference gpu_preference) {
   // Use one share group for all contexts.
   CR_DEFINE_STATIC_LOCAL(scoped_refptr<gfx::GLShareGroup>, share_group,
                          (new gfx::GLShareGroup));
 
   DCHECK(size.width() >= 0 && size.height() >= 0);
@@ skipping 50 matching lines @@
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
       context_group->decoder_->GetContextGroup() :
           new ::gpu::gles2::ContextGroup(bind_generates_resource)));
 
   gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
                                         decoder_.get(),
                                         decoder_.get()));
 
   decoder_->set_engine(gpu_scheduler_.get());
 
-  if (onscreen) {
-    if (render_surface == gfx::kNullPluginWindow) {
-      LOG(ERROR) << "Invalid surface handle for onscreen context.";
-      command_buffer_.reset();
-    } else {
-      surface_ = gfx::GLSurface::CreateViewGLSurface(false, render_surface);
-    }
-  } else {
-    surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false,
-                                                        gfx::Size(1, 1));
-  }
+  surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1));
 
   if (!surface_.get()) {
     LOG(ERROR) << "Could not create GLSurface.";
     Destroy();
     return false;
   }
 
   context_ = gfx::GLContext::CreateGLContext(share_group.get(),
                                              surface_.get(),
                                              gpu_preference);
@@ skipping 80 matching lines @@
 void GLInProcessContext::OnContextLost() {
   if (!context_lost_callback_.is_null())
     context_lost_callback_.Run();
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     WebGraphicsContext3DInProcessCommandBufferImpl()
     : context_(NULL),
       gl_(NULL),
       web_view_(NULL),
-#if defined(OS_MACOSX)
-      plugin_handle_(NULL),
-#endif  // defined(OS_MACOSX)
       context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0) {
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
   base::AutoLock a(g_all_shared_contexts_lock.Get());
@@ skipping 1057 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
-
-#endif  // defined(ENABLE_GPU)