Overlay scrollbars expand only when mouse is near thumb

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 3153 matching lines @@
     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();
     LayerImpl* container =
         host_impl_->pending_tree()->InnerViewportContainerLayer();
     scrollbar->SetScrollElementId(scroll->element_id());
+    scrollbar->SetBounds(gfx::Size(10, 100));
+    scrollbar->SetPosition(gfx::PointF(90, 0));
     container->test_properties()->AddChild(std::move(scrollbar));
     host_impl_->pending_tree()->PushPageScaleFromMainThread(1.f, 1.f, 1.f);
     host_impl_->pending_tree()->BuildPropertyTreesForTesting();
     host_impl_->ActivateSyncTree();
 
     LayerImpl* active_scrollbar_layer =
         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())
-          ->DidMouseMoveNear(VERTICAL, 0);
+          ->DidMouseMove(gfx::PointF(0, 90));
     } 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 57 matching lines @@
   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();
   LayerImpl* container =
       host_impl_->pending_tree()->InnerViewportContainerLayer();
   scrollbar->SetScrollElementId(scroll->element_id());
+  scrollbar->SetBounds(gfx::Size(10, 100));
+  scrollbar->SetPosition(gfx::PointF(90, 0));
   container->test_properties()->AddChild(std::move(scrollbar));
   host_impl_->pending_tree()->PushPageScaleFromMainThread(1.f, 1.f, 1.f);
   host_impl_->pending_tree()->BuildPropertyTreesForTesting();
   host_impl_->ActivateSyncTree();
 
   ScrollbarAnimationController* scrollbar_controller =
       host_impl_->ScrollbarAnimationControllerForElementId(
           scroll->element_id());
 
   // 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_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 show the scrollbars.
+  // in task. Execute it to fade in the scrollbars.
   {
     animation_task_ = base::Closure();
-    scrollbar_controller->DidMouseMoveNear(VERTICAL, 0);
+    scrollbar_controller->DidMouseMove(gfx::PointF(90, 0));
     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 190 matching lines @@
   host_impl_->SetViewportSize(device_viewport_size);
 
   CreateScrollAndContentsLayers(host_impl_->active_tree(), content_size);
   host_impl_->active_tree()->InnerViewportContainerLayer()->SetBounds(
       viewport_size);
   LayerImpl* root_scroll =
       host_impl_->active_tree()->OuterViewportScrollLayer();
   // The scrollbar is on the left side.
   std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar =
       SolidColorScrollbarLayerImpl::Create(host_impl_->active_tree(), 6,
-                                           VERTICAL, 5, 5, true, true);
+                                           VERTICAL, 15, 0, true, true);
   scrollbar->SetScrollElementId(root_scroll->element_id());
   scrollbar->SetDrawsContent(true);
   scrollbar->SetBounds(scrollbar_size);
   scrollbar->SetTouchEventHandlerRegion(gfx::Rect(scrollbar_size));
   host_impl_->active_tree()
       ->InnerViewportContainerLayer()
       ->test_properties()
       ->AddChild(std::move(scrollbar));
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
   host_impl_->active_tree()->DidBecomeActive();
 
   DrawFrame();
   host_impl_->active_tree()->UpdateDrawProperties(false);
 
   ScrollbarAnimationController* scrollbar_animation_controller =
       host_impl_->ScrollbarAnimationControllerForElementId(
           root_scroll->element_id());
 
-  const float kMouseDistanceToTriggerAnimation =
+  const float kMouseMoveDistanceToTriggerFadeIn =
+      ScrollbarAnimationController::kMouseMoveDistanceToTriggerFadeIn;
+
+  const float kMouseMoveDistanceToTriggerExpand =
       SingleScrollbarAnimationControllerThinning::
-          kDefaultMouseMoveDistanceToTriggerAnimation;
+          kMouseMoveDistanceToTriggerExpand;
 
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseDistanceToTriggerAnimation * 2, 1));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 1));
   EXPECT_FALSE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseDistanceToTriggerAnimation - 1, 50));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand - 1, 10));
   EXPECT_TRUE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseDistanceToTriggerAnimation, 100));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 100));
   EXPECT_FALSE(scrollbar_animation_controller->MouseIsNearScrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
 
   did_request_redraw_ = false;
-  EXPECT_FALSE(scrollbar_animation_controller->MouseIsOverScrollbar(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 100));
-  EXPECT_TRUE(scrollbar_animation_controller->MouseIsOverScrollbar(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 120));
-  EXPECT_TRUE(scrollbar_animation_controller->MouseIsOverScrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+  host_impl_->MouseMoveAt(gfx::Point(10, 10));
+  EXPECT_TRUE(
+      scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+  host_impl_->MouseMoveAt(gfx::Point(10, 0));
+  EXPECT_TRUE(
+      scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(150, 120));
-  EXPECT_FALSE(scrollbar_animation_controller->MouseIsOverScrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf1) {
   SetupMouseMoveAtWithDeviceScale(1.f);
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf2) {
   SetupMouseMoveAtWithDeviceScale(2.f);
 }
 
@@ skipping 8575 matching lines @@
       host_impl_->active_tree()->OuterViewportScrollLayer();
 
   if (main_thread_scrolling) {
     root_scroll->set_main_thread_scrolling_reasons(
         MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
   }
 
   // scrollbar_1 on root scroll.
   std::unique_ptr<SolidColorScrollbarLayerImpl> scrollbar_1 =
       SolidColorScrollbarLayerImpl::Create(host_impl_->active_tree(),
-                                           scrollbar_1_id, VERTICAL, 5, 5, true,
-                                           true);
+                                           scrollbar_1_id, VERTICAL, 15, 0,
+                                           true, true);
   scrollbar_1->SetScrollElementId(root_scroll->element_id());
   scrollbar_1->SetDrawsContent(true);
   scrollbar_1->SetBounds(scrollbar_size_1);
   scrollbar_1->SetTouchEventHandlerRegion(gfx::Rect(scrollbar_size_1));
+  scrollbar_1->SetCurrentPos(0);
+  scrollbar_1->SetPosition(gfx::PointF(0, 0));
   host_impl_->active_tree()
       ->InnerViewportContainerLayer()
       ->test_properties()
       ->AddChild(std::move(scrollbar_1));
 
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
   host_impl_->active_tree()->DidBecomeActive();
 
   DrawFrame();
   host_impl_->active_tree()->UpdateDrawProperties(false);
 
   ScrollbarAnimationController* scrollbar_1_animation_controller =
       host_impl_->ScrollbarAnimationControllerForElementId(
           root_scroll->element_id());
   EXPECT_TRUE(scrollbar_1_animation_controller);
 
-  const float kMouseDistanceToTriggerAnimation =
+  const float kMouseMoveDistanceToTriggerFadeIn =
+      ScrollbarAnimationController::kMouseMoveDistanceToTriggerFadeIn;
+
+  const float kMouseMoveDistanceToTriggerExpand =
       SingleScrollbarAnimationControllerThinning::
-          kDefaultMouseMoveDistanceToTriggerAnimation;
+          kMouseMoveDistanceToTriggerExpand;
 
   // Mouse moves close to the scrollbar, goes over the scrollbar, and
   // moves back to where it was.
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+
   host_impl_->MouseMoveAt(
-      gfx::Point(14 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerExpand, 0));
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 150));
+      scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+
+  host_impl_->MouseMoveAt(
+      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
-  EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+
+  host_impl_->MouseMoveAt(gfx::Point(10, 0));
+  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 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
+  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));
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+
   host_impl_->MouseMoveAt(
-      gfx::Point(15 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(15 + kMouseMoveDistanceToTriggerFadeIn, 0));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      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(),
-                                           scrollbar_2_id, VERTICAL, 5, 5, true,
-                                           true);
+                                           scrollbar_2_id, VERTICAL, 15, 0,
+                                           true, true);
   std::unique_ptr<LayerImpl> child_clip =
       LayerImpl::Create(host_impl_->active_tree(), child_clip_id);
   std::unique_ptr<LayerImpl> child =
       LayerImpl::Create(host_impl_->active_tree(), child_scroll_id);
   child->SetPosition(gfx::PointF(50, 50));
   child->SetBounds(child_layer_size);
   child->SetDrawsContent(true);
   child->SetScrollClipLayer(child_clip_id);
   child->SetElementId(LayerIdToElementIdForTesting(child->id()));
   ElementId child_element_id = child->element_id();
 
   if (main_thread_scrolling) {
     child->set_main_thread_scrolling_reasons(
         MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
   }
 
   scrollbar_2->SetScrollElementId(child_element_id);
   scrollbar_2->SetDrawsContent(true);
   scrollbar_2->SetBounds(scrollbar_size_2);
+  scrollbar_2->SetCurrentPos(0);
+  scrollbar_2->SetPosition(gfx::PointF(0, 0));
 
   child->test_properties()->AddChild(std::move(scrollbar_2));
   child_clip->test_properties()->AddChild(std::move(child));
   root_scroll->test_properties()->AddChild(std::move(child_clip));
 
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
   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, 150));
+  host_impl_->MouseMoveAt(gfx::Point(60, 60));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      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->MouseIsOverScrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+
   host_impl_->MouseMoveAt(
-      gfx::Point(64 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(64 + kMouseMoveDistanceToTriggerExpand, 50));
   EXPECT_FALSE(
       scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      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->MouseIsOverScrollbar(VERTICAL));
+      scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   host_impl_->MouseMoveAt(
-      gfx::Point(14 + kMouseDistanceToTriggerAnimation, 150));
+      gfx::Point(14 + kMouseMoveDistanceToTriggerExpand, 0));
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_1_animation_controller->MouseIsOverScrollbar(VERTICAL));
+      scrollbar_1_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
   EXPECT_FALSE(
       scrollbar_2_animation_controller->MouseIsNearScrollbar(VERTICAL));
   EXPECT_FALSE(
-      scrollbar_2_animation_controller->MouseIsOverScrollbar(VERTICAL));
-  host_impl_->MouseMoveAt(gfx::Point(10, 150));
+      scrollbar_2_animation_controller->MouseIsNearScrollbarThumb(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->MouseIsOverScrollbarThumb(VERTICAL));
+  host_impl_->MouseMoveAt(gfx::Point(10, 0));
   EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsNearScrollbar(VERTICAL));
-  EXPECT_TRUE(scrollbar_1_animation_controller->MouseIsOverScrollbar(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->MouseIsOverScrollbar(VERTICAL));
+      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.
   animation_task_ = base::Closure();
 
   host_impl_->MouseDown();
-  host_impl_->MouseMoveAt(gfx::Point(100, 150));
+  host_impl_->MouseMoveAt(gfx::Point(60, 50));
   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));
   animation_task_ = base::Closure();
 
   host_impl_->MouseDown();
@@ skipping 89 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