Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: Source/core/rendering/RenderTextControlSingleLine.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTextControlSingleLine.h
diff --git a/Source/core/rendering/RenderTextControlSingleLine.h b/Source/core/rendering/RenderTextControlSingleLine.h
index 64a07cc74fcba8648ac2ed9e4c0712f037f2f1a3..950c361492133cbc7d6f3843653eae68f949bce6 100644
--- a/Source/core/rendering/RenderTextControlSingleLine.h
+++ b/Source/core/rendering/RenderTextControlSingleLine.h
@@ -35,7 +35,7 @@ public:
RenderTextControlSingleLine(HTMLInputElement*);
virtual ~RenderTextControlSingleLine();
// FIXME: Move createInnerTextStyle() to TextControlInnerTextElement.
- virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const;
+ virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const OVERRIDE FINAL;
void capsLockStateMayHaveChanged();
@@ -45,34 +45,34 @@ protected:
Element* containerElement() const;
Element* editingViewPortElement() const;
HTMLInputElement* inputElement() const;
- virtual void updateFromElement() OVERRIDE;
+ virtual void updateFromElement() OVERRIDE FINAL;
private:
- virtual bool hasControlClip() const;
- virtual LayoutRect controlClipRect(const LayoutPoint&) const;
- virtual bool isTextField() const { return true; }
+ virtual bool hasControlClip() const OVERRIDE FINAL;
+ virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE FINAL;
+ virtual bool isTextField() const OVERRIDE FINAL { return true; }
- virtual void paint(PaintInfo&, const LayoutPoint&);
- virtual void layout();
+ virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void layout() OVERRIDE;
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL;
- virtual void autoscroll(const IntPoint&);
+ virtual void autoscroll(const IntPoint&) OVERRIDE FINAL;
// Subclassed to forward to our inner div.
- virtual int scrollLeft() const;
- virtual int scrollTop() const;
- virtual int scrollWidth() const;
- virtual int scrollHeight() const;
- virtual void setScrollLeft(int);
- virtual void setScrollTop(int);
+ virtual int scrollLeft() const OVERRIDE FINAL;
+ virtual int scrollTop() const OVERRIDE FINAL;
+ virtual int scrollWidth() const OVERRIDE FINAL;
+ virtual int scrollHeight() const OVERRIDE FINAL;
+ virtual void setScrollLeft(int) OVERRIDE FINAL;
+ virtual void setScrollTop(int) OVERRIDE FINAL;
int textBlockWidth() const;
- virtual float getAvgCharWidth(AtomicString family);
- virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const;
+ virtual float getAvgCharWidth(AtomicString family) OVERRIDE FINAL;
+ virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERRIDE FINAL;
virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE;
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL;
bool textShouldBeTruncated() const;
« no previous file with comments | « Source/core/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698