Eliminate remaining WebCore dependencies from webplugin_impl.cc...

chrome/renderer/render_widget.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_RENDERER_RENDER_WIDGET_H_
 #define CHROME_RENDERER_RENDER_WIDGET_H_
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/renderer/render_process.h"
 #include "ipc/ipc_channel.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/api/public/WebCompositionCommand.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebTextDirection.h"
 #include "webkit/api/public/WebWidgetClient.h"
 #include "webkit/glue/webcursor.h"
 
 class RenderThreadBase;
 struct ViewHostMsg_ShowPopup_Params;
-struct WebPluginGeometry;
 
 namespace WebKit {
 struct WebPopupMenuInfo;
 }
 
+namespace webkit_glue {
+struct WebPluginGeometry;
+}
+
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class RenderWidget : public IPC::Channel::Listener,
                      public IPC::Message::Sender,
                      virtual public WebKit::WebWidgetClient,
                      public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside. The render_thread is any
   // RenderThreadBase implementation, mostly commonly RenderThread::current().
@@ skipping 33 matching lines @@
   virtual void show(WebKit::WebNavigationPolicy);
   virtual void runModal() {}
   virtual WebKit::WebRect windowRect();
   virtual void setWindowRect(const WebKit::WebRect&);
   virtual WebKit::WebRect windowResizerRect();
   virtual WebKit::WebRect rootWindowRect();
   virtual WebKit::WebScreenInfo screenInfo();
 
   // Called when a plugin is moved.  These events are queued up and sent with
   // the next paint or scroll message to the host.
-  void SchedulePluginMove(const WebPluginGeometry& move);
+  void SchedulePluginMove(const webkit_glue::WebPluginGeometry& move);
 
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
   void CleanupWindowInPluginMoves(gfx::PluginWindowHandle window);
 
   // Invalidates entire widget rect to generate a full repaint.
   void GenerateFullRepaint();
 
   // Close the underlying WebWidget.
   void Close();
@@ skipping 192 matching lines @@
   int ime_control_x_;
   int ime_control_y_;
   bool ime_control_new_state_;
   bool ime_control_updated_;
   bool ime_control_busy_;
 
   // Whether the window for this RenderWidget can be activated.
   bool activatable_;
 
   // Holds all the needed plugin window moves for a scroll.
-  typedef std::vector<WebPluginGeometry> WebPluginGeometryVector;
+  typedef std::vector<webkit_glue::WebPluginGeometry> WebPluginGeometryVector;
   WebPluginGeometryVector plugin_window_moves_;
 
   // A custom background for the widget.
   SkBitmap background_;
 
   // While we are waiting for the browser to update window sizes,
   // we track the pending size temporarily.
   int pending_window_rect_count_;
   WebKit::WebRect pending_window_rect_;
 
   scoped_ptr<ViewHostMsg_ShowPopup_Params> popup_params_;
 
   scoped_ptr<IPC::Message> pending_input_event_ack_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H_