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

ash/common/wm/overview/scoped_transform_overview_window.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/scoped_transform_overview_window.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 325 matching lines @@
     if (window != window_ && window->GetType() != ui::wm::WINDOW_TYPE_NORMAL &&
         window->GetType() != ui::wm::WINDOW_TYPE_PANEL) {
       continue;
     }
     bounds.Union(
         window->GetParent()->ConvertRectToScreen(window->GetTargetBounds()));
   }
   return bounds;
 }
 
+gfx::Rect ScopedTransformOverviewWindow::GetTransformedBounds(
+    bool hide_header) const {
+  const bool material = ash::MaterialDesignController::IsOverviewMaterial();
+  int top_inset = hide_header ? GetTopInset() : 0;

[tdanderson, 2016/07/29 20:20:02]

nit: const

[varkha, 2016/07/29 20:45:12]

Done.

+  gfx::Rect bounds;
+  for (auto* window : GetTransientTreeIterator(window_)) {
+    // Ignore other window types when computing bounding box of window
+    // selector target item.
+    if (window != window_ &&
+        (!material || (window->GetType() != ui::wm::WINDOW_TYPE_NORMAL &&
+                       window->GetType() != ui::wm::WINDOW_TYPE_PANEL))) {
+      continue;
+    }
+    gfx::RectF window_bounds(window->GetTargetBounds());
+    gfx::Transform new_transform =
+        TransformAboutPivot(gfx::Point(window_bounds.x(), window_bounds.y()),
+                            window->GetTargetTransform());
+    new_transform.TransformRect(&window_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 (material && top_inset > 0) {
+      gfx::RectF header_bounds(window_bounds);
+      header_bounds.set_height(top_inset);
+      new_transform.TransformRect(&header_bounds);
+      window_bounds.Inset(0, gfx::ToCeiledInt(header_bounds.height()), 0, 0);
+    }
+    bounds.Union(window->GetParent()->ConvertRectToScreen(
+        ToEnclosingRect(window_bounds)));
+  }
+  return bounds;
+}
+
+int ScopedTransformOverviewWindow::GetTopInset() const {
+  for (auto* window : GetTransientTreeIterator(window_)) {
+    // Ignore other window types when computing bounding box of window
+    // selector target item.

[tdanderson, 2016/07/29 20:20:02]

Did you mean to have this comment here? I think something like "// Return 0
if..." would be more helpful.

[varkha, 2016/07/29 20:45:12]

Done.

+    if (window == window_ || (window->GetType() != ui::wm::WINDOW_TYPE_NORMAL &&

[tdanderson, 2016/07/29 20:20:02]

Perhaps restructure as this instead:

for (...) {
  if (!...)  // negation of the current boolean expression
    return 0;
}

and/or consider moving this expression to a helper function which can also be
called at lines 354-356.

[varkha, 2016/07/29 20:45:12]

Done.

+                              window->GetType() != ui::wm::WINDOW_TYPE_PANEL)) {
+      continue;
+    }
+    return 0;
+  }
+  return window_->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET);
+}
+
 void ScopedTransformOverviewWindow::ShowWindowIfMinimized() {
   if ((original_visibility_ == ORIGINALLY_MINIMIZED &&
        window_->GetShowState() == ui::SHOW_STATE_MINIMIZED) ||
       (original_visibility_ == ORIGINALLY_DOCKED_MINIMIZED &&
        window_->GetWindowState()->GetStateType() ==
            wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED)) {
     window_->Show();
   }
 }
 
@@ skipping 76 matching lines @@
       mask_->layer()->SetFillsBoundsOpaquely(false);
       window()->GetLayer()->SetMaskLayer(mask_->layer());
     }
     if (!determined_original_window_shape_) {
       determined_original_window_shape_ = true;
       SkRegion* window_shape = window()->GetLayer()->alpha_shape();
       if (!original_window_shape_ && window_shape)
         original_window_shape_.reset(new SkRegion(*window_shape));
     }
     gfx::Rect bounds(GetTargetBoundsInScreen().size());
-    const int inset =
-        (use_mask || use_shape)
-            ? window()->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET)
-            : 0;
+    const int inset = (use_mask || use_shape) ? GetTopInset() : 0;
     if (mask_) {
       // Mask layer is used both to hide the window header and to use rounded
       // corners. Its layout needs to be update when setting a transform.
       mask_->layer()->SetBounds(bounds);
       mask_->set_inset(inset);
       mask_->set_radius(radius);
       window()->GetLayer()->SchedulePaint(bounds);
     } else if (inset > 0) {
       // Alpha shape is only used to to hide the window header and only when
       // not using a mask layer.
@@ skipping 51 matching lines @@
   if (parent_window)
     parent_window->CloseWidget();
 }
 
 // static
 void ScopedTransformOverviewWindow::SetImmediateCloseForTests() {
   immediate_close_for_tests = true;
 }
 
 }  // namespace ash