third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm - Issue 1653003002: Make scrollAnimatorEnabled work on Mac like it does on other platforms

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: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

Issue 1653003002: Make scrollAnimatorEnabled work on Mac like it does on other platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« content/browser/theme_helper_mac.mm ('K') | « content/renderer/render_thread_impl.cc ('k') | third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

index 61b16ced626a4b27f3678166a94a04f7359500b4..4a882e05810ed328db831ec510d3b4d86f1a85b9 100644

--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

@@ -728,12 +728,9 @@ void ScrollAnimatorMac::dispose()

ScrollResultOneDimensional ScrollAnimatorMac::userScroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float delta)

{

- bool scrollAnimationEnabledForSystem = static_cast<ScrollbarThemeMacCommon&>(

- ScrollbarTheme::theme())

- .scrollAnimationEnabledForSystem();

m_haveScrolledSincePageLoad = true;

- if (!scrollAnimationEnabledForSystem || !m_scrollableArea->scrollAnimatorEnabled())

+ if (!m_scrollableArea->scrollAnimatorEnabled())

return ScrollAnimatorBase::userScroll(orientation, granularity, step, delta);

if (granularity == ScrollByPixel || granularity == ScrollByPrecisePixel)