Eliminate remaining WebCore dependencies from webplugin_impl.cc...

chrome/plugin/webplugin_proxy.h

 // Copyright (c) 2009 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 CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 #define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 
 #include <string>
 
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #if defined(OS_MACOSX)
 #include "base/scoped_cftyperef.h"
 #endif
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "chrome/common/chrome_plugin_api.h"
 #include "chrome/common/transport_dib.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webplugin.h"
 
+class PluginChannel;
+
 namespace base {
 class WaitableEvent;
 }
 
-class PluginChannel;
+namespace webkit_glue {
 class WebPluginDelegate;
+}
 
 // This is an implementation of WebPlugin that proxies all calls to the
 // renderer.
-class WebPluginProxy : public WebPlugin {
+class WebPluginProxy : public webkit_glue::WebPlugin {
  public:
   // Creates a new proxy for WebPlugin, using the given sender to send the
   // marshalled WebPlugin calls.
   WebPluginProxy(PluginChannel* channel,
                  int route_id,
-                 WebPluginDelegate* delegate,
                  const GURL& page_url);
   ~WebPluginProxy();
 
+  void set_delegate(webkit_glue::WebPluginDelegate* d) { delegate_ = d; }
+
   // WebPlugin overrides
   void SetWindow(gfx::PluginWindowHandle window);
   void WillDestroyWindow(gfx::PluginWindowHandle window);
 #if defined(OS_WIN)
   void SetWindowlessPumpEvent(HANDLE pump_messages_event);
   // Returns true on success.
   bool SetModalDialogEvent(HANDLE modal_dialog_event);
 #endif
   void CancelResource(int id);
   void Invalidate();
@@ skipping 22 matching lines @@
   // Retrieves the browsing context associated with the renderer this plugin
   // is in.  Calling multiple times will return the same value.
   CPBrowsingContext GetCPBrowsingContext();
 
   // Retrieves the WebPluginProxy for the given context that was returned by
   // GetCPBrowsingContext, or NULL if not found.
   static WebPluginProxy* FromCPBrowsingContext(CPBrowsingContext context);
 
   // Returns a WebPluginResourceClient object given its id, or NULL if no
   // object with that id exists.
-  WebPluginResourceClient* GetResourceClient(int id);
+  webkit_glue::WebPluginResourceClient* GetResourceClient(int id);
 
   // Returns the process id of the renderer that contains this plugin.
   int GetRendererProcessId();
 
   // 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();
 
@@ skipping 18 matching lines @@
   void InitiateHTTPRangeRequest(const char* url,
                                 const char* range_info,
                                 intptr_t existing_stream,
                                 bool notify_needed,
                                 intptr_t notify_data);
 
   void SetDeferResourceLoading(int resource_id, bool defer);
 
   bool IsOffTheRecord();
 
-  void ResourceClientDeleted(WebPluginResourceClient* resource_client);
+  void ResourceClientDeleted(
+      webkit_glue::WebPluginResourceClient* resource_client);
 
   base::WaitableEvent* modal_dialog_event() {
     return modal_dialog_event_.get();
   }
 
  private:
   bool Send(IPC::Message* msg);
 
   // Handler for sending over the paint event to the plugin.
   void OnPaint(const gfx::Rect& damaged_rect);
 
   // Updates the shared memory section where windowless plugins paint.
   void SetWindowlessBuffer(const TransportDIB::Handle& windowless_buffer,
                            const TransportDIB::Handle& background_buffer);
 
 #if defined(OS_WIN)
   // Converts a shared memory section handle from the renderer process into a
   // bitmap and hdc that are mapped to this process.
   void ConvertBuffer(const base::SharedMemoryHandle& buffer,
                      ScopedHandle* shared_section,
                      ScopedBitmap* bitmap,
                      ScopedHDC* hdc);
 #endif
 
   // Called when a plugin's origin moves, so that we can update the world
   // transform of the local HDC.
   void UpdateTransform();
 
-  typedef base::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
+  typedef base::hash_map<int, webkit_glue::WebPluginResourceClient*>
+      ResourceClientMap;
   ResourceClientMap resource_clients_;
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
   uint32 cp_browsing_context_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
-  WebPluginDelegate* delegate_;
+  webkit_glue::WebPluginDelegate* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   scoped_ptr<base::WaitableEvent> modal_dialog_event_;
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
 #if defined(OS_WIN)
   // Variables used for desynchronized windowless plugin painting.  See note in
   // webplugin_delegate_proxy.h for how this works.
 
@@ skipping 15 matching lines @@
   scoped_ptr<TransportDIB> windowless_dib_;
   scoped_ptr<TransportDIB> background_dib_;
   scoped_ptr<skia::PlatformCanvas> windowless_canvas_;
   scoped_ptr<skia::PlatformCanvas> background_canvas_;
 #endif
 
   ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_;
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__