Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/plugins/ppapi can move to content/renderer/ppapi

BUG=263054
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/19744007

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

4 files changed, 20 insertions, 20 deletions

diff --git a/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chrome/renderer/pepper/pepper_flash_menu_host.cc
index d8799d2..3d4b905 100644
--- a/chrome/renderer/pepper/pepper_flash_menu_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_menu_host.cc
@@ -14,7 +14,6 @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_flash_menu.h"
 #include "ui/gfx/point.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace chrome {
 
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 6bc0c30..8880fb2 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -92,7 +92,7 @@ int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop(
   webkit::ppapi::PluginInstance* plugin_instance =
       host_->GetPluginInstance(pp_instance());
   if (plugin_instance)
-    plugin_instance->set_always_on_top(on_top);
+    plugin_instance->SetAlwaysOnTop(on_top);
   // Since no reply is sent for this message, it doesn't make sense to return an
   // error.
   return PP_OK;
diff --git a/chrome/renderer/pepper/pepper_pdf_host.cc b/chrome/renderer/pepper/pepper_pdf_host.cc
index afe05a6..8ae1c5e 100644
--- a/chrome/renderer/pepper/pepper_pdf_host.cc
+++ b/chrome/renderer/pepper/pepper_pdf_host.cc
@@ -182,7 +182,7 @@ int32_t PepperPDFHost::OnHostMsgDidStartLoading(
   PluginInstance* instance = host_->GetPluginInstance(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
-  instance->render_view()->DidStartLoading();
+  instance->GetRenderView()->DidStartLoading();
   return PP_OK;
 }
 
@@ -191,7 +191,7 @@ int32_t PepperPDFHost::OnHostMsgDidStopLoading(
   PluginInstance* instance = host_->GetPluginInstance(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
-  instance->render_view()->DidStopLoading();
+  instance->GetRenderView()->DidStopLoading();
   return PP_OK;
 }
 
@@ -200,9 +200,9 @@ int32_t PepperPDFHost::OnHostMsgSetContentRestriction(
   PluginInstance* instance = host_->GetPluginInstance(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
-  instance->render_view()->Send(
+  instance->GetRenderView()->Send(
       new ChromeViewHostMsg_PDFUpdateContentRestrictions(
-          instance->render_view()->GetRoutingID(), restrictions));
+          instance->GetRenderView()->GetRoutingID(), restrictions));
   return PP_OK;
 }
 
@@ -235,7 +235,7 @@ int32_t PepperPDFHost::OnHostMsgHasUnsupportedFeature(
     return PP_OK;
 
   WebKit::WebView* view =
-      instance->container()->element().document().frame()->view();
+      instance->GetContainer()->element().document().frame()->view();
   content::RenderView* render_view = content::RenderView::FromWebView(view);
   render_view->Send(new ChromeViewHostMsg_PDFHasUnsupportedFeature(
       render_view->GetRoutingID()));
@@ -249,7 +249,7 @@ int32_t PepperPDFHost::OnHostMsgPrint(
   if (!instance)
     return PP_ERROR_FAILED;
 
-  WebKit::WebElement element = instance->container()->element();
+  WebKit::WebElement element = instance->GetContainer()->element();
   WebKit::WebView* view = element.document().frame()->view();
   content::RenderView* render_view = content::RenderView::FromWebView(view);
 
@@ -268,8 +268,8 @@ int32_t PepperPDFHost::OnHostMsgSaveAs(
   PluginInstance* instance = host_->GetPluginInstance(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
-  GURL url = instance->plugin_url();
-  content::RenderView* render_view = instance->render_view();
+  GURL url = instance->GetPluginURL();
+  content::RenderView* render_view = instance->GetRenderView();
   WebKit::WebFrame* frame = render_view->GetWebView()->mainFrame();
   content::Referrer referrer(frame->document().url(),
                              frame->document().referrerPolicy());
diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc
index 9148e10..65e9be1 100644
--- a/chrome/renderer/pepper/ppb_pdf_impl.cc
+++ b/chrome/renderer/pepper/ppb_pdf_impl.cc
@@ -20,6 +20,7 @@
 #include "grit/webkit_strings.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_pdf.h"
+#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
@@ -136,7 +137,7 @@ WebKit::WebElement GetWebElement(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::Get(instance_id);
   if (!instance)
     return WebKit::WebElement();
-  return instance->container()->element();
+  return instance->GetContainer()->element();
 }
 
 printing::PrintWebViewHelper* GetPrintWebViewHelper(
@@ -289,30 +290,30 @@ void DidStartLoading(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::Get(instance_id);
   if (!instance)
     return;
-  instance->render_view()->DidStartLoading();
+  instance->GetRenderView()->DidStartLoading();
 }
 
 void DidStopLoading(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::Get(instance_id);
   if (!instance)
     return;
-  instance->render_view()->DidStopLoading();
+  instance->GetRenderView()->DidStopLoading();
 }
 
 void SetContentRestriction(PP_Instance instance_id, int restrictions) {
   PluginInstance* instance = PluginInstance::Get(instance_id);
   if (!instance)
     return;
-  instance->render_view()->Send(
+  instance->GetRenderView()->Send(
       new ChromeViewHostMsg_PDFUpdateContentRestrictions(
-          instance->render_view()->GetRoutingID(), restrictions));
+          instance->GetRenderView()->GetRoutingID(), restrictions));
 }
 
-void HistogramPDFPageCount(PP_Instance /*instance*/, int count) {
+void HistogramPDFPageCount(PP_Instance instance, int count) {
   UMA_HISTOGRAM_COUNTS_10000("PDF.PageCount", count);
 }
 
-void UserMetricsRecordAction(PP_Instance /*instance*/, PP_Var action) {
+void UserMetricsRecordAction(PP_Instance instance, PP_Var action) {
   scoped_refptr<ppapi::StringVar> action_str(
       ppapi::StringVar::FromPPVar(action));
   if (action_str.get())
@@ -328,7 +329,7 @@ void HasUnsupportedFeature(PP_Instance instance_id) {
   if (!instance->IsFullPagePlugin())
     return;
 
-  WebView* view = instance->container()->element().document().frame()->view();
+  WebView* view = instance->GetContainer()->element().document().frame()->view();
   content::RenderView* render_view = content::RenderView::FromWebView(view);
   render_view->Send(new ChromeViewHostMsg_PDFHasUnsupportedFeature(
       render_view->GetRoutingID()));
@@ -338,9 +339,9 @@ void SaveAs(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::Get(instance_id);
   if (!instance)
     return;
-  GURL url = instance->plugin_url();
+  GURL url = instance->GetPluginURL();
 
-  content::RenderView* render_view = instance->render_view();
+  content::RenderView* render_view = instance->GetRenderView();
   WebKit::WebFrame* frame = render_view->GetWebView()->mainFrame();
   content::Referrer referrer(frame->document().url(),
                              frame->document().referrerPolicy());