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/webframe.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'webkit/glue/webframe.h') diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index 97559b6..9c36c95 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -19,12 +19,15 @@ class WebView; class WebTextInput; struct NPObject; +namespace gfx { +class Rect; +class Size; +} + namespace WebKit { struct WebConsoleMessage; struct WebFindOptions; -struct WebRect; struct WebScriptSource; -struct WebSize; } // Every frame in a web page is represented by one WebFrame, including the @@ -220,7 +223,7 @@ class WebFrame { const string16& search_text, const WebKit::WebFindOptions& options, bool wrap_within_frame, - WebKit::WebRect* selection_rect) = 0; + gfx::Rect* selection_rect) = 0; // Notifies the frame that we are no longer interested in searching. This will // abort any asynchronous scoping effort already under way (see the function @@ -256,7 +259,7 @@ class WebFrame { // Notifies the webview-delegate about a new selection rect. This will result // in the browser getting notified. For more information see WebViewDelegate. - virtual void ReportFindInPageSelection(const WebKit::WebRect& selection_rect, + virtual void ReportFindInPageSelection(const gfx::Rect& selection_rect, int active_match_ordinal, int request_id) = 0; @@ -361,7 +364,7 @@ class WebFrame { virtual void ClosePage() = 0; // The current scroll offset from the top of frame in pixels. - virtual WebKit::WebSize ScrollOffset() const = 0; + virtual gfx::Size ScrollOffset() const = 0; // Reformats the web frame for printing. |page_size_px| is the page size in // pixels. @@ -369,7 +372,7 @@ class WebFrame { // |page_count| is the number of printed pages. // Returns false if it fails. It'll fail if the main frame failed to load but // will succeed even if a child frame failed to load. - virtual bool BeginPrint(const WebKit::WebSize& page_size_px, + virtual bool BeginPrint(const gfx::Size& page_size_px, int* page_count) = 0; // Prints one page. |page| is 0-based. -- cgit v1.1