Revert "Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer""

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

 // Copyright (c) 2011 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
@@ skipping 68 matching lines @@
   // functions are invoked.
   static bool Initialize();
 
   // 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
@@ skipping 205 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 void GLInProcessContext::PumpCommands() {
   base::AutoLock lock(g_decoder_lock.Get());
   decoder_->MakeCurrent();
   gpu_scheduler_->PutChanged();
   ::gpu::CommandBuffer::State state = command_buffer_->GetState();
   CHECK(state.error == ::gpu::error::kNoError);
 }
 
+bool GLInProcessContext::GetBufferChanged(int32 transfer_buffer_id) {
+  return gpu_scheduler_->SetGetBuffer(transfer_buffer_id);
+}
+
 uint32 GLInProcessContext::GetParentTextureId() {
   return parent_texture_id_;
 }
 
 uint32 GLInProcessContext::CreateParentTexture(const gfx::Size& size) {
   uint32 texture = 0;
   gles2_implementation_->GenTextures(1, &texture);
   gles2_implementation_->Flush();
   return texture;
 }
@@ skipping 126 matching lines @@
         break;
       default:
         last_error_ = BAD_ATTRIBUTE;
         attribs.push_back(NONE);
         attrib_list = NULL;
         break;
     }
   }
 
   command_buffer_.reset(new CommandBufferService);
-  if (!command_buffer_->Initialize(kCommandBufferSize)) {
+  if (!command_buffer_->Initialize()) {
     LOG(ERROR) << "Could not initialize command buffer.";
     Destroy();
     return false;
   }
 
   // TODO(gman): This needs to be true if this is Pepper.
   bool bind_generates_resource = false;
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
       context_group->decoder_->GetContextGroup() :
           new ::gpu::gles2::ContextGroup(bind_generates_resource)));
@@ skipping 45 matching lines @@
   if (!decoder_->SetParent(
       parent_.get() ? parent_->decoder_.get() : NULL,
       parent_texture_id_)) {
     LOG(ERROR) << "Could not set parent.";
     Destroy();
     return false;
   }
 
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&GLInProcessContext::PumpCommands, base::Unretained(this)));
+  command_buffer_->SetGetBufferChangeCallback(
+      base::Bind(
+          &GLInProcessContext::GetBufferChanged, base::Unretained(this)));
 
   // Create the GLES2 helper, which writes the command buffer protocol.
   gles2_helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
   if (!gles2_helper_->Initialize(kCommandBufferSize)) {
     Destroy();
     return false;
   }
 
   // Create a transfer buffer.
   transfer_buffer_id_ =
@@ skipping 1145 matching lines @@
   context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // defined(ENABLE_GPU)