cc/input/single_scrollbar_animation_controller_thinning_unittest.cc - Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/input/single_scrollbar_animation_controller_thinning_unittest.cc

Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class (Closed)

Patch Set: fix confict constant Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « cc/input/single_scrollbar_animation_controller_thinning.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/input/single_scrollbar_animation_controller_thinning_unittest.cc

diff --git a/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc b/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc

index 4486a87c5b07b9d33caf0c955050689c5037bd9f..50659ff44d89ec429021a2a5b1f05eba3d84ce9f 100644

--- a/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc

+++ b/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc

@@ -21,10 +21,11 @@ using testing::_;

namespace cc {

namespace {

-// These constants are hard-coded and should match the values in

-// single_scrollbar_animation_controller_thinning.cc.

-const float kIdleThicknessScale = 0.4f;

-const float kDefaultMouseMoveDistanceToTriggerAnimation = 25.f;

+const float kIdleThicknessScale =

+ SingleScrollbarAnimationControllerThinning::kIdleThicknessScale;

+const float kDefaultMouseMoveDistanceToTriggerAnimation =

+ SingleScrollbarAnimationControllerThinning::

+ kDefaultMouseMoveDistanceToTriggerAnimation;

class MockSingleScrollbarAnimationControllerClient

: public ScrollbarAnimationControllerClient {