Source/core/rendering/RenderScrollbarTheme.h - Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard]

Side by Side Diff: Source/core/rendering/RenderScrollbarTheme.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebased the patch Created 6 years, 2 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 unified diff | Download patch

« no previous file with comments | « Source/core/rendering/RenderScrollbarPart.h ('k') | Source/core/rendering/RenderSearchField.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.	2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 14 matching lines...) Expand all Loading...
25	25

26 #ifndef RenderScrollbarTheme_h	26 #ifndef RenderScrollbarTheme_h

27 #define RenderScrollbarTheme_h	27 #define RenderScrollbarTheme_h

28	28

29 #include "platform/scroll/ScrollbarTheme.h"	29 #include "platform/scroll/ScrollbarTheme.h"

30	30

31 namespace blink {	31 namespace blink {

32	32

33 class PlatformMouseEvent;	33 class PlatformMouseEvent;

34	34

35 class RenderScrollbarTheme FINAL : public ScrollbarTheme {	35 class RenderScrollbarTheme final : public ScrollbarTheme {

36 public:	36 public:

37 virtual ~RenderScrollbarTheme() { }	37 virtual ~RenderScrollbarTheme() { }

38	38

39 virtual int scrollbarThickness(ScrollbarControlSize controlSize) OVERRIDE { return ScrollbarTheme::theme()->scrollbarThickness(controlSize); }	39 virtual int scrollbarThickness(ScrollbarControlSize controlSize) override { return ScrollbarTheme::theme()->scrollbarThickness(controlSize); }

40	40

41 virtual ScrollbarButtonsPlacement buttonsPlacement() const OVERRIDE { return ScrollbarTheme::theme()->buttonsPlacement(); }	41 virtual ScrollbarButtonsPlacement buttonsPlacement() const override { return ScrollbarTheme::theme()->buttonsPlacement(); }

42	42

43 virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect) OVERRIDE;	43 virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect) override;

44	44

45 virtual bool shouldCenterOnThumb(ScrollbarThemeClient* scrollbar, const Plat formMouseEvent& event) OVERRIDE { return ScrollbarTheme::theme()->shouldCenterOn Thumb(scrollbar, event); }	45 virtual bool shouldCenterOnThumb(ScrollbarThemeClient* scrollbar, const Plat formMouseEvent& event) override { return ScrollbarTheme::theme()->shouldCenterOn Thumb(scrollbar, event); }

46 virtual bool shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, con st PlatformMouseEvent& event) OVERRIDE { return ScrollbarTheme::theme()->shouldS napBackToDragOrigin(scrollbar, event); }	46 virtual bool shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, con st PlatformMouseEvent& event) override { return ScrollbarTheme::theme()->shouldS napBackToDragOrigin(scrollbar, event); }

47	47

48 virtual double initialAutoscrollTimerDelay() OVERRIDE { return ScrollbarThem e::theme()->initialAutoscrollTimerDelay(); }	48 virtual double initialAutoscrollTimerDelay() override { return ScrollbarThem e::theme()->initialAutoscrollTimerDelay(); }

49 virtual double autoscrollTimerDelay() OVERRIDE { return ScrollbarTheme::them e()->autoscrollTimerDelay(); }	49 virtual double autoscrollTimerDelay() override { return ScrollbarTheme::them e()->autoscrollTimerDelay(); }

50	50

51 virtual void registerScrollbar(ScrollbarThemeClient* scrollbar) OVERRIDE { r eturn ScrollbarTheme::theme()->registerScrollbar(scrollbar); }	51 virtual void registerScrollbar(ScrollbarThemeClient* scrollbar) override { r eturn ScrollbarTheme::theme()->registerScrollbar(scrollbar); }

52 virtual void unregisterScrollbar(ScrollbarThemeClient* scrollbar) OVERRIDE { return ScrollbarTheme::theme()->unregisterScrollbar(scrollbar); }	52 virtual void unregisterScrollbar(ScrollbarThemeClient* scrollbar) override { return ScrollbarTheme::theme()->unregisterScrollbar(scrollbar); }

53	53

54 virtual int minimumThumbLength(ScrollbarThemeClient*) OVERRIDE;	54 virtual int minimumThumbLength(ScrollbarThemeClient*) override;

55	55

56 void buttonSizesAlongTrackAxis(ScrollbarThemeClient*, int& beforeSize, int& afterSize);	56 void buttonSizesAlongTrackAxis(ScrollbarThemeClient*, int& beforeSize, int& afterSize);

57	57

58 static RenderScrollbarTheme* renderScrollbarTheme();	58 static RenderScrollbarTheme* renderScrollbarTheme();

59	59

60 protected:	60 protected:

61 virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE;	61 virtual bool hasButtons(ScrollbarThemeClient*) override;

62 virtual bool hasThumb(ScrollbarThemeClient*) OVERRIDE;	62 virtual bool hasThumb(ScrollbarThemeClient*) override;

63	63

64 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) OVERRIDE;	64 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) override;

65 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) OVERRIDE;	65 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;

66 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) OVER RIDE;	66 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) over ride;

67	67

68 virtual void paintScrollbarBackground(GraphicsContext, ScrollbarThemeClient ) OVERRIDE;	68 virtual void paintScrollbarBackground(GraphicsContext, ScrollbarThemeClient ) override;

69 virtual void paintTrackBackground(GraphicsContext, ScrollbarThemeClient, c onst IntRect&) OVERRIDE;	69 virtual void paintTrackBackground(GraphicsContext, ScrollbarThemeClient, c onst IntRect&) override;

70 virtual void paintTrackPiece(GraphicsContext, ScrollbarThemeClient, const IntRect&, ScrollbarPart) OVERRIDE;	70 virtual void paintTrackPiece(GraphicsContext, ScrollbarThemeClient, const IntRect&, ScrollbarPart) override;

71 virtual void paintButton(GraphicsContext, ScrollbarThemeClient, const IntR ect&, ScrollbarPart) OVERRIDE;	71 virtual void paintButton(GraphicsContext, ScrollbarThemeClient, const IntR ect&, ScrollbarPart) override;

72 virtual void paintThumb(GraphicsContext, ScrollbarThemeClient, const IntRe ct&) OVERRIDE;	72 virtual void paintThumb(GraphicsContext, ScrollbarThemeClient, const IntRe ct&) override;

73 virtual void paintTickmarks(GraphicsContext, ScrollbarThemeClient, const I ntRect&) OVERRIDE;	73 virtual void paintTickmarks(GraphicsContext, ScrollbarThemeClient, const I ntRect&) override;

74	74

75 virtual IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect&) OVERRIDE;	75 virtual IntRect constrainTrackRectToTrackPieces(ScrollbarThemeClient*, const IntRect&) override;

76 };	76 };

77	77

78 } // namespace blink	78 } // namespace blink

79	79

80 #endif // RenderScrollbarTheme_h	80 #endif // RenderScrollbarTheme_h

OLD	NEW