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

Unified Diff: Source/core/rendering/RenderTextControlMultiLine.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderTextControl.h ('k') | Source/core/rendering/RenderTextControlSingleLine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTextControlMultiLine.h
diff --git a/Source/core/rendering/RenderTextControlMultiLine.h b/Source/core/rendering/RenderTextControlMultiLine.h
index f16d517d2d0963af346bfa71e48d9abdbb4e026c..73f86f98fbc85e65533baf1660a7ee5d52f592b3 100644
--- a/Source/core/rendering/RenderTextControlMultiLine.h
+++ b/Source/core/rendering/RenderTextControlMultiLine.h
@@ -28,25 +28,25 @@ namespace blink {
class HTMLTextAreaElement;
-class RenderTextControlMultiLine FINAL : public RenderTextControl {
+class RenderTextControlMultiLine final : public RenderTextControl {
public:
RenderTextControlMultiLine(HTMLTextAreaElement*);
virtual ~RenderTextControlMultiLine();
private:
- virtual bool isTextArea() const OVERRIDE { return true; }
+ virtual bool isTextArea() const override { return true; }
- 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;
- virtual float getAvgCharWidth(AtomicString family) OVERRIDE;
- virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERRIDE;
- virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE;
+ virtual float getAvgCharWidth(AtomicString family) override;
+ virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const override;
+ virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const override;
// We override the two baseline functions because we want our baseline to be the bottom of our margin box.
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
- virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE { return -1; }
+ virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+ virtual int inlineBlockBaseline(LineDirectionMode) const override { return -1; }
- virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* startStyle) const OVERRIDE;
- virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) OVERRIDE;
+ virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* startStyle) const override;
+ virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) override;
};
DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlMultiLine, isTextArea());
« no previous file with comments | « Source/core/rendering/RenderTextControl.h ('k') | Source/core/rendering/RenderTextControlSingleLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698