[ash-md] Properly scales windows with transient parents in overview

ash/common/wm/overview/window_selector_item.cc

 // Copyright 2013 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/common/wm/overview/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 83 matching lines @@
 // Opacity for fading out during closing a window.
 static const float kClosingItemOpacity = 0.8f;
 
 // Duration of background opacity transition for the selected label.
 static const int kSelectorFadeInMilliseconds = 350;
 
 // Before closing a window animate both the window and the caption to shrink by
 // this fraction of size.
 static const float kPreCloseScale = 0.02f;
 
-// Calculates the |window| bounds after being transformed to the selector's
-// space. The returned Rect is in virtual screen coordinates.
-gfx::Rect GetTransformedBounds(WmWindow* window, bool hide_header) {
-  gfx::RectF bounds(
-      window->GetRootWindow()->ConvertRectToScreen(window->GetTargetBounds()));
-  gfx::Transform new_transform = TransformAboutPivot(
-      gfx::Point(bounds.x(), bounds.y()), window->GetTargetTransform());
-  new_transform.TransformRect(&bounds);
-
-  // With Material Design the preview title is shown above the preview window.
-  // Hide the window header for apps or browser windows with no tabs (web apps)
-  // to avoid showing both the window header and the preview title.
-  if (ash::MaterialDesignController::IsOverviewMaterial() && hide_header) {
-    gfx::RectF header_bounds(bounds);
-    header_bounds.set_height(
-        window->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET));
-    new_transform.TransformRect(&header_bounds);
-    bounds.Inset(0, gfx::ToCeiledInt(header_bounds.height()), 0, 0);
-  }
-  return ToEnclosingRect(bounds);
-}
-
 // Convenience method to fade in a Window with predefined animation settings.
 // Note: The fade in animation will occur after a delay where the delay is how
 // long the lay out animations take.
 void SetupFadeInAfterLayout(views::Widget* widget) {
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget);
   window->SetOpacity(0.0f);
   std::unique_ptr<ScopedOverviewAnimationSettings>
       scoped_overview_animation_settings =
           ScopedOverviewAnimationSettingsFactory::Get()
               ->CreateOverviewAnimationSettings(
@@ skipping 299 matching lines @@
 
 void WindowSelectorItem::OnWindowTitleChanged(WmWindow* window) {
   // TODO(flackr): Maybe add the new title to a vector of titles so that we can
   // filter any of the titles the window had while in the overview session.
   window_label_button_view_->SetText(window->GetTitle());
   UpdateCloseButtonAccessibilityName();
 }
 
 float WindowSelectorItem::GetItemScale(const gfx::Size& size) {
   gfx::Size inset_size(size.width(), size.height() - 2 * kWindowMarginMD);
-  const int header_inset =
-      hide_header()
-          ? GetWindow()->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET)
-          : 0;
   return ScopedTransformOverviewWindow::GetItemScale(
-      GetWindow()->GetTargetBounds().size(), inset_size, header_inset,
+      transform_window_.GetTargetBoundsInScreen().size(), inset_size,
+      hide_header() ? transform_window_.GetTopInset() : 0,
       close_button_->GetPreferredSize().height());
 }
 
+gfx::Rect WindowSelectorItem::GetTargetBoundsInScreen() const {
+  return transform_window_.GetTargetBoundsInScreen();
+}
+
 void WindowSelectorItem::SetItemBounds(const gfx::Rect& target_bounds,
                                        OverviewAnimationType animation_type) {
   DCHECK(root_window_ == GetWindow()->GetRootWindow());
   gfx::Rect screen_rect = transform_window_.GetTargetBoundsInScreen();
 
   // Avoid division by zero by ensuring screen bounds is not empty.
   gfx::Size screen_size(screen_rect.size());
   screen_size.SetToMax(gfx::Size(1, 1));
   screen_rect.set_size(screen_size);
 
   int top_view_inset = 0;
   int title_height = 0;
   if (ash::MaterialDesignController::IsOverviewMaterial()) {
-    if (hide_header()) {
-      top_view_inset =
-          GetWindow()->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET);
-    }
+    if (hide_header())
+      top_view_inset = transform_window_.GetTopInset();
     title_height = close_button_->GetPreferredSize().height();
   }
   gfx::Rect selector_item_bounds =
       ScopedTransformOverviewWindow::ShrinkRectToFitPreservingAspectRatio(
           screen_rect, target_bounds, top_view_inset, title_height);
   gfx::Transform transform = ScopedTransformOverviewWindow::GetTransformForRect(
       screen_rect, selector_item_bounds);
   ScopedTransformOverviewWindow::ScopedAnimationSettings animation_settings;
   transform_window_.BeginScopedAnimation(animation_type, &animation_settings);
   // Rounded corners are achieved by using a mask layer on the original window
@@ skipping 86 matching lines @@
     // Indicate that the label will be drawn onto a transparent background
     // (disables subpixel antialiasing).
     window_label_button_view_->SetBackgroundColorHint(SK_ColorTRANSPARENT);
     window_label_->SetContentsView(window_label_button_view_);
   }
 }
 
 void WindowSelectorItem::UpdateHeaderLayout(
     OverviewAnimationType animation_type) {
   gfx::Rect transformed_window_bounds = root_window_->ConvertRectFromScreen(
-      GetTransformedBounds(GetWindow(), hide_header()));
+      transform_window_.GetTransformedBounds(hide_header()));
 
   if (ash::MaterialDesignController::IsOverviewMaterial()) {
     gfx::Rect label_rect(close_button_->GetPreferredSize());
     label_rect.set_y(-label_rect.height());
     label_rect.set_width(transformed_window_bounds.width());
 
     if (!window_label_button_view_->visible()) {
       window_label_button_view_->SetVisible(true);
       SetupFadeInAfterLayout(window_label_.get());
       SetupFadeInAfterLayout(window_label_selector_.get());
@@ skipping 68 matching lines @@
   window_label_selector_window->SetOpacity(opacity);
 }
 
 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() {
   close_button_->SetAccessibleName(l10n_util::GetStringFUTF16(
       IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME,
       GetWindow()->GetTitle()));
 }
 
 }  // namespace ash