Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

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: Previous patch accidentally lost new files Created 4 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
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 981d57cbd2aedb0db09740caa4de7669d36e5d77..6f940cb75decad84a1bb1ab2c93ed210adf89f45 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)
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698