Revert 69511 - Make Graphics3D::SwapBuffers take a completion callback...

webkit/plugins/ppapi/ppb_graphics_3d_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.
 
 #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
 
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "base/lazy_instance.h"
 #include "base/thread_local.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
@@ skipping 79 matching lines @@
         Resource::GetAs<PPB_Graphics3D_Impl>(graphics3d));
     return BoolToPPBool(context.get() && context->MakeCurrent());
   }
 }
 
 PP_Resource GetCurrentContext() {
   PPB_Graphics3D_Impl* current_context = PPB_Graphics3D_Impl::GetCurrent();
   return current_context ? current_context->GetReference() : 0;
 }
 
-PP_Bool SwapBuffers(PP_Resource graphics3d, PP_CompletionCallback callback) {
+PP_Bool SwapBuffers(PP_Resource graphics3d) {
   scoped_refptr<PPB_Graphics3D_Impl> context(
       Resource::GetAs<PPB_Graphics3D_Impl>(graphics3d));
-  return BoolToPPBool(context && context->SwapBuffers(callback));
+  return BoolToPPBool(context && context->SwapBuffers());
 }
 
 uint32_t GetError() {
   // Technically, this should return the last error that occurred on the current
   // thread, rather than an error associated with a particular context.
   // TODO(apatrick): Fix this.
   PPB_Graphics3D_Impl* current_context = PPB_Graphics3D_Impl::GetCurrent();
   if (!current_context)
     return 0;
 
@@ skipping 11 matching lines @@
   &MakeCurrent,
   &GetCurrentContext,
   &SwapBuffers,
   &GetError
 };
 
 }  // namespace
 
 PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PluginModule* module)
   : Resource(module),
-    bound_instance_(NULL),
-    swap_initiated_(false),
-    swap_callback_(PP_BlockUntilComplete()) {
+    bound_instance_(NULL) {
 }
 
 const PPB_Graphics3D_Dev* PPB_Graphics3D_Impl::GetInterface() {
   return &ppb_graphics3d;
 }
 
 PPB_Graphics3D_Impl* PPB_Graphics3D_Impl::GetCurrent() {
   return g_current_context_key.Get().Get();
 }
 
@@ skipping 60 matching lines @@
 bool PPB_Graphics3D_Impl::MakeCurrent() {
   if (!platform_context_.get())
     return false;
 
   g_current_context_key.Get().Set(this);
 
   // TODO(apatrick): Return false on context lost.
   return true;
 }
 
-bool PPB_Graphics3D_Impl::SwapBuffers(PP_CompletionCallback callback) {
+bool PPB_Graphics3D_Impl::SwapBuffers() {
   if (!platform_context_.get())
     return false;
 
-  if (swap_callback_.func) {
-    // Already a pending SwapBuffers that hasn't returned yet.
-    return false;
-  }
-
-  swap_callback_ = callback;
   return platform_context_->SwapBuffers();
 }
 
 unsigned PPB_Graphics3D_Impl::GetError() {
   if (!platform_context_.get())
     return 0;
 
   return platform_context_->GetError();
 }
 
 void PPB_Graphics3D_Impl::ResizeBackingTexture(const gfx::Size& size) {
   if (!platform_context_.get())
     return;
 
   platform_context_->ResizeBackingTexture(size);
 }
 
 void PPB_Graphics3D_Impl::SetSwapBuffersCallback(Callback0::Type* callback) {
   if (!platform_context_.get())
     return;
 
   platform_context_->SetSwapBuffersCallback(callback);
 }
 
-void PPB_Graphics3D_Impl::ViewInitiatedPaint() {
-  if (swap_callback_.func) {
-    swap_initiated_ = true;
-  }
-}
-
-void PPB_Graphics3D_Impl::ViewFlushedPaint() {
-  // Notify any "painted" callback. See |unpainted_flush_callback_| in the
-  // header for more.
-  if (swap_initiated_ && swap_callback_.func) {
-    // We must clear swap_callback_ before issuing the callback. It will be
-    // common for the plugin to issue another SwapBuffers in response to the
-    // callback, and we don't want to think that a callback is already pending.
-    PP_CompletionCallback callback = PP_BlockUntilComplete();
-    std::swap(callback, swap_callback_);
-    swap_initiated_ = false;
-    PP_RunCompletionCallback(&callback, PP_OK);
-  }
-}
-
 unsigned PPB_Graphics3D_Impl::GetBackingTextureId() {
   if (!platform_context_.get())
     return 0;
 
   return platform_context_->GetBackingTextureId();
 }
 
 void PPB_Graphics3D_Impl::Destroy() {
   if (GetCurrent() == this) {
     ResetCurrent();
   }
 
   gles2_implementation_ = NULL;
 
   platform_context_.reset();
 }
 
 }  // namespace ppapi
 }  // namespace webkit