Move the WebPluginResourceClient interface to its own header. Also fix up method order in webplugin_proxy.h and change WebKit::WebCanvas usage to SkCanvas.

R=tburkard@chromium.org

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

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

2 files changed, 24 insertions, 38 deletions

diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 21c995f..af574e4 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -11,6 +11,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/webplugin_delegate_impl.h"
+#include "content/child/npapi/webplugin_resource_client.h"
 #include "content/child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index eeec5dd..d1899f5 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -52,16 +52,12 @@ class WebPluginProxy : public WebPlugin {
 
   // WebPlugin overrides
   virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE;
-
-  // Whether input events should be sent to the delegate.
   virtual void SetAcceptsInputEvents(bool accepts) OVERRIDE;
-
   virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE;
 #if defined(OS_WIN)
   void SetWindowlessData(HANDLE pump_messages_event,
                          gfx::NativeViewId dummy_activation_window);
 #endif
-
   virtual void CancelResource(unsigned long id) OVERRIDE;
   virtual void Invalidate() OVERRIDE;
   virtual void InvalidateRect(const gfx::Rect& rect) OVERRIDE;
@@ -74,30 +70,6 @@ class WebPluginProxy : public WebPlugin {
                          const std::string& cookie) OVERRIDE;
   virtual std::string GetCookies(const GURL& url,
                                  const GURL& first_party_for_cookies) OVERRIDE;
-
-  // class-specific methods
-
-  // Returns a WebPluginResourceClient object given its id, or NULL if no
-  // object with that id exists.
-  WebPluginResourceClient* GetResourceClient(int id);
-
-  // Returns the id of the renderer that contains this plugin.
-  int GetRendererId();
-
-  // Returns the id of the associated render view.
-  int host_render_view_routing_id() const {
-    return host_render_view_routing_id_;
-  }
-
-  // For windowless plugins, paints the given rectangle into the local buffer.
-  void Paint(const gfx::Rect& rect);
-
-  // Callback from the renderer to let us know that a paint occurred.
-  void DidPaint();
-
-  // Notification received on a plugin issued resource request creation.
-  void OnResourceCreated(int resource_id, WebPluginResourceClient* client);
-
   virtual void HandleURLRequest(const char* url,
                                 const char* method,
                                 const char* target,
@@ -125,24 +97,37 @@ class WebPluginProxy : public WebPlugin {
   virtual void StartIme() OVERRIDE;
   virtual WebPluginAcceleratedSurface*
       GetAcceleratedSurface(gfx::GpuPreference gpu_preference) OVERRIDE;
-
-  //----------------------------------------------------------------------
-  // Accelerated plugin implementation which renders via the compositor.
-
-  // Tells the renderer, and from there the GPU process, that the plugin
-  // is using accelerated rather than software rendering.
   virtual void AcceleratedPluginEnabledRendering() OVERRIDE;
-
-  // Tells the renderer, and from there the GPU process, that the plugin
-  // allocated the given IOSurface to be used as its backing store.
   virtual void AcceleratedPluginAllocatedIOSurface(int32 width,
                                                    int32 height,
                                                    uint32 surface_id) OVERRIDE;
   virtual void AcceleratedPluginSwappedIOSurface() OVERRIDE;
 #endif
-
   virtual void URLRedirectResponse(bool allow, int resource_id) OVERRIDE;
 
+  // class-specific methods
+
+  // Returns a WebPluginResourceClient object given its id, or NULL if no
+  // object with that id exists.
+  WebPluginResourceClient* GetResourceClient(int id);
+
+  // Returns the id of the renderer that contains this plugin.
+  int GetRendererId();
+
+  // Returns the id of the associated render view.
+  int host_render_view_routing_id() const {
+    return host_render_view_routing_id_;
+  }
+
+  // For windowless plugins, paints the given rectangle into the local buffer.
+  void Paint(const gfx::Rect& rect);
+
+  // Callback from the renderer to let us know that a paint occurred.
+  void DidPaint();
+
+  // Notification received on a plugin issued resource request creation.
+  void OnResourceCreated(int resource_id, WebPluginResourceClient* client);
+
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Retrieves the IME status from a windowless plug-in and sends it to a
   // renderer process. A renderer process will convert the coordinates from