| Index: Source/platform/scroll/ScrollbarThemeMacCommon.h
|
| diff --git a/Source/platform/scroll/ScrollbarThemeMacCommon.h b/Source/platform/scroll/ScrollbarThemeMacCommon.h
|
| index c6be4c41b44a58e561fbcc08d7e94509754b1cb7..c3e7fde10d5d82dd941b9803a57b43aa0fc7d26b 100644
|
| --- a/Source/platform/scroll/ScrollbarThemeMacCommon.h
|
| +++ b/Source/platform/scroll/ScrollbarThemeMacCommon.h
|
| @@ -41,7 +41,7 @@ public:
|
|
|
| void registerScrollbar(ScrollbarThemeClient*) override;
|
| void unregisterScrollbar(ScrollbarThemeClient*) override;
|
| - void preferencesChanged(float initialButtonDelay, float autoscrollButtonDelay, NSScrollerStyle preferredScrollerStyle, bool redraw);
|
| + void preferencesChanged(float initialButtonDelay, float autoscrollButtonDelay, NSScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnabled, const std::string& buttonPlacement);
|
|
|
| bool supportsControlTints() const override { return true; }
|
|
|
| @@ -54,13 +54,15 @@ public:
|
|
|
| static bool isOverlayAPIAvailable();
|
|
|
| + static bool scrollAnimationEnabledForSystem();
|
| +
|
| protected:
|
| int maxOverlapBetweenPages() override { return 40; }
|
|
|
| bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const PlatformMouseEvent&) override;
|
| int scrollbarPartToHIPressedState(ScrollbarPart);
|
|
|
| - virtual void updateButtonPlacement() { }
|
| + virtual void updateButtonPlacement(const std::string& buttonPlacement) {}
|
|
|
| void paintGivenTickmarks(SkCanvas*, ScrollbarThemeClient*, const IntRect&, const Vector<IntRect>&);
|
|
|
|
|