Don't fade in overlay scrollbar when user interacting the content under scrollbar.

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 3052 matching lines @@
         host_impl_->active_tree()->LayerById(400);
 
     EffectNode* active_tree_node =
         host_impl_->active_tree()->property_trees()->effect_tree.Node(
             active_scrollbar_layer->effect_tree_index());
     EXPECT_FLOAT_EQ(active_scrollbar_layer->Opacity(),
                     active_tree_node->opacity);
 
     if (expecting_animations) {
       host_impl_->ScrollbarAnimationControllerForElementId(scroll->element_id())
-          ->DidMouseMove(gfx::PointF(0, 90));
+          ->DidMouseMove(gfx::PointF(0, 90), false);
     } else {
       EXPECT_EQ(nullptr, host_impl_->ScrollbarAnimationControllerForElementId(
                              scroll->element_id()));
     }
     host_impl_->ScrollBegin(BeginState(gfx::Point()).get(),
                             InputHandler::WHEEL);
     host_impl_->ScrollBy(UpdateState(gfx::Point(), gfx::Vector2dF(0, 5)).get());
     host_impl_->ScrollEnd(EndState().get());
     host_impl_->CreatePendingTree();
     // To test the case where the effect tree index of scrollbar layer changes,
@@ skipping 84 matching lines @@
     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 fade
   // in task. Execute it to fade in the scrollbars.
   {
     animation_task_ = base::Closure();
-    scrollbar_controller->DidMouseMove(gfx::PointF(90, 0));
+    scrollbar_controller->DidMouseMove(gfx::PointF(90, 0), false);
     ASSERT_FALSE(animation_task_.Equals(base::Closure()));
     ASSERT_FALSE(animation_task_.IsCancelled());
   }
 
   // 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());
@@ skipping 227 matching lines @@
       host_impl_->ScrollbarAnimationControllerForElementId(
           root_scroll->element_id());
 
   const float kMouseMoveDistanceToTriggerFadeIn =
       ScrollbarAnimationController::kMouseMoveDistanceToTriggerFadeIn;
 
   const float kMouseMoveDistanceToTriggerExpand =
       SingleScrollbarAnimationControllerThinning::
           kMouseMoveDistanceToTriggerExpand;
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 1));
+  host_impl_->MouseMoveAt(gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 1),
+                          false);
   EXPECT_FALSE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand - 1, 10));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand - 1, 10), false);
   EXPECT_TRUE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 100));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 100), false);
   EXPECT_FALSE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   did_request_redraw_ = false;
   EXPECT_FALSE(
       scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 10));
+  host_impl_->MouseMoveAt(gfx::Point(10, 10), false);
   EXPECT_TRUE(
       scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 0));
+  host_impl_->MouseMoveAt(gfx::Point(10, 0), false);
   EXPECT_TRUE(
       scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(150, 120));
+  host_impl_->MouseMoveAt(gfx::Point(150, 120), false);
   EXPECT_FALSE(
       scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf1) {
   SetupMouseMoveAtWithDeviceScale(1.f);
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf2) {
   SetupMouseMoveAtWithDeviceScale(2.f);
@@ skipping 8792 matching lines @@
 
   const float kMouseMoveDistanceToTriggerFadeIn =
       ScrollbarAnimationController::kMouseMoveDistanceToTriggerFadeIn;
 
   const float kMouseMoveDistanceToTriggerExpand =
       SingleScrollbarAnimationControllerThinning::
           kMouseMoveDistanceToTriggerExpand;
 
   // Mouse moves close to the scrollbar, goes over the scrollbar, and
   // moves back to where it was.
-  host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0));
+  host_impl_->MouseMoveAt(gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0),
+                          false);
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand, 0));
+  host_impl_->MouseMoveAt(gfx::Point(15 + kMouseMoveDistanceToTriggerExpand, 0),
+                          false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
+  host_impl_->MouseMoveAt(gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0),
+                          false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(gfx::Point(10, 0));
+  host_impl_->MouseMoveAt(gfx::Point(10, 0), false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
+  host_impl_->MouseMoveAt(gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0),
+                          false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand, 0));
+  host_impl_->MouseMoveAt(gfx::Point(15 + kMouseMoveDistanceToTriggerExpand, 0),
+                          false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
-  host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0));
+  host_impl_->MouseMoveAt(gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0),
+                          false);
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
   // scrollbar_2 on child.
   std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar_2 =
       SolidColorScrollbarLayerImpl::Create(host_impl_->active_tree(),
@@ skipping 28 matching lines @@
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
   host_impl_->active_tree()->UpdateScrollbarGeometries();
   host_impl_->active_tree()->DidBecomeActive();
 
   ScrollbarAnimationController* scrollbar_2_animation_controller =
       host_impl_->ScrollbarAnimationControllerForElementId(child_element_id);
   EXPECT_TRUE(scrollbar_2_animation_controller);
 
   // Mouse goes over scrollbar_2, moves close to scrollbar_2, moves close to
   // scrollbar_1, goes over scrollbar_1.
-  host_impl_->MouseMoveAt(gfx::Point(60, 60));
+  host_impl_->MouseMoveAt(gfx::Point(60, 60), false);
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   EXPECT_TRUE(scrollbar_2_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_TRUE(
       scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
   host_impl_->MouseMoveAt(
-      gfx::Point(64 + kMouseMoveDistanceToTriggerExpand, 50));
+      gfx::Point(64 + kMouseMoveDistanceToTriggerExpand, 50), false);
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   EXPECT_TRUE(scrollbar_2_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
-  host_impl_->MouseMoveAt(
-      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
+  host_impl_->MouseMoveAt(gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0),
+                          false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 0));
+  host_impl_->MouseMoveAt(gfx::Point(10, 0), false);
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_TRUE(
       scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 
   // Capture scrollbar_1, then move mouse to scrollbar_2's layer, should post an
   // event to fade out scrollbar_1.
   scrollbar_1_animation_controller->DidScrollUpdate();
   animation_task_ = base::Closure();
 
   host_impl_->MouseDown();
-  host_impl_->MouseMoveAt(gfx::Point(60, 50));
+  host_impl_->MouseMoveAt(gfx::Point(60, 50), false);
   host_impl_->MouseUp();
 
   EXPECT_FALSE(animation_task_.Equals(base::Closure()));
 
   // Near scrollbar_1, then mouse down and up, should not post an event to fade
   // out scrollbar_1.
-  host_impl_->MouseMoveAt(gfx::Point(40, 150));
+  host_impl_->MouseMoveAt(gfx::Point(40, 150), false);
   animation_task_ = base::Closure();
 
   host_impl_->MouseDown();
   host_impl_->MouseUp();
   EXPECT_TRUE(animation_task_.Equals(base::Closure()));
 
   // Near scrollbar_1, then mouse down and unregister
   // scrollbar_2_animation_controller, then mouse up should not cause crash.
-  host_impl_->MouseMoveAt(gfx::Point(40, 150));
+  host_impl_->MouseMoveAt(gfx::Point(40, 150), false);
   host_impl_->MouseDown();
   host_impl_->UnregisterScrollbarAnimationController(root_scroll->element_id());
   host_impl_->MouseUp();
 }
 
 TEST_F(LayerTreeHostImplTest,
        LayerTreeHostImplTestScrollbarStatesInMainThreadScrolling) {
   SetupMouseMoveAtTestScrollbarStates(true);
 }
 
@@ skipping 216 matching lines @@
   // layer should be prioritized over the hidden layer.
   hidden_layer->set_contributes_to_drawn_render_surface(false);
   hidden_layer->set_raster_even_if_not_drawn(true);
   queue = host_impl_->BuildRasterQueue(TreePriority::SMOOTHNESS_TAKES_PRIORITY,
                                        RasterTilePriorityQueue::Type::ALL);
   EXPECT_EQ(queue->Top().tile()->layer_id(), 3);
 }
 
 }  // namespace
 }  // namespace cc