Move the WebPluginResourceClient interface to its own header. Also fix up method order in webplugin…

content/plugin/webplugin_proxy.h

 // 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.
 
 #ifndef CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
@@ skipping 34 matching lines @@
   WebPluginProxy(PluginChannel* channel,
                  int route_id,
                  const GURL& page_url,
                  int host_render_view_routing_id);
   virtual ~WebPluginProxy();
 
   void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
 
   // 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;
   virtual NPObject* GetWindowScriptNPObject() OVERRIDE;
   virtual NPObject* GetPluginElement() OVERRIDE;
   virtual bool FindProxyForUrl(const GURL& url,
                                std::string* proxy_list) OVERRIDE;
   virtual void SetCookie(const GURL& url,
                          const GURL& first_party_for_cookies,
                          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,
                                 const char* buf,
                                 unsigned int len,
                                 int notify_id,
                                 bool popups_allowed,
                                 bool notify_redirects) OVERRIDE;
   void UpdateGeometry(const gfx::Rect& window_rect,
                       const gfx::Rect& clip_rect,
                       const TransportDIB::Handle& windowless_buffer0,
                       const TransportDIB::Handle& windowless_buffer1,
                       int windowless_buffer_index);
   virtual void CancelDocumentLoad() OVERRIDE;
   virtual void InitiateHTTPRangeRequest(
       const char* url, const char* range_info, int range_request_id) OVERRIDE;
   virtual void SetDeferResourceLoading(unsigned long resource_id,
                                        bool defer) OVERRIDE;
   virtual bool IsOffTheRecord() OVERRIDE;
   virtual void ResourceClientDeleted(
       WebPluginResourceClient* resource_client) OVERRIDE;
 
 #if defined(OS_MACOSX)
   virtual void FocusChanged(bool focused) OVERRIDE;
   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;
 
-  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
   // local to the window coordinates and send the converted coordinates to a
   // browser process.
   void UpdateIMEStatus();
 #endif
 
  private:
@@ skipping 96 matching lines @@
 
   // Contains the routing id of the host render view.
   int host_render_view_routing_id_;
 
   base::WeakPtrFactory<WebPluginProxy> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_