Fix ChromeClientImpl::windowRect() to return the current

window's rect. Previously, it was combining the window
origin with the size of the renderer; not the size of the
window.

BUG=1186573

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

2 files changed, 3 insertions, 5 deletions

diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 749fd8c..3f5d6c5 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -652,10 +652,8 @@ void RenderWidget::Close() {
   }
 }
 
-void RenderWidget::GetWindowLocation(WebWidget* webwidget, gfx::Point* origin) {
-  gfx::Rect rect;
-  Send(new ViewHostMsg_GetWindowRect(routing_id_, host_window_, &rect));
-  *origin = rect.origin();
+void RenderWidget::GetWindowRect(WebWidget* webwidget, gfx::Rect* rect) {
+  Send(new ViewHostMsg_GetWindowRect(routing_id_, host_window_, rect));
 }
 
 void RenderWidget::SetWindowRect(WebWidget* webwidget, const gfx::Rect& pos) {
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index adb1033..4207c53 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -90,7 +90,7 @@ class RenderWidget : public IPC::Channel::Listener,
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
-  virtual void GetWindowLocation(WebWidget* webwidget, gfx::Point* origin);
+  virtual void GetWindowRect(WebWidget* webwidget, gfx::Rect* rect);
   virtual void SetWindowRect(WebWidget* webwidget, const gfx::Rect& rect);
   virtual void DidMove(WebWidget* webwidget, const WebPluginGeometry& move);
   virtual void RunModal(WebWidget* webwidget) {}