[merge-m69] MacViews: Don't animate in web-modals after the first Show().

Implement the currently unimplemented (on mac) NativeWidget::
SetVisibilityAnimationTransition() for this. Autofill uses this
but not constrained windows.

Constrained windows on aura platforms have bespoke animation
suppression code, which is currently different to the desired
behavior on Mac (i.e. the very first "show" should animate).

Consolidate some of the animation logic in MacViews Widgets.

[email protected]

(cherry picked from commit 7f4f6cf)

Bug: 767743
Change-Id: If49d139a66873e896e68030f69efdaa81a8dc948
Reviewed-on: https://chromium-review.googlesource.com/1146408
Reviewed-by: Michael Wasserman <[email protected]>
Reviewed-by: Sidney San Martín <[email protected]>
Commit-Queue: Trent Apted <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#577343}
Reviewed-on: https://chromium-review.googlesource.com/1150016
Reviewed-by: Trent Apted <[email protected]>
Cr-Commit-Position: refs/branch-heads/3497@{#94}
Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}

Author: tapted

components/constrained_window/native_web_contents_modal_dialog_manager_views.cc

@@ -106,6 +106,13 @@ void NativeWebContentsModalDialogManagerViews::Show() {
   // shadows are below the constrained dialog in z-order when we do this.
   shown_widgets_.insert(widget);
 #endif
+
+#if !defined(USE_AURA)
+  // Don't re-animate when switching tabs. Note this is done on Mac only after
+  // the initial ShowWidget() call above, and then "sticks" for later calls.
+  // TODO(tapted): Consolidate this codepath with Aura.
+  widget->SetVisibilityAnimationTransition(views::Widget::ANIMATE_HIDE);
+#endif
 }
 
 void NativeWebContentsModalDialogManagerViews::Hide() {

ui/views/cocoa/bridged_native_widget.h

@@ -213,8 +213,19 @@ class VIEWS_EXPORT BridgedNativeWidget
   bool wants_to_be_visible() const { return wants_to_be_visible_; }
   bool in_fullscreen_transition() const { return in_fullscreen_transition_; }
 
-  bool GetAnimate() const;
-  void SetAnimate(bool animate);
+  // Enables or disables all window animations.
+  void SetAnimationEnabled(bool animate);
+
+  // Sets which transitions will animate. Currently this only affects non-native
+  // animations. TODO(tapted): Use scoping to disable native animations at
+  // appropriate times as well.
+  void set_transitions_to_animate(int transitions) {
+    transitions_to_animate_ = transitions;
+  }
+
+  // Whether to run a custom animation for the provided |transition|.
+  bool ShouldRunCustomAnimationFor(
+      Widget::VisibilityTransition transition) const;
 
   // ui::CATransactionCoordinator::PreCommitObserver implementation
   bool ShouldWaitInPreCommit() override;
@@ -326,6 +337,10 @@ class VIEWS_EXPORT BridgedNativeWidget
   // window in AppKit coordinates is not actually changing in this case.
   gfx::Point last_window_frame_origin_;
 
+  // The transition types to animate when not relying on native NSWindow
+  // animation behaviors. Bitmask of Widget::VisibilityTransition.
+  int transitions_to_animate_ = Widget::ANIMATE_BOTH;
+
   // Whether this window wants to be fullscreen. If a fullscreen animation is in
   // progress then it might not be actually fullscreen.
   bool target_fullscreen_state_;

ui/views/cocoa/bridged_native_widget.mm

@@ -8,6 +8,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
@@ -21,6 +22,7 @@
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/layout.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/compositor/recyclable_compositor_mac.h"
 #include "ui/gfx/geometry/dip_util.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
@@ -527,7 +529,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
 
   // For non-sheet modal types, use the constrained window animations to make
   // the window appear.
-  if (GetAnimate() && native_widget_mac_->GetWidget()->IsModal()) {
+  if (ShouldRunCustomAnimationFor(Widget::ANIMATE_SHOW)) {
     show_animation_.reset(
         [[ModalShowAnimationWithLayer alloc] initWithBridgedNativeWidget:this]);
 
@@ -994,16 +996,31 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
   }
 }
 
-bool BridgedNativeWidget::GetAnimate() const {
-  return [window_ animationBehavior] != NSWindowAnimationBehaviorNone;
-}
-
-void BridgedNativeWidget::SetAnimate(bool animate) {
+void BridgedNativeWidget::SetAnimationEnabled(bool animate) {
   [window_
       setAnimationBehavior:(animate ? NSWindowAnimationBehaviorDocumentWindow
                                     : NSWindowAnimationBehaviorNone)];
 }
 
+bool BridgedNativeWidget::ShouldRunCustomAnimationFor(
+    Widget::VisibilityTransition transition) const {
+  // The logic around this needs to change if new transition types are set.
+  // E.g. it would be nice to distinguish "hide" from "close". Mac currently
+  // treats "hide" only as "close". Hide (e.g. Cmd+h) should not animate on Mac.
+  constexpr int kSupported =
+      Widget::ANIMATE_SHOW | Widget::ANIMATE_HIDE | Widget::ANIMATE_NONE;
+  DCHECK_EQ(0, transitions_to_animate_ & ~kSupported);
+
+  // Custom animations are only used for tab-modals. Note this also checks the
+  // native animation property. Clearing that will also disable custom
+  // animations to ensure that the views::Widget API behaves consistently.
+  return (transitions_to_animate_ & transition) &&
+         native_widget_mac_->GetWidget()->IsModal() &&
+         [window_ animationBehavior] != NSWindowAnimationBehaviorNone &&
+         !base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kDisableModalAnimations);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, ui::CATransactionObserver
 

ui/views/widget/native_widget_mac.mm

@@ -9,15 +9,13 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/crash/core/common/crash_key.h"
 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #import "ui/base/cocoa/window_size_constants.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/font_list.h"
@@ -50,11 +48,6 @@ + (void)closeWindowWithAnimation:(NSWindow*)window;
 namespace views {
 namespace {
 
-bool AreModalAnimationsEnabled() {
-  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableModalAnimations);
-}
-
 NSInteger StyleMaskForParams(const Widget::InitParams& params) {
   // If the Widget is modal, it will be displayed as a sheet. This works best if
   // it has NSTitledWindowMask. For example, with NSBorderlessWindowMask, the
@@ -402,8 +395,7 @@ NSInteger StyleMaskForParams(const Widget::InitParams& params) {
   }
 
   // For other modal types, animate the close.
-  if (bridge_->GetAnimate() && AreModalAnimationsEnabled() &&
-      delegate_->IsModal()) {
+  if (bridge_->ShouldRunCustomAnimationFor(Widget::ANIMATE_HIDE)) {
     [ViewsNSWindowCloseAnimator closeWindowWithAnimation:window];
     return;
   }
@@ -634,7 +626,7 @@ NSInteger StyleMaskForParams(const Widget::InitParams& params) {
 
 void NativeWidgetMac::SetVisibilityChangedAnimationsEnabled(bool value) {
   if (bridge_)
-    bridge_->SetAnimate(value);
+    bridge_->SetAnimationEnabled(value);
 }
 
 void NativeWidgetMac::SetVisibilityAnimationDuration(
@@ -644,7 +636,8 @@ NSInteger StyleMaskForParams(const Widget::InitParams& params) {
 
 void NativeWidgetMac::SetVisibilityAnimationTransition(
     Widget::VisibilityTransition transition) {
-  NOTIMPLEMENTED();
+  if (bridge_)
+    bridge_->set_transitions_to_animate(transition);
 }
 
 bool NativeWidgetMac::IsTranslucentWindowOpacitySupported() const {

ui/views/widget/native_widget_mac_unittest.mm

@@ -1218,12 +1218,24 @@ new ModalDialogDelegate(ui::MODAL_TYPE_CHILD), nullptr,
   retained_animation.reset();
 
   // Disable animations and show again.
-  modal_dialog_widget->SetVisibilityChangedAnimationsEnabled(false);
+  modal_dialog_widget->SetVisibilityAnimationTransition(Widget::ANIMATE_NONE);
   modal_dialog_widget->Show();
   EXPECT_FALSE(test_api.show_animation());  // No animation this time.
   modal_dialog_widget->Hide();
 
   // Test after re-enabling.
+  modal_dialog_widget->SetVisibilityAnimationTransition(Widget::ANIMATE_BOTH);
+  modal_dialog_widget->Show();
+  EXPECT_TRUE(test_api.show_animation());
+  retained_animation.reset(test_api.show_animation(),
+                           base::scoped_policy::RETAIN);
+
+  // Test whether disabling native animations also disables custom modal ones.
+  modal_dialog_widget->SetVisibilityChangedAnimationsEnabled(false);
+  modal_dialog_widget->Show();
+  EXPECT_FALSE(test_api.show_animation());  // No animation this time.
+  modal_dialog_widget->Hide();
+  // Renable.
   modal_dialog_widget->SetVisibilityChangedAnimationsEnabled(true);
   modal_dialog_widget->Show();
   EXPECT_TRUE(test_api.show_animation());