| Index: Source/core/layout/LayoutScrollbarTheme.h
|
| diff --git a/Source/core/layout/LayoutScrollbarTheme.h b/Source/core/layout/LayoutScrollbarTheme.h
|
| index 7b33d33d07f4ac1ef6481c1ffa9e2561510b6125..9cf6f91d4b9cf5b934a60db1f3fe73a209a114df 100644
|
| --- a/Source/core/layout/LayoutScrollbarTheme.h
|
| +++ b/Source/core/layout/LayoutScrollbarTheme.h
|
| @@ -34,45 +34,45 @@ class PlatformMouseEvent;
|
|
|
| class LayoutScrollbarTheme final : public ScrollbarTheme {
|
| public:
|
| - virtual ~LayoutScrollbarTheme() { }
|
| + ~LayoutScrollbarTheme() override { }
|
|
|
| - virtual int scrollbarThickness(ScrollbarControlSize controlSize) override { return ScrollbarTheme::theme()->scrollbarThickness(controlSize); }
|
| + int scrollbarThickness(ScrollbarControlSize controlSize) override { return ScrollbarTheme::theme()->scrollbarThickness(controlSize); }
|
|
|
| - virtual ScrollbarButtonsPlacement buttonsPlacement() const override { return ScrollbarTheme::theme()->buttonsPlacement(); }
|
| + ScrollbarButtonsPlacement buttonsPlacement() const override { return ScrollbarTheme::theme()->buttonsPlacement(); }
|
|
|
| - virtual void paintScrollCorner(GraphicsContext*, const DisplayItemClientWrapper&, const IntRect& cornerRect) override;
|
| + void paintScrollCorner(GraphicsContext*, const DisplayItemClientWrapper&, const IntRect& cornerRect) override;
|
|
|
| - virtual bool shouldCenterOnThumb(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& event) override { return ScrollbarTheme::theme()->shouldCenterOnThumb(scrollbar, event); }
|
| - virtual bool shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& event) override { return ScrollbarTheme::theme()->shouldSnapBackToDragOrigin(scrollbar, event); }
|
| + bool shouldCenterOnThumb(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& event) override { return ScrollbarTheme::theme()->shouldCenterOnThumb(scrollbar, event); }
|
| + bool shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& event) override { return ScrollbarTheme::theme()->shouldSnapBackToDragOrigin(scrollbar, event); }
|
|
|
| - virtual double initialAutoscrollTimerDelay() override { return ScrollbarTheme::theme()->initialAutoscrollTimerDelay(); }
|
| - virtual double autoscrollTimerDelay() override { return ScrollbarTheme::theme()->autoscrollTimerDelay(); }
|
| + double initialAutoscrollTimerDelay() override { return ScrollbarTheme::theme()->initialAutoscrollTimerDelay(); }
|
| + double autoscrollTimerDelay() override { return ScrollbarTheme::theme()->autoscrollTimerDelay(); }
|
|
|
| - virtual void registerScrollbar(ScrollbarThemeClient* scrollbar) override { return ScrollbarTheme::theme()->registerScrollbar(scrollbar); }
|
| - virtual void unregisterScrollbar(ScrollbarThemeClient* scrollbar) override { return ScrollbarTheme::theme()->unregisterScrollbar(scrollbar); }
|
| + void registerScrollbar(ScrollbarThemeClient* scrollbar) override { return ScrollbarTheme::theme()->registerScrollbar(scrollbar); }
|
| + void unregisterScrollbar(ScrollbarThemeClient* scrollbar) override { return ScrollbarTheme::theme()->unregisterScrollbar(scrollbar); }
|
|
|
| - virtual int minimumThumbLength(ScrollbarThemeClient*) override;
|
| + int minimumThumbLength(ScrollbarThemeClient*) override;
|
|
|
| void buttonSizesAlongTrackAxis(ScrollbarThemeClient*, int& beforeSize, int& afterSize);
|
|
|
| static LayoutScrollbarTheme* layoutScrollbarTheme();
|
|
|
| protected:
|
| - virtual bool hasButtons(ScrollbarThemeClient*) override;
|
| - virtual bool hasThumb(ScrollbarThemeClient*) override;
|
| + bool hasButtons(ScrollbarThemeClient*) override;
|
| + bool hasThumb(ScrollbarThemeClient*) override;
|
|
|
| - virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
|
| - virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
|
| - virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) override;
|
| + IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
|
| + IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
|
| + IntRect trackRect(ScrollbarThemeClient*, bool painting = false) override;
|
|
|
| - virtual void paintScrollbarBackground(GraphicsContext*, ScrollbarThemeClient*) override;
|
| - virtual void paintTrackBackground(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
| - virtual void paintTrackPiece(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) override;
|
| - virtual void paintButton(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) override;
|
| - virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
| - virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
| + void paintScrollbarBackground(GraphicsContext*, ScrollbarThemeClient*) override;
|
| + void paintTrackBackground(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
| + void paintTrackPiece(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) override;
|
| + void paintButton(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart) override;
|
| + void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
| + void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
|
|
|
| - virtual IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect&) override;
|
| + IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect&) override;
|
| };
|
|
|
| } // namespace blink
|
|
|