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

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 218 matching lines @@
   instance->delegate()->ZoomLimitsChanged(minimum_factor, maximium_factor);
 }
 
 const PPB_Zoom_Dev ppb_zoom = {
   &ZoomChanged,
   &ZoomLimitsChanged
 };
 
 }  // namespace
 
-PluginInstance::PluginInstance(PluginDelegate* delegate,
-                               PluginModule* module,
-                               PPP_Instance_Combined* instance_interface)
+// static
+PluginInstance* PluginInstance::Create0_5(PluginDelegate* delegate,
+                                          PluginModule* module,
+                                          const void* ppp_instance_if_0_5) {
+  const PPP_Instance_0_5* interface =
+      static_cast<const PPP_Instance_0_5*>(ppp_instance_if_0_5);
+  return new PluginInstance(
+      delegate,
+      module,
+      new ::ppapi::PPP_Instance_Combined(*interface));
+}
+
+// static
+PluginInstance* PluginInstance::Create0_4(PluginDelegate* delegate,
+                                          PluginModule* module,
+                                          const void* ppp_instance_if_0_4) {
+  const PPP_Instance_0_4* interface =
+      static_cast<const PPP_Instance_0_4*>(ppp_instance_if_0_4);
+  return new PluginInstance(
+      delegate,
+      module,
+      new ::ppapi::PPP_Instance_Combined(*interface));
+}
+
+PluginInstance::PluginInstance(
+    PluginDelegate* delegate,
+    PluginModule* module,
+    ::ppapi::PPP_Instance_Combined* instance_interface)
     : delegate_(delegate),
       module_(module),
       instance_interface_(instance_interface),
       pp_instance_(0),
       container_(NULL),
       full_frame_(false),
       has_webkit_focus_(false),
       has_content_area_focus_(false),
       find_identifier_(-1),
       plugin_find_interface_(NULL),
@@ skipping 429 matching lines @@
 bool PluginInstance::LoadFindInterface() {
   if (!plugin_find_interface_) {
     plugin_find_interface_ =
         static_cast<const PPP_Find_Dev*>(module_->GetPluginInterface(
             PPP_FIND_DEV_INTERFACE));
   }
 
   return !!plugin_find_interface_;
 }
 
-PluginInstance::PPP_Instance_Combined::PPP_Instance_Combined(
-    const PPP_Instance_0_5& instance_if)
-    : PPP_Instance_0_5(instance_if),
-      GetInstanceObject_0_4(NULL) {}
-
-PluginInstance::PPP_Instance_Combined::PPP_Instance_Combined(
-    const PPP_Instance_0_4& instance_if)
-    : PPP_Instance_0_5(),  // Zero-initialize.
-      GetInstanceObject_0_4(instance_if.GetInstanceObject) {
-  DidCreate = instance_if.DidCreate;
-  DidDestroy = instance_if.DidDestroy;
-  DidChangeView = instance_if.DidChangeView;
-  DidChangeFocus = instance_if.DidChangeFocus;
-  HandleInputEvent = instance_if.HandleInputEvent;
-  HandleDocumentLoad = instance_if.HandleDocumentLoad;
-}
-
 bool PluginInstance::LoadMessagingInterface() {
   if (!checked_for_plugin_messaging_interface_) {
     checked_for_plugin_messaging_interface_ = true;
     plugin_messaging_interface_ =
         static_cast<const PPP_Messaging*>(module_->GetPluginInterface(
             PPP_MESSAGING_INTERFACE));
   }
 
   return !!plugin_messaging_interface_;
 }
@@ skipping 786 matching lines @@
 }
 
 PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) {
   gfx::Size screen_size = delegate()->GetScreenSize();
   *size = PP_MakeSize(screen_size.width(), screen_size.height());
   return PP_TRUE;
 }
 
 }  // namespace ppapi
 }  // namespace webkit