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

6 files changed, 56 insertions, 35 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9cebf46..186d3bb 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -51,7 +51,9 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.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/WebScriptSource.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
@@ -90,6 +92,7 @@ using base::TimeDelta;
 using webkit_glue::WebAccessibility;
 using WebKit::WebConsoleMessage;
 using WebKit::WebDragData;
+using WebKit::WebRect;
 using WebKit::WebScriptSource;
 
 //-----------------------------------------------------------------------------
@@ -762,7 +765,7 @@ bool RenderView::CaptureThumbnail(WebFrame* frame,
     }
   }
 
-  score->at_top = (frame->ScrollOffset().height() == 0);
+  score->at_top = (frame->ScrollOffset().height == 0);
 
   SkBitmap subset;
   device->accessBitmap(false).extractSubset(&subset, src_rect);
@@ -2153,7 +2156,7 @@ void RenderView::OnFind(int request_id,
   // frame, so we check here if we only have main_frame in the chain.
   bool wrap_within_frame = !multi_frame;
 
-  gfx::Rect selection_rect;
+  WebRect selection_rect;
   bool result = false;
 
   do {
@@ -2262,7 +2265,7 @@ void RenderView::ReportFindInPageMatchCount(int count, int request_id,
         routing_id_,
         request_id,
         count,
-        gfx::Rect(0, 0, 0, 0),
+        gfx::Rect(),
         -1,  // Don't update active match ordinal.
         final_update);
     queued_find_reply_message_.reset(msg);
@@ -2272,7 +2275,7 @@ void RenderView::ReportFindInPageMatchCount(int count, int request_id,
         routing_id_,
         request_id,
         count,
-        gfx::Rect(0, 0, 0, 0),
+        gfx::Rect(),
         -1,  // // Don't update active match ordinal.
         final_update));
   }
@@ -2280,7 +2283,7 @@ void RenderView::ReportFindInPageMatchCount(int count, int request_id,
 
 void RenderView::ReportFindInPageSelection(int request_id,
                                            int active_match_ordinal,
-                                           const gfx::Rect& selection_rect) {
+                                           const WebRect& selection_rect) {
   // Send the search result over to the browser process.
   Send(new ViewHostMsg_Find_Reply(routing_id_,
                                   request_id,
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 6dd2871..a587ecc 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -307,7 +307,7 @@ class RenderView : public RenderWidget,
                                           bool final_update);
   virtual void ReportFindInPageSelection(int request_id,
                                          int active_match_ordinal,
-                                         const gfx::Rect& selection_rect);
+                                         const WebKit::WebRect& selection);
   virtual bool WasOpenedByUserGesture(WebView* webview) const;
   virtual void SpellCheck(const std::wstring& word, int& misspell_location,
                           int& misspell_length);
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 81421d1..ba82739 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -14,7 +14,9 @@
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/render_process.h"
 #include "skia/ext/platform_canvas.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 
 #if defined(OS_POSIX)
 #include "skia/include/SkPixelRef.h"
@@ -25,7 +27,9 @@
 #include "webkit/glue/webwidget.h"
 
 using WebKit::WebInputEvent;
+using WebKit::WebRect;
 using WebKit::WebScreenInfo;
+using WebKit::WebSize;
 
 RenderWidget::RenderWidget(RenderThreadBase* render_thread, bool activatable)
     : routing_id_(MSG_ROUTING_NONE),
@@ -454,13 +458,13 @@ gfx::NativeViewId RenderWidget::GetContainingView(WebWidget* webwidget) {
 }
 
 void RenderWidget::DidInvalidateRect(WebWidget* webwidget,
-                                     const gfx::Rect& rect) {
+                                     const WebRect& rect) {
   // We only want one pending DoDeferredPaint call at any time...
   bool paint_pending = !paint_rect_.IsEmpty();
 
   // If this invalidate overlaps with a pending scroll, then we have to
   // downgrade to invalidating the scroll rect.
-  if (rect.Intersects(scroll_rect_)) {
+  if (gfx::Rect(rect).Intersects(scroll_rect_)) {
     paint_rect_ = paint_rect_.Union(scroll_rect_);
     scroll_rect_ = gfx::Rect();
   }
@@ -486,7 +490,7 @@ void RenderWidget::DidInvalidateRect(WebWidget* webwidget,
 }
 
 void RenderWidget::DidScrollRect(WebWidget* webwidget, int dx, int dy,
-                                 const gfx::Rect& clip_rect) {
+                                 const WebRect& clip_rect) {
   if (dx != 0 && dy != 0) {
     // We only support scrolling along one axis at a time.
     DidScrollRect(webwidget, 0, dy, clip_rect);
@@ -498,7 +502,7 @@ void RenderWidget::DidScrollRect(WebWidget* webwidget, int dx, int dy,
   // If we already have a pending scroll operation or if this scroll operation
   // intersects the existing paint region, then just failover to invalidating.
   if (!scroll_rect_.IsEmpty() || intersects_with_painting) {
-    if (!intersects_with_painting && scroll_rect_ == clip_rect) {
+    if (!intersects_with_painting && scroll_rect_ == gfx::Rect(clip_rect)) {
       // OK, we can just update the scroll delta (requires same scrolling axis)
       if (!dx && !scroll_delta_.x()) {
         scroll_delta_.set_y(scroll_delta_.y() + dy);
@@ -561,7 +565,7 @@ void RenderWidget::Show(WebWidget* webwidget,
 }
 
 void RenderWidget::ShowWithItems(WebWidget* webwidget,
-                                 const gfx::Rect& bounds,
+                                 const WebRect& bounds,
                                  int item_height,
                                  int selected_index,
                                  const std::vector<MenuItem>& items) {
@@ -598,11 +602,13 @@ void RenderWidget::Close() {
   }
 }
 
-void RenderWidget::GetWindowRect(WebWidget* webwidget, gfx::Rect* rect) {
-  Send(new ViewHostMsg_GetWindowRect(routing_id_, host_window_, rect));
+void RenderWidget::GetWindowRect(WebWidget* webwidget, WebRect* result) {
+  gfx::Rect rect;
+  Send(new ViewHostMsg_GetWindowRect(routing_id_, host_window_, &rect));
+  *result = rect;
 }
 
-void RenderWidget::SetWindowRect(WebWidget* webwidget, const gfx::Rect& pos) {
+void RenderWidget::SetWindowRect(WebWidget* webwidget, const WebRect& pos) {
   if (did_show_) {
     Send(new ViewHostMsg_RequestMove(routing_id_, pos));
   } else {
@@ -610,12 +616,14 @@ void RenderWidget::SetWindowRect(WebWidget* webwidget, const gfx::Rect& pos) {
   }
 }
 
-void RenderWidget::GetRootWindowRect(WebWidget* webwidget, gfx::Rect* rect) {
-  Send(new ViewHostMsg_GetRootWindowRect(routing_id_, host_window_, rect));
+void RenderWidget::GetRootWindowRect(WebWidget* webwidget, WebRect* result) {
+  gfx::Rect rect;
+  Send(new ViewHostMsg_GetRootWindowRect(routing_id_, host_window_, &rect));
+  *result = rect;
 }
 
 void RenderWidget::GetRootWindowResizerRect(WebWidget* webwidget,
-                                            gfx::Rect* rect) {
+                                            WebRect* rect) {
   *rect = resizer_rect_;
 }
 
@@ -694,7 +702,7 @@ void RenderWidget::UpdateIME() {
   // Retrieve the caret position from the focused widget and verify we should
   // enabled IMEs attached to the browser process.
   bool enable_ime = false;
-  gfx::Rect caret_rect;
+  WebRect caret_rect;
   if (!webwidget_ ||
       !webwidget_->ImeUpdateStatus(&enable_ime, &caret_rect)) {
     // There are not any editable widgets attached to this process.
@@ -740,8 +748,8 @@ void RenderWidget::UpdateIME() {
     // The input focus is not changed.
     // Notify the caret position to a browser process only if it is changed.
     if (ime_control_enable_ime_) {
-      if (caret_rect.x() != ime_control_x_ ||
-          caret_rect.y() != ime_control_y_) {
+      if (caret_rect.x != ime_control_x_ ||
+          caret_rect.y != ime_control_y_) {
         Send(new ViewHostMsg_ImeUpdateStatus(routing_id(), IME_MOVE_WINDOWS,
                                              caret_rect));
       }
@@ -750,8 +758,8 @@ void RenderWidget::UpdateIME() {
   // Save the updated IME status to prevent from sending the same IPC messages.
   ime_control_updated_ = false;
   ime_control_enable_ime_ = ime_control_new_state_;
-  ime_control_x_ = caret_rect.x();
-  ime_control_y_ = caret_rect.y();
+  ime_control_x_ = caret_rect.x;
+  ime_control_y_ = caret_rect.y;
 }
 
 void RenderWidget::DidMove(WebWidget* webwidget,
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 84eb9b2..32c2405 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -65,23 +65,26 @@ class RenderWidget : public IPC::Channel::Listener,
 
   // WebWidgetDelegate
   virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
-  virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
+  virtual void DidInvalidateRect(WebWidget* webwidget,
+                                 const WebKit::WebRect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
-                             const gfx::Rect& clip_rect);
+                             const WebKit::WebRect& clip_rect);
   virtual void SetCursor(WebWidget* webwidget, const WebCursor& cursor);
   virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition);
   virtual void ShowWithItems(WebWidget* webwidget,
-                             const gfx::Rect& bounds,
+                             const WebKit::WebRect& bounds,
                              int item_height,
                              int selected_index,
                              const std::vector<MenuItem>& items);
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
-  virtual void GetWindowRect(WebWidget* webwidget, gfx::Rect* rect);
-  virtual void SetWindowRect(WebWidget* webwidget, const gfx::Rect& rect);
-  virtual void GetRootWindowRect(WebWidget* webwidget, gfx::Rect* rect);
-  virtual void GetRootWindowResizerRect(WebWidget* webwidget, gfx::Rect* rect);
+  virtual void GetWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
+  virtual void SetWindowRect(WebWidget* webwidget,
+                             const WebKit::WebRect& rect);
+  virtual void GetRootWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
+  virtual void GetRootWindowResizerRect(WebWidget* webwidget,
+                                        WebKit::WebRect* rect);
   virtual void DidMove(WebWidget* webwidget, const WebPluginGeometry& move);
   virtual void RunModal(WebWidget* webwidget) {}
   virtual bool IsHidden(WebWidget* webwidget) { return is_hidden_; }
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc
index 6c30e25..5a0f1c2 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.cc
+++ b/chrome/renderer/webmediaplayer_delegate_impl.cc
@@ -2,11 +2,12 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
+#include "chrome/renderer/webmediaplayer_delegate_impl.h"
+
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/media/data_source_impl.h"
 #include "chrome/renderer/media/video_renderer_impl.h"
 #include "chrome/renderer/render_view.h"
-#include "chrome/renderer/webmediaplayer_delegate_impl.h"
 #include "googleurl/src/gurl.h"
 #if defined(OS_WIN)
 // FFmpeg is not ready for Linux and Mac yet.
@@ -14,6 +15,11 @@
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
+#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
+
+using WebKit::WebRect;
+using WebKit::WebSize;
 
 /////////////////////////////////////////////////////////////////////////////
 // Task to be posted on main thread that fire WebMediaPlayer methods.
@@ -270,17 +276,17 @@ int64 WebMediaPlayerDelegateImpl::GetTotalBytes() const {
   return pipeline_.GetTotalBytes();
 }
 
-void WebMediaPlayerDelegateImpl::SetSize(const gfx::Size& size) {
+void WebMediaPlayerDelegateImpl::SetSize(const WebSize& size) {
   DCHECK(main_loop_ && MessageLoop::current() == main_loop_);
 
   if (video_renderer_) {
     // TODO(scherkus): Change API to use SetSize().
-    video_renderer_->SetRect(gfx::Rect(0, 0, size.width(), size.height()));
+    video_renderer_->SetRect(gfx::Rect(0, 0, size.width, size.height));
   }
 }
 
 void WebMediaPlayerDelegateImpl::Paint(skia::PlatformCanvas *canvas,
-                                       const gfx::Rect& rect) {
+                                       const WebRect& rect) {
   if (video_renderer_) {
     video_renderer_->Paint(canvas, rect);
   }
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.h b/chrome/renderer/webmediaplayer_delegate_impl.h
index 1f0c726..fc976bf 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.h
+++ b/chrome/renderer/webmediaplayer_delegate_impl.h
@@ -89,9 +89,10 @@ class WebMediaPlayerDelegateImpl : public webkit_glue::WebMediaPlayerDelegate,
   virtual bool IsTotalBytesKnown();
 
   // Methods for painting.
-  virtual void SetSize(const gfx::Size& size);
+  virtual void SetSize(const WebKit::WebSize& size);
 
-  virtual void Paint(skia::PlatformCanvas *canvas, const gfx::Rect& rect);
+  virtual void Paint(skia::PlatformCanvas *canvas,
+                     const WebKit::WebRect& rect);
 
   // True if a video is loaded.
   virtual bool IsVideo() const;