Added ppapi::Surface3D. This CL completes the new Pepper3D interface. The imp...

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 27 matching lines @@
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/event_conversion.h"
 #include "webkit/plugins/ppapi/fullscreen_container.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
-#include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/ppb_surface_3d_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/ppapi/string.h"
 #include "webkit/plugins/ppapi/var.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
@@ skipping 355 matching lines @@
   return ObjectVar::NPObjectToPPVar(module(), frame->windowObject());
 }
 
 PP_Var PluginInstance::GetOwnerElementObject() {
   if (!container_)
     return PP_MakeUndefined();
   return ObjectVar::NPObjectToPPVar(module(),
                                     container_->scriptableObjectForElement());
 }
 
 bool PluginInstance::BindGraphics(PP_Resource graphics_id) {

[alokp, 2010/12/23 22:07:54]

I think there is redundancy in BindGraphics API. The graphics resources are
already associated with an instance (at least they will be when Graphics2D is
updated as well). It will be better to just move this function to Graphics
object without an argument.

   if (!graphics_id) {
     // Special-case clearing the current device.
     if (bound_graphics_.get()) {
       if (bound_graphics_2d()) {
         bound_graphics_2d()->BindToInstance(NULL);
       } else if (bound_graphics_.get()) {
-        bound_graphics_3d()->SetSwapBuffersCallback(NULL);
-        bound_graphics_3d()->BindToInstance(NULL);
+        bound_graphics_3d()->BindToInstance(false);
       }
       InvalidateRect(gfx::Rect());
     }
     bound_graphics_ = NULL;
     return true;
   }
 
   scoped_refptr<PPB_Graphics2D_Impl> graphics_2d =
       Resource::GetAs<PPB_Graphics2D_Impl>(graphics_id);
-  scoped_refptr<PPB_Context3D_Impl> graphics_3d =
-      Resource::GetAs<PPB_Context3D_Impl>(graphics_id);
+  scoped_refptr<PPB_Surface3D_Impl> graphics_3d =
+      Resource::GetAs<PPB_Surface3D_Impl>(graphics_id);
 
   if (graphics_2d) {
     if (!graphics_2d->BindToInstance(this))
       return false;  // Can't bind to more than one instance.
 
     // See http://crbug.com/49403: this can be further optimized by keeping the
     // old device around and painting from it.
     if (bound_graphics_2d()) {
       // Start the new image with the content of the old image until the plugin
       // repaints.
       const SkBitmap* old_backing_bitmap =
           bound_graphics_2d()->image_data()->GetMappedBitmap();
       SkRect old_size = SkRect::MakeWH(
           SkScalar(static_cast<float>(old_backing_bitmap->width())),
           SkScalar(static_cast<float>(old_backing_bitmap->height())));
 
       SkCanvas canvas(*graphics_2d->image_data()->GetMappedBitmap());
       canvas.drawBitmap(*old_backing_bitmap, 0, 0);
 
       // Fill in any extra space with white.
       canvas.clipRect(old_size, SkRegion::kDifference_Op);
       canvas.drawARGB(255, 255, 255, 255);
     }
 
     bound_graphics_ = graphics_2d;
     // BindToInstance will have invalidated the plugin if necessary.
   } else if (graphics_3d) {
-    if (!graphics_3d->BindToInstance(this))
+    // Make sure graphics can only be bound to the instance it is
+    // associated with.
+    if (graphics_3d->instance() != this)

[alokp, 2010/12/23 22:07:54]

moving this function to graphics will also eliminate the need for these checks
and specialized code blocks for 2d and 3d.

+      return false;
+    if (!graphics_3d->BindToInstance(true))
       return false;
 
     bound_graphics_ = graphics_3d;
-    bound_graphics_3d()->SetSwapBuffersCallback(
-        NewCallback(this, &PluginInstance::CommitBackingTexture));
   }
 
   return true;
 }
 
 bool PluginInstance::SetCursor(PP_CursorType_Dev type) {
   cursor_.reset(new WebCursorInfo(static_cast<WebCursorInfo::Type>(type)));
   return true;
 }
 
@@ skipping 89 matching lines @@
     *cursor_info = *cursor_;
   return rv;
 }
 
 PP_Var PluginInstance::GetInstanceObject() {
   return instance_interface_->GetInstanceObject(pp_instance());
 }
 
 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();
-  }
-
   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();
   } else {
     clip_ = clip;
@@ skipping 560 matching lines @@
 }
 #endif  // defined(OS_MACOSX)
 
 PPB_Graphics2D_Impl* PluginInstance::bound_graphics_2d() const {
   if (bound_graphics_.get() == NULL)
     return NULL;
 
   return bound_graphics_->Cast<PPB_Graphics2D_Impl>();
 }
 
-PPB_Context3D_Impl* PluginInstance::bound_graphics_3d() const {
+PPB_Surface3D_Impl* PluginInstance::bound_graphics_3d() const {
   if (bound_graphics_.get() == NULL)
     return NULL;
 
-  return bound_graphics_->Cast<PPB_Context3D_Impl>();
+  return bound_graphics_->Cast<PPB_Surface3D_Impl>();
 }
 
 }  // namespace ppapi
 }  // namespace webkit