From eb6439387ab5035450035d606f6ff32319c13789 Mon Sep 17 00:00:00 2001 From: "cpu@google.com" Date: Wed, 8 Apr 2009 23:16:24 +0000 Subject: 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 --- webkit/glue/webview_impl.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'webkit/glue/webview_impl.h') diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index f29c0cc..e52a8d2 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/gfx/point.h" +#include "base/gfx/size.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" -#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "webkit/glue/back_forward_list_client_impl.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webpreferences.h" @@ -63,10 +63,10 @@ class WebViewImpl : public WebView, public base::RefCounted { virtual WebFrame* GetFrameWithName(const std::wstring& name); virtual WebFrame* GetPreviousFrameBefore(WebFrame* frame, bool wrap); virtual WebFrame* GetNextFrameAfter(WebFrame* frame, bool wrap); - virtual void Resize(const WebKit::WebSize& new_size); - virtual WebKit::WebSize GetSize() { return size(); } + virtual void Resize(const gfx::Size& new_size); + virtual gfx::Size GetSize() { return size(); } virtual void Layout(); - virtual void Paint(skia::PlatformCanvas* canvas, const WebKit::WebRect& rect); + virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect); virtual bool HandleInputEvent(const WebKit::WebInputEvent* input_event); virtual void MouseCaptureLost(); virtual void SetFocus(bool enable); @@ -77,7 +77,7 @@ class WebViewImpl : public WebView, public base::RefCounted { int target_end, const std::wstring& ime_string); virtual bool ImeUpdateStatus(bool* enable_ime, - WebKit::WebRect* caret_rect); + gfx::Rect* caret_rect); virtual void SetTextDirection(WebTextDirection direction); virtual void StopLoading(); virtual void SetBackForwardListSize(int size); @@ -125,9 +125,9 @@ class WebViewImpl : public WebView, public base::RefCounted { // WebViewImpl - const WebKit::WebSize& size() const { return size_; } + const gfx::Size& size() const { return size_; } - const WebKit::WebPoint& last_mouse_down_point() const { + const gfx::Point& last_mouse_down_point() const { return last_mouse_down_point_; } @@ -236,9 +236,9 @@ class WebViewImpl : public WebView, public base::RefCounted { SearchableFormData* CreateSearchableFormDataForFocusedNode(); scoped_refptr delegate_; - WebKit::WebSize size_; + gfx::Size size_; - WebKit::WebPoint last_mouse_position_; + gfx::Point last_mouse_position_; // Reference to the Frame that last had focus. This is set once when // we lose focus, and used when focus is gained to reinstall focus to // the correct element. @@ -301,7 +301,7 @@ class WebViewImpl : public WebView, public base::RefCounted { // mouse was at when the drag was initiated, only the current point, which // can be misleading as it is usually not over the element the user actually // dragged by the time a drag is initiated. - WebKit::WebPoint last_mouse_down_point_; + gfx::Point last_mouse_down_point_; // Keeps track of the current text zoom level. 0 means no zoom, positive // values mean larger text, negative numbers mean smaller. -- cgit v1.1