Make o.o.p. proxy handle PPP_Instance versions 0.4 and 0.5.

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
 #include "ppapi/c/dev/ppp_graphics_3d_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/function_group_base.h"
+#include "ppapi/shared_impl/ppp_instance_combined.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
 typedef struct NPObject NPObject;
 struct PP_Var;
 struct PPB_Messaging;
@@ skipping 11 matching lines @@
 namespace gfx {
 class Rect;
 }
 
 namespace WebKit {
 struct WebCursorInfo;
 class WebInputEvent;
 class WebPluginContainer;
 }
 
+namespace ppapi {
+struct PPP_Instance_Combined;
+}
+
 namespace webkit {
 namespace ppapi {
 
 class FullscreenContainer;
 class MessageChannel;
 class ObjectVar;
 class PluginDelegate;
 class PluginModule;
 class PluginObject;
 class PPB_Graphics2D_Impl;
 class PPB_ImageData_Impl;
 class PPB_Surface3D_Impl;
 class PPB_URLLoader_Impl;
 class PPB_URLRequestInfo_Impl;
 class Resource;
 
 // Represents one time a plugin appears on one web page.
 //
 // Note: to get from a PP_Instance to a PluginInstance*, use the
 // ResourceTracker.
 class PluginInstance : public base::RefCounted<PluginInstance>,
                        public ::ppapi::FunctionGroupBase,
                        public ::ppapi::thunk::PPB_Instance_FunctionAPI {
  public:
-  struct PPP_Instance_Combined;
+  // Create and return a PluginInstance object which supports the
+  // PPP_Instance_0_5 interface.
+  static PluginInstance* Create0_5(PluginDelegate* delegate,
+                                   PluginModule* module,
+                                   const void* ppp_instance_if_0_5);
 
-  PluginInstance(PluginDelegate* delegate,
-                 PluginModule* module,
-                 PPP_Instance_Combined* instance_interface);
+  // Create and return a PluginInstance object which supports the
+  // PPP_Instance_0_4 interface.
+  static PluginInstance* Create0_4(PluginDelegate* delegate,
+                                   PluginModule* module,
+                                   const void* ppp_instance_if_0_4);
 
   // Delete should be called by the WebPlugin before this destructor.
   virtual ~PluginInstance();
 
   // Returns a pointer to the interface implementing PPB_Find that is
   // exposed to the plugin.
   static const PPB_Messaging* GetMessagingInterface();
   static const PPB_Zoom_Dev* GetZoomInterface();
 
   PluginDelegate* delegate() const { return delegate_; }
@@ skipping 152 matching lines @@
   ObjectVar* ObjectVarForNPObject(NPObject* np_object) const;
 
   // Returns true iff the plugin is a full-page plugin (i.e. not in an iframe or
   // embedded in a page).
   bool IsFullPagePlugin() const;
 
   FullscreenContainer* fullscreen_container() const {
     return fullscreen_container_;
   }
 
-  // TODO(dmichael): Remove this when all plugins are ported to use scripting
-  //                 from private interfaces.
-  struct PPP_Instance_Combined : public PPP_Instance_0_5 {
-    PPP_Instance_Combined(const PPP_Instance_0_5& instance_if);
-    PPP_Instance_Combined(const PPP_Instance_0_4& instance_if);
-
-    struct PP_Var (*const GetInstanceObject_0_4)(PP_Instance instance);
-  };
-  template <class InterfaceType>
-  static PPP_Instance_Combined* new_instance_interface(
-      const void* interface_object) {
-    return new PPP_Instance_Combined(
-        *static_cast<const InterfaceType*>(interface_object));
-  }
-
   // FunctionGroupBase overrides.
   virtual ::ppapi::thunk::PPB_Instance_FunctionAPI* AsPPB_Instance_FunctionAPI()
       OVERRIDE;
 
   // PPB_Instance_API implementation.
   virtual PP_Bool BindGraphics(PP_Instance instance,
                                PP_Resource device) OVERRIDE;
   virtual PP_Bool IsFullFrame(PP_Instance instance) OVERRIDE;
   virtual PP_Var GetWindowObject(PP_Instance instance) OVERRIDE;
   virtual PP_Var GetOwnerElementObject(PP_Instance instance) OVERRIDE;
   virtual PP_Var ExecuteScript(PP_Instance instance,
                                PP_Var script,
                                PP_Var* exception) OVERRIDE;
   virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE;
   virtual PP_Bool SetFullscreen(PP_Instance instance,
                                 PP_Bool fullscreen) OVERRIDE;
   virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE;
 
  private:
+  // See the static Create functions above for creating PluginInstance objects.
+  // This constructor is private so that we can hide the PPP_Instance_Combined
+  // details while still having 1 constructor to maintain for member
+  // initialization.
+  PluginInstance(PluginDelegate* delegate,
+                 PluginModule* module,
+                 ::ppapi::PPP_Instance_Combined* instance_interface);
+
   bool LoadFindInterface();
   bool LoadMessagingInterface();
   bool LoadPdfInterface();
   bool LoadSelectionInterface();
   bool LoadPrintInterface();
   bool LoadPrivateInterface();
   bool LoadZoomInterface();
 
   // Determines if we think the plugin has focus, both content area and webkit
   // (see has_webkit_focus_ below).
@@ skipping 33 matching lines @@
   // A value of zero indicates the plugin is not backed by a texture.
   void setBackingTextureId(unsigned int id);
 
   // Internal helper function for PrintPage().
   bool PrintPageHelper(PP_PrintPageNumberRange_Dev* page_ranges,
                        int num_ranges,
                        WebKit::WebCanvas* canvas);
 
   PluginDelegate* delegate_;
   scoped_refptr<PluginModule> module_;
-  scoped_ptr<PPP_Instance_Combined> instance_interface_;
+  scoped_ptr< ::ppapi::PPP_Instance_Combined> instance_interface_;
 
   PP_Instance pp_instance_;
 
   // NULL until we have been initialized.
   WebKit::WebPluginContainer* container_;
 
   // Plugin URL.
   GURL plugin_url_;
 
   // Indicates whether this is a full frame instance, which means it represents
@@ skipping 126 matching lines @@
   typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;
   NPObjectToObjectVarMap np_object_to_object_var_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_