cc/layers/scrollbar_layer_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/layers/scrollbar_layer_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:

Index: cc/layers/scrollbar_layer_unittest.cc

diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc

index 2cc8c05f24a04d54f7e50af4f4fb8c0500f06bd8..a454c4c9928408a289b596a28a39661d76a33854 100644

--- a/cc/layers/scrollbar_layer_unittest.cc

+++ b/cc/layers/scrollbar_layer_unittest.cc

@@ -103,7 +103,8 @@ class ScrollbarLayerTest : public testing::Test {

ScrollbarLayerTest() {

layer_tree_settings_.single_thread_proxy_scheduler = false;

layer_tree_settings_.use_zero_copy = true;

- layer_tree_settings_.scrollbar_animator = LayerTreeSettings::LINEAR_FADE;

+ layer_tree_settings_.scrollbar_animator =

+ LayerTreeSettings::ANDROID_OVERLAY;

layer_tree_settings_.scrollbar_fade_delay =

base::TimeDelta::FromMilliseconds(20);

layer_tree_settings_.scrollbar_fade_duration =