Index: Source/core/rendering/RenderThemeChromiumMac.h |
diff --git a/Source/core/rendering/RenderThemeChromiumMac.h b/Source/core/rendering/RenderThemeChromiumMac.h |
index 371ecc6c717d47a739b135669daf7552118a0e7b..b20bfe191b4dd6ce818702c34460a8d9a4ff8bcd 100644 |
--- a/Source/core/rendering/RenderThemeChromiumMac.h |
+++ b/Source/core/rendering/RenderThemeChromiumMac.h |
@@ -32,7 +32,7 @@ OBJC_CLASS WebCoreRenderThemeNotificationObserver; |
namespace WebCore { |
-class RenderThemeChromiumMac : public RenderTheme { |
+class RenderThemeChromiumMac FINAL : public RenderTheme { |
public: |
static PassRefPtr<RenderTheme> create(); |
@@ -94,35 +94,35 @@ protected: |
virtual bool supportsSelectionForegroundColors() const OVERRIDE { return false; } |
- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual void adjustMenuListStyle(RenderStyle*, Element*) const; |
+ virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual void adjustMenuListStyle(RenderStyle*, Element*) const OVERRIDE; |
- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const; |
+ virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const OVERRIDE; |
- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const; |
+ virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const OVERRIDE; |
- virtual void adjustSearchFieldCancelButtonStyle(RenderStyle*, Element*) const; |
- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual void adjustSearchFieldCancelButtonStyle(RenderStyle*, Element*) const OVERRIDE; |
+ virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const; |
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const OVERRIDE; |
+ virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const; |
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const OVERRIDE; |
+ virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
- virtual bool supportsClosedCaptioning() const { return true; } |
+ virtual bool supportsClosedCaptioning() const OVERRIDE { return true; } |
private: |
virtual String fileListNameForWidth(Locale&, const FileList*, const Font&, int width) const OVERRIDE; |
@@ -174,21 +174,21 @@ private: |
protected: |
virtual void adjustMediaSliderThumbSize(RenderStyle*) const; |
- virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual String extraFullScreenStyleSheet(); |
- |
- virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; } |
- virtual bool usesVerticalVolumeSlider() const { return false; } |
- virtual String formatMediaControlsTime(float time) const; |
- virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const; |
- virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&); |
- virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&); |
+ virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual String extraFullScreenStyleSheet() OVERRIDE; |
+ |
+ virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const OVERRIDE { return true; } |
+ virtual bool usesVerticalVolumeSlider() const OVERRIDE { return false; } |
+ virtual String formatMediaControlsTime(float time) const OVERRIDE; |
+ virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const OVERRIDE; |
+ virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
+ virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE; |
// Controls color values returned from platformFocusRingColor(). systemColor() will be used when false. |
bool usesTestModeFocusRingColor() const; |
@@ -199,7 +199,7 @@ protected: |
private: |
virtual void updateActiveState(NSCell*, const RenderObject*); |
- virtual String extraDefaultStyleSheet(); |
+ virtual String extraDefaultStyleSheet() OVERRIDE; |
virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE; |
mutable RetainPtr<NSPopUpButtonCell> m_popupButton; |