cc/animation/scrollbar_animation_controller_thinning.cc - Issue 655783004: Hide scrollbars when their dimensions are not scrollable.

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/animation/scrollbar_animation_controller_thinning.cc

Issue 655783004: Hide scrollbars when their dimensions are not scrollable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Renamed can_scroll_orientation() -> CanScrollOrientation() Created 6 years, 2 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/animation/scrollbar_animation_controller_linear_fade_unittest.cc ('k') | cc/animation/scrollbar_animation_controller_thinning_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/animation/scrollbar_animation_controller_thinning.cc

diff --git a/cc/animation/scrollbar_animation_controller_thinning.cc b/cc/animation/scrollbar_animation_controller_thinning.cc

index 0c05709c8c06e7985104aebb3cf9a36d4bf20af1..0405074b55a311b1c2f5fa5543a6219c5d4cdf20 100644

--- a/cc/animation/scrollbar_animation_controller_thinning.cc

+++ b/cc/animation/scrollbar_animation_controller_thinning.cc

@@ -145,8 +145,12 @@ void ScrollbarAnimationControllerThinning::ApplyOpacityAndThumbThicknessScale(

++it) {

ScrollbarLayerImplBase* scrollbar = *it;

if (scrollbar->is_overlay_scrollbar()) {

- scrollbar->SetOpacity(

- AdjustScale(opacity, scrollbar->opacity(), opacity_change_));

+ float effectiveOpacity =

+ scrollbar->CanScrollOrientation()

+ ? AdjustScale(opacity, scrollbar->opacity(), opacity_change_)

+ : 0;

+ scrollbar->SetOpacity(effectiveOpacity);

scrollbar->SetThumbThicknessScaleFactor(

AdjustScale(thumb_thickness_scale,

scrollbar->thumb_thickness_scale_factor(),