| 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());
|
|
|