Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p…

content/renderer/pepper/renderer_ppapi_host_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/renderer_ppapi_host_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "content/common/sandbox_util.h"
 #include "content/renderer/pepper/pepper_browser_connection.h"
 #include "content/renderer/pepper/pepper_graphics_2d_host.h"
 #include "content/renderer/pepper/pepper_in_process_resource_creation.h"
 #include "content/renderer/pepper/pepper_in_process_router.h"
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "ui/gfx/point.h"
 #include "webkit/plugins/ppapi/fullscreen_container.h"
 #include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
 
 using webkit::ppapi::HostGlobals;
 using webkit::ppapi::PluginInstance;
+using webkit::ppapi::PluginInstanceImpl;
 using webkit::ppapi::PluginModule;
 
 namespace content {
 // static
 CONTENT_EXPORT RendererPpapiHost*
 RendererPpapiHost::GetForPPInstance(PP_Instance instance) {
   return RendererPpapiHostImpl::GetForPPInstance(instance);
 }
 
 // Out-of-process constructor.
@@ skipping 61 matching lines @@
   // Takes ownership of pointer.
   module->SetEmbedderState(
       scoped_ptr<PluginModule::EmbedderState>(result));
 
   return result;
 }
 
 // static
 RendererPpapiHostImpl* RendererPpapiHostImpl::GetForPPInstance(
     PP_Instance pp_instance) {
-  PluginInstance* instance = HostGlobals::Get()->GetInstance(pp_instance);
+  PluginInstanceImpl* instance = HostGlobals::Get()->GetInstance(pp_instance);
   if (!instance)
     return NULL;
 
   // All modules created by content will have their embedder state be the
   // host impl.
   return static_cast<RendererPpapiHostImpl*>(
       instance->module()->GetEmbedderState());
 }
 
 scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>
 RendererPpapiHostImpl::CreateInProcessResourceCreationAPI(
-    PluginInstance* instance) {
+    PluginInstanceImpl* instance) {
   return scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>(
       new PepperInProcessResourceCreation(this, instance));
 }
 
 PepperBrowserConnection*
 RendererPpapiHostImpl::GetBrowserConnection(PP_Instance instance) const {
-  PluginInstance* instance_object = GetAndValidateInstance(instance);
+  PluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
   if (!instance_object)
     return NULL;
 
   // Since we're the embedder, we can make assumptions about the delegate on
   // the instance.
   PepperPluginDelegateImpl* delegate =
       static_cast<PepperPluginDelegateImpl*>(instance_object->delegate());
   if (!delegate)
     return NULL;
 
   return delegate->pepper_browser_connection();
 }
 
 ppapi::host::PpapiHost* RendererPpapiHostImpl::GetPpapiHost() {
   return ppapi_host_.get();
 }
 
 RenderView* RendererPpapiHostImpl::GetRenderViewForInstance(
     PP_Instance instance) const {
-  PluginInstance* instance_object = GetAndValidateInstance(instance);
+  PluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
   if (!instance_object)
     return NULL;
 
   // Since we're the embedder, we can make assumptions about the delegate on
   // the instance and get back to our RenderView.
   return static_cast<PepperPluginDelegateImpl*>(
       instance_object->delegate())->render_view();
 }
 
-bool RendererPpapiHostImpl::IsValidInstance(
-    PP_Instance instance) const {
+bool RendererPpapiHostImpl::IsValidInstance(PP_Instance instance) const {
   return !!GetAndValidateInstance(instance);
 }
 
 webkit::ppapi::PluginInstance* RendererPpapiHostImpl::GetPluginInstance(
     PP_Instance instance) const {
   return GetAndValidateInstance(instance);
 }
 
 WebKit::WebPluginContainer* RendererPpapiHostImpl::GetContainerForInstance(
       PP_Instance instance) const {
-  PluginInstance* instance_object = GetAndValidateInstance(instance);
+  PluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
   if (!instance_object)
     return NULL;
   return instance_object->container();
 }
 
 base::ProcessId RendererPpapiHostImpl::GetPluginPID() const {
   if (dispatcher_)
     return dispatcher_->channel()->peer_pid();
   return base::kNullProcessId;
 }
 
 bool RendererPpapiHostImpl::HasUserGesture(PP_Instance instance) const {
-  PluginInstance* instance_object = GetAndValidateInstance(instance);
+  PluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
   if (!instance_object)
     return false;
 
   if (instance_object->module()->permissions().HasPermission(
           ppapi::PERMISSION_BYPASS_USER_GESTURE))
     return true;
   return instance_object->IsProcessingUserGesture();
 }
 
 int RendererPpapiHostImpl::GetRoutingIDForWidget(PP_Instance instance) const {
-  webkit::ppapi::PluginInstance* plugin_instance =
+  webkit::ppapi::PluginInstanceImpl* plugin_instance =
       GetAndValidateInstance(instance);
   if (!plugin_instance)
     return 0;
   if (plugin_instance->flash_fullscreen()) {
     webkit::ppapi::FullscreenContainer* container =
         plugin_instance->fullscreen_container();
     return static_cast<RenderWidgetFullscreenPepper*>(container)->routing_id();
   }
   return GetRenderViewForInstance(instance)->GetRoutingID();
 }
 
 gfx::Point RendererPpapiHostImpl::PluginPointToRenderView(
     PP_Instance instance,
     const gfx::Point& pt) const {
-  webkit::ppapi::PluginInstance* plugin_instance =
+  webkit::ppapi::PluginInstanceImpl* plugin_instance =
       GetAndValidateInstance(instance);
   if (!plugin_instance)
     return pt;
 
   RenderViewImpl* render_view = static_cast<RenderViewImpl*>(
       GetRenderViewForInstance(instance));
   if (plugin_instance->view_data().is_fullscreen ||
       plugin_instance->flash_fullscreen()) {
     WebKit::WebRect window_rect = render_view->windowRect();
     WebKit::WebRect screen_rect = render_view->screenInfo().rect;
@@ skipping 31 matching lines @@
   if (browser_connection == NULL) {
     callback.Run(0);
   } else {
     browser_connection->SendBrowserCreate(module_->GetPluginChildId(),
                                           instance,
                                           nested_msg,
                                           callback);
   }
 }
 
-PluginInstance* RendererPpapiHostImpl::GetAndValidateInstance(
+PluginInstanceImpl* RendererPpapiHostImpl::GetAndValidateInstance(
     PP_Instance pp_instance) const {
-  PluginInstance* instance = HostGlobals::Get()->GetInstance(pp_instance);
+  PluginInstanceImpl* instance = HostGlobals::Get()->GetInstance(pp_instance);
   if (!instance)
     return NULL;
   if (!instance->IsValidInstanceOf(module_))
     return NULL;
   return instance;
 }
 
 }  // namespace content