exo: Fix widget positioning for pop-ups

components/exo/shell_surface_unittest.cc

 // Copyright 2015 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 "ash/aura/wm_window_aura.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 426 matching lines @@
   EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 
   // Only SetSystemModal changes modality.
   shell_surface->SetSystemModal(true);
   EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 
   shell_surface->SetSystemModal(false);
   EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 }
 
+TEST_F(ShellSurfaceTest, PopupWindow) {
+  Surface parent_surface;
+  ShellSurface parent(&parent_surface);
+  const gfx::Rect parent_bounds(100, 100, 300, 300);
+
+  Buffer parent_buffer(
+      exo_test_helper()->CreateGpuMemoryBuffer(parent_bounds.size()));
+  parent_surface.Attach(&parent_buffer);
+  parent_surface.Commit();
+
+  parent.GetWidget()->SetBounds(parent_bounds);
+
+  Display display;
+  Surface popup_surface;
+  const gfx::Rect popup_bounds(10, 10, 100, 100);
+  std::unique_ptr<ShellSurface> popup = display.CreatePopupShellSurface(
+      &popup_surface, &parent, popup_bounds.origin());
+
+  Buffer popup_buffer(
+      exo_test_helper()->CreateGpuMemoryBuffer(popup_bounds.size()));
+  popup_surface.Attach(&popup_buffer);
+  popup_surface.Commit();
+
+  // Popup bounds are relative to parent.
+  EXPECT_EQ(gfx::Rect(parent_bounds.origin() + popup_bounds.OffsetFromOrigin(),
+                      popup_bounds.size()),
+            popup->GetWidget()->GetWindowBoundsInScreen());
+
+  const gfx::Rect geometry(5, 5, 90, 90);
+  popup->SetGeometry(geometry);
+  popup_surface.Commit();
+
+  // Popup position is fixed, and geometry is relative to it.
+  EXPECT_EQ(gfx::Rect(parent_bounds.origin() +
+                      popup_bounds.OffsetFromOrigin() +
+                      geometry.OffsetFromOrigin(),
+                      geometry.size()),
+            popup->GetWidget()->GetWindowBoundsInScreen());
+}
+
 TEST_F(ShellSurfaceTest, Shadow) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(
       new ShellSurface(surface.get(), nullptr, gfx::Rect(), true,
                        ash::kShellWindowId_DefaultContainer));
   surface->Commit();
 
   aura::Window* window = shell_surface->GetWidget()->GetNativeWindow();
 
   // 1) Initial state, no shadow.
@@ skipping 308 matching lines @@
   shell_surface.OnAccessibilityModeChanged();
   shell_surface2.OnAccessibilityModeChanged();
 
   EXPECT_TRUE(shell_surface.shadow_underlay()->IsVisible());
   EXPECT_EQ(shadow_bounds, shell_surface.shadow_underlay()->bounds());
   EXPECT_EQ(shadow_bounds, shell_surface2.shadow_underlay()->bounds());
 }
 
 }  // namespace
 }  // namespace exo