This implements the new system for Graphics2D only.

This works by adding a new thunk layer that will forward to an "API" that's either per-instance (function APIs) or per-resource (resource APIs). The proxying and such is then implemented in terms of this C++ API.

Ideally the trackers of the PP_Resource/PP_Instance -> object mapping would be shared between the plugin and renderer processes. To keep this patch under control, I did this as a virtual base class which is implemented by ppapi::proxy::PluginResourceTracker and webkit::ppapi::ResourceTracker. Later, the functionality of these objects should be shared in a common tracker class.

Still to do it a lot of cleanup and merging of things. Also, the namespaces are a bit out of control.
Review URL: http://codereview.chromium.org/6905088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84519 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 48 insertions, 164 deletions

diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.cc b/ppapi/proxy/ppb_graphics_2d_proxy.cc
index 3f1c8ef..38777b7 100644
--- a/ppapi/proxy/ppb_graphics_2d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_2d_proxy.cc
@@ -15,197 +15,85 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/thunk.h"
+
+using ::ppapi::thunk::PPB_Graphics2D_API;
+using ::ppapi::thunk::EnterResource;
 
 namespace pp {
 namespace proxy {
 
-class Graphics2D : public PluginResource {
- public:
-  Graphics2D(const HostResource& host_resource,
-             const PP_Size& size,
-             PP_Bool is_always_opaque)
-      : PluginResource(host_resource),
-        size_(size),
-        is_always_opaque_(is_always_opaque),
-        current_flush_callback_(PP_BlockUntilComplete()) {
-  }
-  virtual ~Graphics2D() {
-  }
-
-  // Resource overrides.
-  virtual Graphics2D* AsGraphics2D() { return this; }
-
-  const PP_Size& size() const { return size_; }
-  PP_Bool is_always_opaque() const { return is_always_opaque_; }
-
-  bool is_flush_pending() const { return !!current_flush_callback_.func; }
-
-  PP_CompletionCallback current_flush_callback() const {
-    return current_flush_callback_;
-  }
-  void set_current_flush_callback(PP_CompletionCallback cb) {
-    current_flush_callback_ = cb;
-  }
-
- private:
-  PP_Size size_;
-  PP_Bool is_always_opaque_;
-
-  // In the plugin, this is the current callback set for Flushes. When the
-  // callback function pointer is non-NULL, we're waiting for a flush ACK.
-  PP_CompletionCallback current_flush_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(Graphics2D);
-};
-
 namespace {
 
-PP_Resource Create(PP_Instance instance,
-                   const PP_Size* size,
-                   PP_Bool is_always_opaque) {
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
-  if (!dispatcher)
-    return PP_ERROR_BADARGUMENT;
-
-  HostResource result;
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics2D_Create(
-      INTERFACE_ID_PPB_GRAPHICS_2D, instance, *size, is_always_opaque,
-      &result));
-  if (result.is_null())
-    return 0;
-  linked_ptr<Graphics2D> graphics_2d(new Graphics2D(result, *size,
-                                                    is_always_opaque));
-  return PluginResourceTracker::GetInstance()->AddResource(graphics_2d);
+InterfaceProxy* CreateGraphics2DProxy(Dispatcher* dispatcher,
+                                      const void* target_interface) {
+  return new PPB_Graphics2D_Proxy(dispatcher, target_interface);
 }
 
-PP_Bool IsGraphics2D(PP_Resource resource) {
-  Graphics2D* object = PluginResource::GetAs<Graphics2D>(resource);
-  return BoolToPPBool(!!object);
-}
+}  // namespace
 
-PP_Bool Describe(PP_Resource graphics_2d,
-                 PP_Size* size,
-                 PP_Bool* is_always_opaque) {
-  Graphics2D* object = PluginResource::GetAs<Graphics2D>(graphics_2d);
-  if (!object) {
-    size->width = 0;
-    size->height = 0;
-    *is_always_opaque = PP_FALSE;
-    return PP_FALSE;
-  }
+PPB_Graphics2D_API* Graphics2D::AsGraphics2D_API() {
+  return this;
+}
 
-  *size = object->size();
-  *is_always_opaque = object->is_always_opaque();
+PP_Bool Graphics2D::Describe(PP_Size* size, PP_Bool* is_always_opaque) {
+  *size = size_;
+  *is_always_opaque = is_always_opaque_;
   return PP_TRUE;
 }
 
-void PaintImageData(PP_Resource graphics_2d,
-                    PP_Resource image_data,
-                    const PP_Point* top_left,
-                    const PP_Rect* src_rect) {
-  Graphics2D* graphics_object = PluginResource::GetAs<Graphics2D>(graphics_2d);
-  if (!graphics_object)
-    return;
+void Graphics2D::PaintImageData(PP_Resource image_data,
+                                const PP_Point* top_left,
+                                const PP_Rect* src_rect) {
   PluginResource* image_object = PluginResourceTracker::GetInstance()->
       GetResourceObject(image_data);
-  if (!image_object)
-    return;
-  if (graphics_object->instance() != image_object->instance())
-    return;
-
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      graphics_object->instance());
-  if (!dispatcher)
-    return;
+  //if (!image_object || instance() != image_object->instance())
+  //  return;
 
   PP_Rect dummy;
   memset(&dummy, 0, sizeof(PP_Rect));
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics2D_PaintImageData(
-      INTERFACE_ID_PPB_GRAPHICS_2D, graphics_object->host_resource(),
+  GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_PaintImageData(
+      INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       image_object->host_resource(), *top_left, !!src_rect,
       src_rect ? *src_rect : dummy));
 }
 
-void Scroll(PP_Resource graphics_2d,
-            const PP_Rect* clip_rect,
-            const PP_Point* amount) {
-  Graphics2D* object = PluginResource::GetAs<Graphics2D>(graphics_2d);
-  if (!object)
-    return;
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      object->instance());
-  if (!dispatcher)
-    return;
-
+void Graphics2D::Scroll(const PP_Rect* clip_rect,
+                        const PP_Point* amount) {
   PP_Rect dummy;
   memset(&dummy, 0, sizeof(PP_Rect));
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics2D_Scroll(
-      INTERFACE_ID_PPB_GRAPHICS_2D, object->host_resource(),
+  GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_Scroll(
+      INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       !!clip_rect, clip_rect ? *clip_rect : dummy, *amount));
 }
 
-void ReplaceContents(PP_Resource graphics_2d, PP_Resource image_data) {
-  Graphics2D* graphics_object = PluginResource::GetAs<Graphics2D>(graphics_2d);
-  if (!graphics_object)
-    return;
+void Graphics2D::ReplaceContents(PP_Resource image_data) {
   PluginResource* image_object = PluginResourceTracker::GetInstance()->
       GetResourceObject(image_data);
-  if (!image_object)
-    return;
-  if (graphics_object->instance() != image_object->instance())
-    return;
-
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      graphics_object->instance());
-  if (!dispatcher)
+  if (!image_object || instance() != image_object->instance())
     return;
 
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics2D_ReplaceContents(
-      INTERFACE_ID_PPB_GRAPHICS_2D, graphics_object->host_resource(),
+  GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_ReplaceContents(
+      INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       image_object->host_resource()));
 }
 
-int32_t Flush(PP_Resource graphics_2d,
-              PP_CompletionCallback callback) {
-  Graphics2D* object = PluginResource::GetAs<Graphics2D>(graphics_2d);
-  if (!object)
-    return PP_ERROR_BADRESOURCE;
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      object->instance());
-  if (!dispatcher)
-    return PP_ERROR_FAILED;
-
+int32_t Graphics2D::Flush(PP_CompletionCallback callback) {
   // For now, disallow blocking calls. We'll need to add support for other
   // threads to this later.
   if (!callback.func)
     return PP_ERROR_BADARGUMENT;
 
-  if (object->is_flush_pending())
+  if (is_flush_pending())
     return PP_ERROR_INPROGRESS;  // Can't have >1 flush pending.
-  object->set_current_flush_callback(callback);
+  set_current_flush_callback(callback);
 
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics2D_Flush(
-      INTERFACE_ID_PPB_GRAPHICS_2D, object->host_resource()));
+  GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_Flush(
+      INTERFACE_ID_PPB_GRAPHICS_2D, host_resource()));
   return PP_OK_COMPLETIONPENDING;
 }
 
-const PPB_Graphics2D graphics_2d_interface = {
-  &Create,
-  &IsGraphics2D,
-  &Describe,
-  &PaintImageData,
-  &Scroll,
-  &ReplaceContents,
-  &Flush
-};
-
-InterfaceProxy* CreateGraphics2DProxy(Dispatcher* dispatcher,
-                                      const void* target_interface) {
-  return new PPB_Graphics2D_Proxy(dispatcher, target_interface);
-}
-
-}  // namespace
-
 PPB_Graphics2D_Proxy::PPB_Graphics2D_Proxy(Dispatcher* dispatcher,
                                            const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface),
@@ -218,7 +106,7 @@ PPB_Graphics2D_Proxy::~PPB_Graphics2D_Proxy() {
 // static
 const InterfaceProxy::Info* PPB_Graphics2D_Proxy::GetInfo() {
   static const Info info = {
-    &graphics_2d_interface,
+    ::ppapi::thunk::GetPPB_Graphics2D_Thunk(),
     PPB_GRAPHICS_2D_INTERFACE,
     INTERFACE_ID_PPB_GRAPHICS_2D,
     false,
@@ -230,8 +118,6 @@ const InterfaceProxy::Info* PPB_Graphics2D_Proxy::GetInfo() {
 bool PPB_Graphics2D_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Graphics2D_Proxy, msg)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_Create,
-                        OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_PaintImageData,
                         OnMsgPaintImageData)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_Scroll,
@@ -249,22 +135,16 @@ bool PPB_Graphics2D_Proxy::OnMessageReceived(const IPC::Message& msg) {
   return handled;
 }
 
-void PPB_Graphics2D_Proxy::OnMsgCreate(PP_Instance instance,
-                                       const PP_Size& size,
-                                       PP_Bool is_always_opaque,
-                                       HostResource* result) {
-  result->SetHostResource(instance, ppb_graphics_2d_target()->Create(
-      instance, &size, is_always_opaque));
-}
-
 void PPB_Graphics2D_Proxy::OnMsgPaintImageData(
     const HostResource& graphics_2d,
     const HostResource& image_data,
     const PP_Point& top_left,
     bool src_rect_specified,
     const PP_Rect& src_rect) {
-  ppb_graphics_2d_target()->PaintImageData(
-      graphics_2d.host_resource(), image_data.host_resource(), &top_left,
+  EnterResource<PPB_Graphics2D_API> enter(graphics_2d.host_resource(), false);
+  if (enter.failed())
+    return;
+  enter.object()->PaintImageData(image_data.host_resource(), &top_left,
       src_rect_specified ? &src_rect : NULL);
 }
 
@@ -272,15 +152,19 @@ void PPB_Graphics2D_Proxy::OnMsgScroll(const HostResource& graphics_2d,
                                        bool clip_specified,
                                        const PP_Rect& clip,
                                        const PP_Point& amount) {
-  ppb_graphics_2d_target()->Scroll(graphics_2d.host_resource(),
-                                   clip_specified ? &clip : NULL, &amount);
+  EnterResource<PPB_Graphics2D_API> enter(graphics_2d.host_resource(), false);
+  if (enter.failed())
+    return;
+  enter.object()->Scroll(clip_specified ? &clip : NULL, &amount);
 }
 
 void PPB_Graphics2D_Proxy::OnMsgReplaceContents(
     const HostResource& graphics_2d,
     const HostResource& image_data) {
-  ppb_graphics_2d_target()->ReplaceContents(graphics_2d.host_resource(),
-                                            image_data.host_resource());
+  EnterResource<PPB_Graphics2D_API> enter(graphics_2d.host_resource(), false);
+  if (enter.failed())
+    return;
+  enter.object()->ReplaceContents(image_data.host_resource());
 }
 
 void PPB_Graphics2D_Proxy::OnMsgFlush(const HostResource& graphics_2d) {