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

webkit/plugins/ppapi/ppapi_plugin_instance.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/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 573 matching lines @@
 }
 
 void PluginInstance::ViewChanged(const gfx::Rect& position,
                                  const gfx::Rect& clip) {
   if (position.size() != position_.size() && bound_graphics_3d()) {
     // TODO(apatrick): This is a hack to force the back buffer to resize.
     // It is obviously wrong to call SwapBuffers when a partial frame has
     // potentially been rendered. Plan is to embed resize commands in the
     // command buffer just before ViewChanged is called.
     bound_graphics_3d()->ResizeBackingTexture(position.size());
-    bound_graphics_3d()->SwapBuffers(PP_BlockUntilComplete());
+    bound_graphics_3d()->SwapBuffers();
   }
 
   position_ = position;
 
   if (clip.IsEmpty()) {
     // WebKit can give weird (x,y) positions for empty clip rects (since the
     // position technically doesn't matter). But we want to make these
     // consistent since this is given to the plugin, so force everything to 0
     // in the "everything is clipped" case.
     clip_ = gfx::Rect();
@@ skipping 27 matching lines @@
   has_content_area_focus_ = has_focus;
   if (PluginHasFocus() != old_plugin_focus) {
     instance_interface_->DidChangeFocus(pp_instance(),
                                         BoolToPPBool(PluginHasFocus()));
   }
 }
 
 void PluginInstance::ViewInitiatedPaint() {
   if (bound_graphics_2d())
     bound_graphics_2d()->ViewInitiatedPaint();
-  if (bound_graphics_3d())
-    bound_graphics_3d()->ViewInitiatedPaint();
 }
 
 void PluginInstance::ViewFlushedPaint() {
   if (bound_graphics_2d())
     bound_graphics_2d()->ViewFlushedPaint();
-  if (bound_graphics_3d())
-    bound_graphics_3d()->ViewFlushedPaint();
 }
 
 bool PluginInstance::GetBitmapForOptimizedPluginPaint(
     const gfx::Rect& paint_bounds,
     TransportDIB** dib,
     gfx::Rect* location,
     gfx::Rect* clip) {
   if (!always_on_top_)
     return false;
   if (!bound_graphics_2d() || !bound_graphics_2d()->is_always_opaque())
@@ skipping 520 matching lines @@
 PPB_Graphics3D_Impl* PluginInstance::bound_graphics_3d() const {
   if (bound_graphics_.get() == NULL)
     return NULL;
 
   return bound_graphics_->Cast<PPB_Graphics3D_Impl>();
 }
 
 }  // namespace ppapi
 }  // namespace webkit