change overlay scrollbar hover show to hover fade in

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 2852 matching lines @@
     DrawFrame();
 
     // SetScrollInfo will initialize the scrollbar which will cause it to
     // show and request a redraw.
     did_request_redraw_ = false;
   }
 
   void RunTest(LayerTreeSettings::ScrollbarAnimator animator) {
     LayerTreeSettings settings = DefaultSettings();
     settings.scrollbar_animator = animator;
-    settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
     settings.scrollbar_fade_out_resize_delay =
         base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_out_duration =
-        base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
 
     // If no animator is set, scrollbar won't show and no animation is expected.
     bool expecting_animations = animator != LayerTreeSettings::NO_ANIMATOR;
 
     SetupLayers(settings);
 
     base::TimeTicks fake_now = base::TimeTicks::Now();
 
     if (expecting_animations) {
       // A task will be posted to fade the initial scrollbar.
@@ skipping 198 matching lines @@
 
 TEST_F(LayerTreeHostImplTestScrollbarAnimation, NoAnimator) {
   RunTest(LayerTreeSettings::NO_ANIMATOR);
 }
 
 class LayerTreeHostImplTestScrollbarOpacity : public LayerTreeHostImplTest {
  protected:
   void RunTest(LayerTreeSettings::ScrollbarAnimator animator) {
     LayerTreeSettings settings = DefaultSettings();
     settings.scrollbar_animator = animator;
-    settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_out_duration =
-        base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
     gfx::Size content_size(100, 100);
 
     // If no animator is set, scrollbar won't show and no animation is expected.
     bool expecting_animations = animator != LayerTreeSettings::NO_ANIMATOR;
 
     CreateHostImpl(settings, CreateCompositorFrameSink());
     host_impl_->CreatePendingTree();
     CreateScrollAndContentsLayers(host_impl_->pending_tree(), content_size);
     std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar =
         SolidColorScrollbarLayerImpl::Create(host_impl_->pending_tree(), 400,
@@ skipping 75 matching lines @@
   RunTest(LayerTreeSettings::AURA_OVERLAY);
 }
 
 TEST_F(LayerTreeHostImplTestScrollbarOpacity, NoAnimator) {
   RunTest(LayerTreeSettings::NO_ANIMATOR);
 }
 
 TEST_F(LayerTreeHostImplTest, ScrollbarVisibilityChangeCausesRedrawAndCommit) {
   LayerTreeSettings settings = DefaultSettings();
   settings.scrollbar_animator = LayerTreeSettings::AURA_OVERLAY;
-  settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(20);
-  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
-  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
   gfx::Size content_size(100, 100);
 
   CreateHostImpl(settings, CreateCompositorFrameSink());
   host_impl_->CreatePendingTree();
   CreateScrollAndContentsLayers(host_impl_->pending_tree(), content_size);
   std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar =
       SolidColorScrollbarLayerImpl::Create(host_impl_->pending_tree(), 400,
                                            VERTICAL, 10, 0, false, true);
   scrollbar->test_properties()->opacity = 0.f;
   LayerImpl* scroll = host_impl_->pending_tree()->OuterViewportScrollLayer();
@@ skipping 11 matching lines @@
 
   // Scrollbars will flash shown but we should have a fade out animation
   // queued. Run it and fade out the scrollbars.
   {
     ASSERT_FALSE(animation_task_.Equals(base::Closure()));
     ASSERT_FALSE(animation_task_.IsCancelled());
     animation_task_.Run();
 
     base::TimeTicks fake_now = base::TimeTicks::Now();
     scrollbar_controller->Animate(fake_now);
-    fake_now += settings.scrollbar_fade_out_delay;
+    fake_now += settings.scrollbar_fade_delay;
     scrollbar_controller->Animate(fake_now);
 
     ASSERT_TRUE(scrollbar_controller->ScrollbarsHidden());
   }
 
-  // Move the mouse over the scrollbar region. This should post a delayed show
-  // task. Execute it to show the scrollbars.
+  // Move the mouse over the scrollbar region. This should post a delayed fade
+  // in task. Execute it to show the scrollbars.
   {
     animation_task_ = base::Closure();
     scrollbar_controller->DidMouseMoveNear(VERTICAL, 0);
     ASSERT_FALSE(animation_task_.Equals(base::Closure()));
     ASSERT_FALSE(animation_task_.IsCancelled());
   }
 
-  // The show task should cause the scrollbars to show. Ensure that we
+  // The fade in task should cause the scrollbars to show. Ensure that we
   // requested a redraw and a commit.
   {
     did_request_redraw_ = false;
     did_request_commit_ = false;
     ASSERT_TRUE(scrollbar_controller->ScrollbarsHidden());
     animation_task_.Run();
+
+    base::TimeTicks fake_now = base::TimeTicks::Now();
+    scrollbar_controller->Animate(fake_now);
+    fake_now += settings.scrollbar_fade_duration;
+    scrollbar_controller->Animate(fake_now);
+
     ASSERT_FALSE(scrollbar_controller->ScrollbarsHidden());
     EXPECT_TRUE(did_request_redraw_);
     EXPECT_TRUE(did_request_commit_);
   }
 }
 
 TEST_F(LayerTreeHostImplTest, ScrollbarInnerLargerThanOuter) {
   LayerTreeSettings settings = DefaultSettings();
   CreateHostImpl(settings, CreateCompositorFrameSink());
 
@@ skipping 23 matching lines @@
   child->SetBounds(inner_viewport_size);
 
   horiz_scrollbar->SetScrollInfo(root_scroll->id(), root_scroll->element_id());
 
   EXPECT_EQ(300, horiz_scrollbar->clip_layer_length());
 }
 
 TEST_F(LayerTreeHostImplTest, ScrollbarRegistration) {
   LayerTreeSettings settings = DefaultSettings();
   settings.scrollbar_animator = LayerTreeSettings::ANDROID_OVERLAY;
-  settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(20);
-  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
-  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
   CreateHostImpl(settings, CreateCompositorFrameSink());
 
   gfx::Size viewport_size(300, 200);
   gfx::Size content_size(1000, 1000);
 
   const int vert_1_id = 10;
   const int horiz_1_id = 11;
   const int vert_2_id = 12;
   const int horiz_2_id = 13;
   const int child_clip_id = 14;
@@ skipping 107 matching lines @@
   host_impl_->active_tree()->InnerViewportScrollLayer()->SetCurrentScrollOffset(
       gfx::ScrollOffset(20, 20));
   EXPECT_TRUE(animation_task_.Equals(base::Closure()));
   child_ptr->SetCurrentScrollOffset(gfx::ScrollOffset(20, 20));
   EXPECT_TRUE(animation_task_.Equals(base::Closure()));
 }
 
 void LayerTreeHostImplTest::SetupMouseMoveAtWithDeviceScale(
     float device_scale_factor) {
   LayerTreeSettings settings = DefaultSettings();
-  settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(300);
+  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
   settings.scrollbar_animator = LayerTreeSettings::AURA_OVERLAY;
 
   gfx::Size viewport_size(300, 200);
   gfx::Size device_viewport_size =
       gfx::ScaleToFlooredSize(viewport_size, device_scale_factor);
   gfx::Size content_size(1000, 1000);
   gfx::Size scrollbar_size(gfx::Size(15, viewport_size.height()));
 
   CreateHostImpl(settings, CreateCompositorFrameSink());
   host_impl_->active_tree()->SetDeviceScaleFactor(device_scale_factor);
@@ skipping 8606 matching lines @@
 
   // Re-initialize with a software output surface.
   compositor_frame_sink_ = FakeCompositorFrameSink::CreateSoftware();
   host_impl_->InitializeRenderer(compositor_frame_sink_.get());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
 }
 
 void LayerTreeHostImplTest::SetupMouseMoveAtTestScrollbarStates(
     bool main_thread_scrolling) {
   LayerTreeSettings settings = DefaultSettings();
-  settings.scrollbar_show_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(300);
+  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
   settings.scrollbar_animator = LayerTreeSettings::AURA_OVERLAY;
 
   gfx::Size viewport_size(300, 200);
   gfx::Size content_size(1000, 1000);
   gfx::Size child_layer_size(250, 150);
   gfx::Size scrollbar_size_1(gfx::Size(15, viewport_size.height()));
   gfx::Size scrollbar_size_2(gfx::Size(15, child_layer_size.height()));
 
   const int scrollbar_1_id = 10;
   const int scrollbar_2_id = 11;
@@ skipping 250 matching lines @@
     else
       EXPECT_FALSE(tile->HasRasterTask());
   }
   Region expected_invalidation(
       raster_source->GetRectForImage(checkerable_image->uniqueID()));
   EXPECT_EQ(expected_invalidation, *(root->GetPendingInvalidation()));
 }
 
 }  // namespace
 }  // namespace cc