Reverting dfisher changes 133386 and 13381

TBR=darin



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

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

1 files changed, 9 insertions, 8 deletions

diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h
index 6653e28..ed38375 100644
--- a/webkit/glue/webwidget.h
+++ b/webkit/glue/webwidget.h
@@ -8,10 +8,13 @@
 #include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webtextdirection.h"
 
+namespace gfx {
+class Rect;
+class Size;
+}
+
 namespace WebKit {
 class WebInputEvent;
-struct WebRect;
-struct WebSize;
 }
 
 class WebWidgetDelegate;
@@ -30,10 +33,10 @@ class WebWidget {
   virtual void Close() = 0;
 
   // Called to resize the WebWidget.
-  virtual void Resize(const WebKit::WebSize& new_size) = 0;
+  virtual void Resize(const gfx::Size& new_size) = 0;
 
   // Returns the current size of the WebWidget.
-  virtual WebKit::WebSize GetSize() = 0;
+  virtual gfx::Size GetSize() = 0;
 
   // Called to layout the WebWidget.  This MUST be called before Paint, and it
   // may result in calls to WebWidgetDelegate::DidInvalidateRect.
@@ -44,8 +47,7 @@ class WebWidget {
   // multiple times once Layout has been called, assuming no other changes are
   // made to the WebWidget (e.g., once events are processed, it should be assumed
   // that another call to Layout is warranted before painting again).
-  virtual void Paint(skia::PlatformCanvas* canvas,
-                     const WebKit::WebRect& rect) = 0;
+  virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) = 0;
 
   // Called to inform the WebWidget of an input event.
   // Returns true if the event has been processed, false otherwise.
@@ -64,8 +66,7 @@ class WebWidget {
                                  const std::wstring& ime_string) = 0;
 
   // Retrieve the status of this widget required by IME APIs.
-  virtual bool ImeUpdateStatus(bool* enable_ime,
-                               WebKit::WebRect* caret_rect) = 0;
+  virtual bool ImeUpdateStatus(bool* enable_ime, gfx::Rect* caret_rect) = 0;
 
   // Changes the text direction of the selected input node.
   virtual void SetTextDirection(WebTextDirection direction) = 0;