Revert 93066 - Execute all GL commands up to the put offset reported by a each flush.This means g...

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 60 matching lines @@
   // Initialize the library. This must have completed before any other
   // 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();
+  void PumpCommands(bool sync);
 
   // 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 285 matching lines @@
 void GLInProcessContext::ResizeOffscreen(const gfx::Size& size) {
   DCHECK(size.width() > 0 && size.height() > 0);
   if (size_ != size) {
     gpu_scheduler_->ResizeOffscreenFrameBuffer(size);
     // TODO(gman): See if the next line is needed.
     gles2_implementation_->ResizeCHROMIUM(size.width(),  size.height());
     size_ = size;
   }
 }
 
-void GLInProcessContext::PumpCommands() {
+void GLInProcessContext::PumpCommands(bool /* sync */) {
   ::gpu::CommandBuffer::State state;
   do {
-    gpu_scheduler_->PutChanged();
+    gpu_scheduler_->PutChanged(true);
     MessageLoop::current()->RunAllPending();
     state = command_buffer_->GetState();
   } while (state.get_offset != state.put_offset);
 }
 
 uint32 GLInProcessContext::GetParentTextureId() {
   return parent_texture_id_;
 }
 
 uint32 GLInProcessContext::CreateParentTexture(const gfx::Size& size) {
@@ skipping 169 matching lines @@
         attribs.push_back(NONE);
         attrib_list = NULL;
         break;
     }
   }
 
   command_buffer_.reset(new CommandBufferService);
   if (!command_buffer_->Initialize(kCommandBufferSize))
     return false;
 
-  gpu_scheduler_ = GpuScheduler::Create(command_buffer_.get(),
-                                        NULL,
-                                        NULL);
+  gpu_scheduler_ = new GpuScheduler(command_buffer_.get(), NULL, NULL);
 
   if (onscreen) {
     if (render_surface == gfx::kNullPluginWindow) {
       LOG(ERROR) << "Invalid surface handle for onscreen context.";
       command_buffer_.reset();
     } else {
       if (!gpu_scheduler_->Initialize(render_surface,
                                       gfx::Size(),
                                       ::gpu::gles2::DisallowedExtensions(),
                                       allowed_extensions,
@@ skipping 478 matching lines @@
   if (!context_->GetChildToParentLatch(latch_id)) {
     LOG(ERROR) << "getLatch must only be called on child context";
     synthesizeGLError(GL_INVALID_OPERATION);
     *latch_id = ::gpu::kInvalidLatchId;
   }
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::waitLatchCHROMIUM(
     WGC3Duint latch_id)
 {
+  // TODO(gmam): See if we can comment this in.
+  // ClearContext();
+  gl_->WaitLatchCHROMIUM(latch_id);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::setLatchCHROMIUM(
     WGC3Duint latch_id)
 {
+  // TODO(gmam): See if we can comment this in.
+  // ClearContext();
+  gl_->SetLatchCHROMIUM(latch_id);
+  // required to ensure set command is sent to GPU process
+  gl_->Flush();
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::
     rateLimitOffscreenContextCHROMIUM() {
   // TODO(gmam): See if we can comment this in.
   // ClearContext();
   gl_->RateLimitOffscreenContextCHROMIUM();
 }
 
 WebKit::WebString WebGraphicsContext3DInProcessCommandBufferImpl::
@@ skipping 703 matching lines @@
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // defined(ENABLE_GPU)