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) |