| Index: Source/core/rendering/RenderThemeChromiumSkia.h
|
| diff --git a/Source/core/rendering/RenderThemeChromiumSkia.h b/Source/core/rendering/RenderThemeChromiumSkia.h
|
| index f3550c7aca021366f09adb08e300ecce74917888..98d900a1c01d95556d64fb020fb6d602f1264e6f 100644
|
| --- a/Source/core/rendering/RenderThemeChromiumSkia.h
|
| +++ b/Source/core/rendering/RenderThemeChromiumSkia.h
|
| @@ -39,8 +39,8 @@ public:
|
| RenderThemeChromiumSkia();
|
| virtual ~RenderThemeChromiumSkia();
|
|
|
| - virtual String extraDefaultStyleSheet();
|
| - virtual String extraQuirksStyleSheet();
|
| + virtual String extraDefaultStyleSheet() OVERRIDE;
|
| + virtual String extraQuirksStyleSheet() OVERRIDE;
|
|
|
| virtual Color platformTapHighlightColor() const OVERRIDE
|
| {
|
| @@ -48,57 +48,57 @@ public:
|
| }
|
|
|
| // A method asking if the theme's controls actually care about redrawing when hovered.
|
| - virtual bool supportsHover(const RenderStyle*) const;
|
| + virtual bool supportsHover(const RenderStyle*) const OVERRIDE FINAL;
|
|
|
| // A method asking if the theme is able to draw the focus ring.
|
| - virtual bool supportsFocusRing(const RenderStyle*) const;
|
| + virtual bool supportsFocusRing(const RenderStyle*) const OVERRIDE;
|
|
|
| virtual bool supportsClosedCaptioning() const OVERRIDE;
|
| // The platform selection color.
|
| - virtual Color platformActiveSelectionBackgroundColor() const;
|
| - virtual Color platformInactiveSelectionBackgroundColor() const;
|
| - virtual Color platformActiveSelectionForegroundColor() const;
|
| - virtual Color platformInactiveSelectionForegroundColor() const;
|
| - virtual Color platformFocusRingColor() const;
|
| + virtual Color platformActiveSelectionBackgroundColor() const OVERRIDE;
|
| + virtual Color platformInactiveSelectionBackgroundColor() const OVERRIDE;
|
| + virtual Color platformActiveSelectionForegroundColor() const OVERRIDE;
|
| + virtual Color platformInactiveSelectionForegroundColor() const OVERRIDE;
|
| + virtual Color platformFocusRingColor() const OVERRIDE;
|
|
|
| // To change the blink interval, override caretBlinkIntervalInternal instead of this one so that we may share layout test code an intercepts.
|
| - virtual double caretBlinkInterval() const;
|
| + virtual double caretBlinkInterval() const OVERRIDE;
|
|
|
| // System fonts.
|
| - virtual void systemFont(CSSValueID, FontDescription&) const;
|
| + virtual void systemFont(CSSValueID, FontDescription&) const OVERRIDE;
|
|
|
| - virtual int minimumMenuListSize(RenderStyle*) const;
|
| + virtual int minimumMenuListSize(RenderStyle*) const OVERRIDE;
|
|
|
| - virtual void setCheckboxSize(RenderStyle*) const;
|
| + virtual void setCheckboxSize(RenderStyle*) const OVERRIDE;
|
|
|
| - virtual void setRadioSize(RenderStyle*) const;
|
| + virtual void setRadioSize(RenderStyle*) const OVERRIDE;
|
|
|
| - virtual void adjustButtonStyle(RenderStyle*, Element*) const;
|
| + virtual void adjustButtonStyle(RenderStyle*, Element*) const OVERRIDE;
|
|
|
| - virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
|
|
| - virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const;
|
| - virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const OVERRIDE;
|
| + virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&) 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 void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const 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 paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
|
| - virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| - virtual String formatMediaControlsTime(float time) const;
|
| - virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
|
| - virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual void adjustSliderThumbSize(RenderStyle*, Element*) const OVERRIDE;
|
| + virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
| + 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;
|
|
|
| // MenuList refers to an unstyled menulist (meaning a menulist without
|
| // background-color or border set) and MenuListButton refers to a styled
|
| @@ -109,22 +109,22 @@ public:
|
| // In short, we either go down the MenuList code path or the MenuListButton
|
| // codepath. We never go down both. And in both cases, they render the
|
| // entire menulist.
|
| - virtual void adjustMenuListStyle(RenderStyle*, Element*) const;
|
| - virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const;
|
| - virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
|
| + virtual void adjustMenuListStyle(RenderStyle*, Element*) const OVERRIDE;
|
| + virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const OVERRIDE;
|
| + virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
|
|
|
| - virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
|
| - virtual double animationDurationForProgressBar(RenderProgress*) const;
|
| + virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const OVERRIDE;
|
| + virtual double animationDurationForProgressBar(RenderProgress*) const OVERRIDE;
|
|
|
| // These methods define the padding for the MenuList's inner block.
|
| - virtual int popupInternalPaddingLeft(RenderStyle*) const;
|
| - virtual int popupInternalPaddingRight(RenderStyle*) const;
|
| - virtual int popupInternalPaddingTop(RenderStyle*) const;
|
| - virtual int popupInternalPaddingBottom(RenderStyle*) const;
|
| + virtual int popupInternalPaddingLeft(RenderStyle*) const OVERRIDE;
|
| + virtual int popupInternalPaddingRight(RenderStyle*) const OVERRIDE;
|
| + virtual int popupInternalPaddingTop(RenderStyle*) const OVERRIDE;
|
| + virtual int popupInternalPaddingBottom(RenderStyle*) const OVERRIDE;
|
|
|
| // Media controls
|
| - virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
|
| - virtual bool usesVerticalVolumeSlider() const { return false; }
|
| + virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const OVERRIDE { return true; }
|
| + virtual bool usesVerticalVolumeSlider() const OVERRIDE { return false; }
|
|
|
| // Provide a way to pass the default font size from the Settings object
|
| // to the render theme. FIXME: http://b/1129186 A cleaner way would be
|
|
|