Switch to using WebPoint, WebRect, and WebSize in more of the glue

layer interface.  This will help when we move those interfaces into
the WebKit API.

This is a second attempt at r13381, which was already reviewed here:
http://codereview.chromium.org/63126

The only change between that CL and this one is in render_view.h, where I
needed to change a parameter type from gfx::Rect to WebRect.

TBR=dglazkov

Review URL: http://codereview.chromium.org/64005

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

1 files changed, 14 insertions, 11 deletions

diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 5cf6cfe..548952b 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -9,8 +9,9 @@
 #include "base/compiler_specific.h"
 #include "base/ref_counted.h"
 #include "base/gfx/native_widget_types.h"
-#include "base/gfx/point.h"
-#include "base/gfx/size.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "webkit/glue/webwidget.h"
 
 #include "FramelessScrollViewClient.h"
@@ -40,10 +41,11 @@ class WebWidgetImpl : public WebWidget,
  public:
   // WebWidget
   virtual void Close();
-  virtual void Resize(const gfx::Size& new_size);
-  virtual gfx::Size GetSize() { return size(); }
+  virtual void Resize(const WebKit::WebSize& new_size);
+  virtual WebKit::WebSize GetSize() { return size(); }
   virtual void Layout();
-  virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect);
+  virtual void Paint(skia::PlatformCanvas* canvas,
+                     const WebKit::WebRect& rect);
   virtual bool HandleInputEvent(const WebKit::WebInputEvent* input_event);
   virtual void MouseCaptureLost();
   virtual void SetFocus(bool enable);
@@ -53,18 +55,19 @@ class WebWidgetImpl : public WebWidget,
                                  int target_end,
                                  const std::wstring& ime_string);
   virtual bool ImeUpdateStatus(bool* enable_ime,
-                               gfx::Rect* caret_rect);
+                               WebKit::WebRect* caret_rect);
   virtual void SetTextDirection(WebTextDirection direction);
 
   // WebWidgetImpl
-  void Init(WebCore::FramelessScrollView* widget, const gfx::Rect& bounds);
+  void Init(WebCore::FramelessScrollView* widget,
+            const WebKit::WebRect& bounds);
   void InitWithItems(WebCore::FramelessScrollView* widget,
-                     const gfx::Rect& bounds,
+                     const WebKit::WebRect& bounds,
                      int item_height,
                      int selected_index,
                      const std::vector<MenuItem>& items);
 
-  const gfx::Size& size() const { return size_; }
+  const WebKit::WebSize& size() const { return size_; }
 
   WebWidgetDelegate* delegate() {
     return delegate_;
@@ -111,9 +114,9 @@ class WebWidgetImpl : public WebWidget,
 #endif
 
   WebWidgetDelegate* delegate_;
-  gfx::Size size_;
+  WebKit::WebSize size_;
 
-  gfx::Point last_mouse_position_;
+  WebKit::WebPoint last_mouse_position_;
 
   // This is a non-owning ref.  The popup will notify us via popupClosed()
   // before it is destroyed.