aura: Fix popup window positioning.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
@@ skipping 155 matching lines @@
     RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
   popup_parent_host_view_ =
       static_cast<RenderWidgetHostViewAura*>(parent_host_view);
   popup_parent_host_view_->popup_child_host_view_ = this;
   window_->SetType(aura::client::WINDOW_TYPE_MENU);
   window_->Init(ui::Layer::LAYER_TEXTURED);
   window_->SetName("RenderWidgetHostViewAura");
 
   window_->SetParent(NULL);
+  SetBounds(pos);
   Show();
-
-  // |pos| is in root window coordinates. So convert it to
-  // |popup_parent_host_view_|'s coordinates first.
-  gfx::Point origin = pos.origin();
-  aura::Window::ConvertPointToWindow(
-      window_->GetRootWindow(),
-      popup_parent_host_view_->window_, &origin);
-  SetBounds(gfx::Rect(origin, pos.size()));
 }
 
 void RenderWidgetHostViewAura::InitAsFullscreen(
     RenderWidgetHostView* reference_host_view) {
   is_fullscreen_ = true;
   window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window_->Init(ui::Layer::LAYER_TEXTURED);
   window_->SetName("RenderWidgetHostViewAura");
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   window_->SetParent(NULL);
@@ skipping 11 matching lines @@
 
 void RenderWidgetHostViewAura::WasHidden() {
   host_->WasHidden();
 }
 
 void RenderWidgetHostViewAura::SetSize(const gfx::Size& size) {
   SetBounds(gfx::Rect(window_->bounds().origin(), size));
 }
 
 void RenderWidgetHostViewAura::SetBounds(const gfx::Rect& rect) {
-  gfx::Rect adjusted_rect = rect;
-
-  if (popup_parent_host_view_) {
-    gfx::Point translated_origin = adjusted_rect.origin();
-    // |rect| is relative to |popup_parent_host_view_|; translate it for the
-    // window's container.
-    aura::Window::ConvertPointToWindow(
-        popup_parent_host_view_->window_,
-        window_->parent(),
-        &translated_origin);
-    adjusted_rect.set_origin(translated_origin);
-  }
-
-  window_->SetBounds(adjusted_rect);
+  window_->SetBounds(rect);
   host_->WasResized();
 }
 
 gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const {
   return window_;
 }
 
 gfx::NativeViewId RenderWidgetHostViewAura::GetNativeViewId() const {
   return static_cast<gfx::NativeViewId>(NULL);
 }
@@ skipping 850 matching lines @@
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }