Prevent overlay scrollbars expand or hover together

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 2926 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_->ScrollbarAnimationControllerForId(scroll->id())
-          ->DidMouseMoveNear(0);
+          ->DidMouseMoveNear(VERTICAL, 0);
     } else {
       EXPECT_EQ(nullptr,
                 host_impl_->ScrollbarAnimationControllerForId(scroll->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 239 matching lines @@
 
   DrawFrame();
   host_impl_->active_tree()->UpdateDrawProperties(false);
 
   ScrollbarAnimationControllerThinning* scrollbar_animation_controller =
       static_cast<ScrollbarAnimationControllerThinning*>(
           host_impl_->ScrollbarAnimationControllerForId(root_scroll->id()));
   scrollbar_animation_controller->set_mouse_move_distance_for_test(100.f);
 
   host_impl_->MouseMoveAt(gfx::Point(200, 1));
-  EXPECT_FALSE(scrollbar_animation_controller->mouse_is_near_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_animation_controller->mouse_is_near_scrollbar(VERTICAL));
 
   host_impl_->MouseMoveAt(gfx::Point(100, 50));
-  EXPECT_TRUE(scrollbar_animation_controller->mouse_is_near_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_animation_controller->mouse_is_near_scrollbar(VERTICAL));
 
   host_impl_->MouseMoveAt(gfx::Point(116, 100));
-  EXPECT_FALSE(scrollbar_animation_controller->mouse_is_near_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_animation_controller->mouse_is_near_scrollbar(VERTICAL));
 
   scrollbar_animation_controller->set_mouse_move_distance_for_test(102.f);
   host_impl_->MouseMoveAt(gfx::Point(116, 100));
-  EXPECT_TRUE(scrollbar_animation_controller->mouse_is_near_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_animation_controller->mouse_is_near_scrollbar(VERTICAL));
 
   did_request_redraw_ = false;
-  EXPECT_FALSE(scrollbar_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(10, 100));
-  EXPECT_TRUE(scrollbar_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(10, 120));
-  EXPECT_TRUE(scrollbar_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(150, 120));
-  EXPECT_FALSE(scrollbar_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_animation_controller->mouse_is_over_scrollbar(VERTICAL));
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf1) {
   SetupMouseMoveAtWithDeviceScale(1.f);
 }
 
 TEST_F(LayerTreeHostImplTest, MouseMoveAtWithDeviceScaleOf2) {
   SetupMouseMoveAtWithDeviceScale(2.f);
 }
 
@@ skipping 8419 matching lines @@
 
   ScrollbarAnimationControllerThinning* scrollbar_1_animation_controller =
       static_cast<ScrollbarAnimationControllerThinning*>(
           host_impl_->ScrollbarAnimationControllerForId(root_scroll->id()));
   EXPECT_TRUE(scrollbar_1_animation_controller);
   scrollbar_1_animation_controller->set_mouse_move_distance_for_test(40.f);
 
   // Mouse moves close to the scrollbar, goes over the scrollbar, and
   // moves back to where it was.
   host_impl_->MouseMoveAt(gfx::Point(100, 150));
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(40, 150));
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(10, 150));
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(40, 150));
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(100, 150));
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(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);
   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);
@@ skipping 20 matching lines @@
 
   ScrollbarAnimationControllerThinning* scrollbar_2_animation_controller =
       static_cast<ScrollbarAnimationControllerThinning*>(
           host_impl_->ScrollbarAnimationControllerForId(child_scroll_id));
   EXPECT_TRUE(scrollbar_2_animation_controller);
   scrollbar_2_animation_controller->set_mouse_move_distance_for_test(40.f);
 
   // 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));
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
-  EXPECT_TRUE(scrollbar_2_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_TRUE(scrollbar_2_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_2_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_2_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(100, 150));
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
-  EXPECT_TRUE(scrollbar_2_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_2_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_2_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(40, 150));
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
-  EXPECT_FALSE(scrollbar_2_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_2_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->mouse_is_over_scrollbar(VERTICAL));
   host_impl_->MouseMoveAt(gfx::Point(10, 150));
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_TRUE(scrollbar_1_animation_controller->mouse_is_over_scrollbar());
-  EXPECT_FALSE(scrollbar_2_animation_controller->mouse_is_near_scrollbar());
-  EXPECT_FALSE(scrollbar_2_animation_controller->mouse_is_over_scrollbar());
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_TRUE(
+      scrollbar_1_animation_controller->mouse_is_over_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->mouse_is_near_scrollbar(VERTICAL));
+  EXPECT_FALSE(
+      scrollbar_2_animation_controller->mouse_is_over_scrollbar(VERTICAL));
 }
 
 TEST_F(LayerTreeHostImplTest,
        LayerTreeHostImplTestScrollbarStatesInMainThreadScorlling) {
   SetupMouseMoveAtTestScrollbarStates(true);
 }
 
 TEST_F(LayerTreeHostImplTest,
        LayerTreeHostImplTestScrollbarStatesInNotMainThreadScorlling) {
   SetupMouseMoveAtTestScrollbarStates(false);
 }
 
 }  // namespace
 }  // namespace cc