Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/plugin_instance.h

Index: webkit/plugins/ppapi/plugin_instance.h
===================================================================
--- webkit/plugins/ppapi/plugin_instance.h	(revision 0)
+++ webkit/plugins/ppapi/plugin_instance.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_INSTANCE_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_INSTANCE_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_INSTANCE_H_
+#define WEBKIT_PLUGINS_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <string>
 #include <vector>
@@ -29,7 +29,7 @@
 struct PPB_Zoom_Dev;
 struct PPP_Find_Dev;
 struct PPP_Instance;
-struct PPP_Private;
+struct PPP_Pdf;
 struct PPP_Selection_Dev;
 struct PPP_Zoom_Dev;
 
@@ -46,16 +46,17 @@
 class WebPluginContainer;
 }
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
-class Graphics2D;
-class Graphics3D;
-class ImageData;
+class FullscreenContainer;
 class PluginDelegate;
 class PluginModule;
+class PPB_Graphics2D_Impl;
+class PPB_Graphics3D_Impl;
+class PPB_ImageData_Impl;
+class PPB_URLLoader_Impl;
 class Resource;
-class URLLoader;
-class FullscreenContainer;
 
 // Represents one time a plugin appears on one web page.
 //
@@ -144,7 +145,7 @@
                   const std::vector<std::string>& arg_names,
                   const std::vector<std::string>& arg_values,
                   bool full_frame);
-  bool HandleDocumentLoad(URLLoader* loader);
+  bool HandleDocumentLoad(PPB_URLLoader_Impl* loader);
   bool HandleInputEvent(const WebKit::WebInputEvent& event,
                         WebKit::WebCursorInfo* cursor_info);
   PP_Var GetInstanceObject();
@@ -190,12 +191,12 @@
   bool IsFullscreen();
   bool SetFullscreen(bool fullscreen);
 
-  // Implementation of PPB_Private2.
+  // Implementation of PPB_Flash.
   bool NavigateToURL(const char* url, const char* target);
 
  private:
   bool LoadFindInterface();
-  bool LoadPrivateInterface();
+  bool LoadPdfInterface();
   bool LoadSelectionInterface();
   bool LoadZoomInterface();
 
@@ -222,11 +223,11 @@
 
   // Get the bound graphics context as a concrete 2D graphics context or returns
   // null if the context is not 2D.
-  Graphics2D* bound_graphics_2d() const;
+  PPB_Graphics2D_Impl* bound_graphics_2d() const;
 
   // Get the bound graphics context as a concrete 3D graphics context or returns
   // null if the context is not 3D.
-  Graphics3D* bound_graphics_3d() const;
+  PPB_Graphics3D_Impl* bound_graphics_3d() const;
 
   PluginDelegate* delegate_;
   scoped_refptr<PluginModule> module_;
@@ -266,7 +267,7 @@
 
   // The plugin-provided interfaces.
   const PPP_Find_Dev* plugin_find_interface_;
-  const PPP_Private* plugin_private_interface_;
+  const PPP_Pdf* plugin_pdf_interface_;
   const PPP_Selection_Dev* plugin_selection_interface_;
   const PPP_Zoom_Dev* plugin_zoom_interface_;
 
@@ -277,7 +278,7 @@
   // On the Mac, when we draw the bitmap to the PDFContext, it seems necessary
   // to keep the pixels valid until CGContextEndPage is called. We use this
   // variable to hold on to the pixels.
-  scoped_refptr<ImageData> last_printed_page_;
+  scoped_refptr<PPB_ImageData_Impl> last_printed_page_;
 #elif defined(OS_LINUX)
   // On Linux, we always send all pages from the renderer to the browser.
   // So, if the plugin supports printPagesAsPDF we print the entire output
@@ -313,6 +314,7 @@
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_INSTANCE_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_INSTANCE_H_