Fix VK animation related issues

chrome/browser/ui/ash/ash_keyboard_controller_proxy_unittest.cc

 // Copyright 2014 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 "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/keyboard/keyboard_controller.h"
 
 namespace {
 
+// Keep in sync with the one in ash_keyboard_controller_proxy.cc
+const float kAnimationStartOrAfterHideOpacity = 0.2f;
+
 // Steps a layer animation until it is completed. Animations must be enabled.
 void RunAnimationForLayer(ui::Layer* layer) {
   // Animations must be enabled for stepping to work.
   ASSERT_NE(ui::ScopedAnimationDurationScaleMode::duration_scale_mode(),
             ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
 
   ui::LayerAnimatorTestController controller(layer->GetAnimator());
   gfx::AnimationContainerElement* element = layer->GetAnimator();
   // Multiple steps are required to complete complex animations.
   // TODO(vollick): This should not be necessary. crbug.com/154017
@@ skipping 95 matching lines @@
   aura::Window* keyboard_container(controller()->GetContainerWindow());
   ui::Layer* layer = keyboard_container->layer();
 
   EXPECT_FALSE(keyboard_container->IsVisible());
   ShowKeyboard(keyboard_container);
 
   // Keyboard container and window should immediately become visible before
   // animation starts.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_TRUE(proxy()->GetKeyboardWindow()->IsVisible());
-  EXPECT_EQ(0.0, layer->opacity());
+  EXPECT_EQ(kAnimationStartOrAfterHideOpacity, layer->opacity());

[kevers, 2014/01/14 19:08:43]

Equality test on a floating point value seems susceptible to flakiness.

[bshe, 2014/01/15 19:28:13]

talked offline. Please see my latest patch.

On 2014/01/14 19:08:43, kevers wrote:

   gfx::Transform transform;
   transform.Translate(0, proxy()->GetKeyboardWindow()->bounds().height());
   EXPECT_EQ(transform, layer->transform());
 
   RunAnimationForLayer(layer);
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_TRUE(proxy()->GetKeyboardWindow()->IsVisible());
   EXPECT_EQ(1.0, layer->opacity());
   EXPECT_EQ(gfx::Transform(), layer->transform());
 
   HideKeyboard(keyboard_container);
-  // Keyboard container and window should be visible before hide animation
-  // finishes.
-  EXPECT_TRUE(keyboard_container->IsVisible());
+  // Keyboard container window is not visible but its layer should keep visible
+  // until hide animation finishes. Otherwise, user can not see hide animation.
+  EXPECT_FALSE(keyboard_container->IsVisible());
+  EXPECT_TRUE(keyboard_container->layer()->visible());
   EXPECT_TRUE(proxy()->GetKeyboardWindow()->IsVisible());
 
   RunAnimationForLayer(layer);
   EXPECT_FALSE(keyboard_container->IsVisible());
+  EXPECT_FALSE(keyboard_container->layer()->visible());
   EXPECT_FALSE(proxy()->GetKeyboardWindow()->IsVisible());
-  EXPECT_EQ(0.0, layer->opacity());
+  EXPECT_EQ(kAnimationStartOrAfterHideOpacity, layer->opacity());
   EXPECT_EQ(transform, layer->transform());
 }
+
+TEST_F(AshKeyboardControllerProxyTest, VirtualKeyboardContainerShowWhileHide) {
+  // We cannot short-circuit animations for this test.
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
+
+  aura::Window* keyboard_container(controller()->GetContainerWindow());
+  ui::Layer* layer = keyboard_container->layer();
+
+  EXPECT_FALSE(keyboard_container->IsVisible());
+  ShowKeyboard(keyboard_container);
+  RunAnimationForLayer(layer);
+
+  HideKeyboard(keyboard_container);
+
+  // Before hide animation finishes, show keyboard again.
+  ShowKeyboard(keyboard_container);
+  RunAnimationForLayer(layer);
+  EXPECT_TRUE(keyboard_container->IsVisible());
+  EXPECT_TRUE(proxy()->GetKeyboardWindow()->IsVisible());
+  EXPECT_EQ(1.0, layer->opacity());
+  EXPECT_EQ(gfx::Transform(), layer->transform());
+}