Adding a new signature for WebGraphicsContext3DCommandBufferImpl::initialize(...

chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2010 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 "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 
@@ skipping 10 matching lines @@
       bound_fbo_(0) {
 }
 
 WebGraphicsContext3DCommandBufferImpl::
     ~WebGraphicsContext3DCommandBufferImpl() {
   if (context_) {
     ggl::DestroyContext(context_);
   }
 }
 
+// TODO(vangelis): Properly implement this method once the upstream WebKit
+// changes have landed.
+bool WebGraphicsContext3DCommandBufferImpl::initialize(
+    WebGraphicsContext3D::Attributes attributes,
+    WebKit::WebView*) {
+  return initialize(attributes);
+}
+
 bool WebGraphicsContext3DCommandBufferImpl::initialize(
     WebGraphicsContext3D::Attributes attributes) {
   RenderThread* render_thread = RenderThread::current();
   if (!render_thread)
     return false;
   GpuChannelHost* host = render_thread->EstablishGpuChannelSync();
   if (!host)
     return false;
   DCHECK(host->ready());
   context_ = ggl::CreateOffscreenContext(host, NULL, gfx::Size(1, 1));
@@ skipping 33 matching lines @@
     case GL_FLOAT:
       return sizeof(GLfloat);
   }
   return 0;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::isGLES2Compliant() {
   return true;
 }
 
+unsigned int WebGraphicsContext3DCommandBufferImpl::getPlatformTextureId() {
+  DCHECK(context_);
+  return ggl::GetParentTextureId(context_);
+}
+
+void WebGraphicsContext3DCommandBufferImpl::prepareTexture() {
+  // Copies the contents of the off-screen render target into the texture
+  // used by the compositor.
+  ggl::SwapBuffers(context_);
+}
+
 void WebGraphicsContext3DCommandBufferImpl::reshape(int width, int height) {
   cached_width_ = width;
   cached_height_ = height;
   makeContextCurrent();
 
   ggl::ResizeOffscreenContext(context_, gfx::Size(width, height));
 
   // Force a SwapBuffers to get the framebuffer to resize, even though
   // we aren't directly rendering from the back buffer yet.
   ggl::SwapBuffers(context_);
@@ skipping 702 matching lines @@
   glDeleteShader(shader);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::deleteTexture(unsigned texture) {
   makeContextCurrent();
   glDeleteTextures(1, &texture);
 }
 
 #endif  // defined(ENABLE_GPU)