[merge to 73] wm: Introduce Hide/HideAndMinimize without animations.

Hide and HideAndMinimize without animations by using
ScopedAnimationDisabler is used in a couple places already, but if we
minimize or hide, the gpu memory usage for overview/alt tab is super
high. Introduce two new functions which in addition to minimizing
without animations, recreates the layers.

This fixes the issue, but i think is a workaround, so we need to
investigate further.

[email protected]

(cherry picked from commit 73adf74)

Test: manual
Bug: 924802
Change-Id: Ida56a2b77cdd6d68a14e54d520ef890f3f541f34
Reviewed-on: https://chromium-review.googlesource.com/c/1437618
Reviewed-by: Mitsuru Oshima <[email protected]>
Commit-Queue: Sammie Quon <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#626703}
Reviewed-on: https://chromium-review.googlesource.com/c/1443969
Reviewed-by: Sammie Quon <[email protected]>
Cr-Commit-Position: refs/branch-heads/3683@{#49}
Cr-Branched-From: e510299-refs/heads/master@{#625896}

Author: sammiequon71

ash/app_list/home_launcher_gesture_handler.cc

@@ -466,24 +466,16 @@ void HomeLauncherGestureHandler::OnImplicitAnimationsCompleted() {
     window2_->ResetOpacityAndTransform();
 
   if (is_final_state_show) {
-    ScopedAnimationDisabler disable(GetWindow1());
-    GetWindow1()->Hide();
-    wm::GetWindowState(GetWindow1())->Minimize();
+    wm::HideAndMinimizeWithoutAnimation(GetWindow1());
 
-    if (window2_) {
-      ScopedAnimationDisabler disable(GetWindow2());
-      GetWindow2()->Hide();
-      wm::GetWindowState(GetWindow2())->Minimize();
-    }
+    if (window2_)
+      wm::HideAndMinimizeWithoutAnimation(GetWindow2());
 
     // Minimize the hidden windows so they can be used normally with alt+tab
     // and overview. Minimize in reverse order to preserve mru ordering.
     std::reverse(hidden_windows_.begin(), hidden_windows_.end());
-    for (auto* window : hidden_windows_) {
-      ScopedAnimationDisabler disable(window);
-      window->Hide();
-      wm::GetWindowState(window)->Minimize();
-    }
+    for (auto* window : hidden_windows_)
+      wm::HideAndMinimizeWithoutAnimation(window);
   } else {
     // Reshow all windows previously hidden.
     for (auto* window : hidden_windows_) {
@@ -820,8 +812,7 @@ bool HomeLauncherGestureHandler::SetUpWindows(Mode mode, aura::Window* window) {
       if (window->IsVisible()) {
         hidden_windows_.push_back(window);
         window->AddObserver(this);
-        ScopedAnimationDisabler disable(window);
-        window->Hide();
+        wm::HideWithoutAnimation(window);
       }
     }
   }

ash/wm/overview/overview_controller.cc

@@ -335,10 +335,7 @@ bool OverviewController::ToggleOverview(
       for (aura::Window* window : windows) {
         if (wm::GetWindowState(window)->IsMinimized())
           continue;
-
-        ScopedAnimationDisabler disable(window);
-        window->Hide();
-        wm::GetWindowState(window)->Minimize();
+        wm::HideAndMinimizeWithoutAnimation(window);
       }
     }
 

ash/wm/window_util.cc

@@ -10,13 +10,13 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
+#include "ash/scoped_animation_disabler.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/widget_finder.h"
 #include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
 #include "ash/ws/window_service_owner.h"
@@ -30,6 +30,7 @@
 #include "ui/aura/window_targeter.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/compositor/layer_tree_owner.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
@@ -38,6 +39,7 @@
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
+#include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_properties.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
@@ -310,5 +312,22 @@ void RemoveTransientDescendants(std::vector<aura::Window*>* out_window_list) {
   }
 }
 
+void HideAndMinimizeWithoutAnimation(aura::Window* window) {
+  // Disable the animations using |disable|. However, doing so will skip
+  // detaching and recreating layers that animating does which has memory
+  // implications, so use recreate layers to get the same effect. See
+  // crbug.com/924802.
+  ScopedAnimationDisabler disable(window);
+  window->Hide();
+  wm::GetWindowState(window)->Minimize();
+  std::unique_ptr<ui::LayerTreeOwner> owner = ::wm::RecreateLayers(window);
+}
+
+void HideWithoutAnimation(aura::Window* window) {
+  ScopedAnimationDisabler disable(window);
+  window->Hide();
+  std::unique_ptr<ui::LayerTreeOwner> owner = ::wm::RecreateLayers(window);
+}
+
 }  // namespace wm
 }  // namespace ash

ash/wm/window_util.h

@@ -116,6 +116,11 @@ ASH_EXPORT bool ShouldExcludeForOverview(const aura::Window* window);
 ASH_EXPORT void RemoveTransientDescendants(
     std::vector<aura::Window*>* out_window_list);
 
+// Minimizes or hides |window| without any animations, in case users what it to
+// hide right away or apply their own animations.
+ASH_EXPORT void HideAndMinimizeWithoutAnimation(aura::Window* window);
+ASH_EXPORT void HideWithoutAnimation(aura::Window* window);
+
 }  // namespace wm
 }  // namespace ash