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

Side by Side Diff: Source/core/rendering/RenderTextControlSingleLine.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 17 matching lines...) Expand all
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class HTMLInputElement; 31 class HTMLInputElement;
32 32
33 class RenderTextControlSingleLine : public RenderTextControl { 33 class RenderTextControlSingleLine : public RenderTextControl {
34 public: 34 public:
35 RenderTextControlSingleLine(HTMLInputElement*); 35 RenderTextControlSingleLine(HTMLInputElement*);
36 virtual ~RenderTextControlSingleLine(); 36 virtual ~RenderTextControlSingleLine();
37 // FIXME: Move createInnerEditorStyle() to TextControlInnerEditorElement. 37 // FIXME: Move createInnerEditorStyle() to TextControlInnerEditorElement.
38 virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* st artStyle) const OVERRIDE FINAL; 38 virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* st artStyle) const override final;
39 39
40 void capsLockStateMayHaveChanged(); 40 void capsLockStateMayHaveChanged();
41 41
42 protected: 42 protected:
43 virtual void centerContainerIfNeeded(RenderBox*) const { } 43 virtual void centerContainerIfNeeded(RenderBox*) const { }
44 virtual LayoutUnit computeLogicalHeightLimit() const; 44 virtual LayoutUnit computeLogicalHeightLimit() const;
45 Element* containerElement() const; 45 Element* containerElement() const;
46 Element* editingViewPortElement() const; 46 Element* editingViewPortElement() const;
47 HTMLInputElement* inputElement() const; 47 HTMLInputElement* inputElement() const;
48 48
49 private: 49 private:
50 virtual bool hasControlClip() const OVERRIDE FINAL; 50 virtual bool hasControlClip() const override final;
51 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE FINAL; 51 virtual LayoutRect controlClipRect(const LayoutPoint&) const override final;
52 virtual bool isTextField() const OVERRIDE FINAL { return true; } 52 virtual bool isTextField() const override final { return true; }
53 53
54 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 54 virtual void paint(PaintInfo&, const LayoutPoint&) override;
55 virtual void layout() OVERRIDE; 55 virtual void layout() override;
56 56
57 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 57 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) override final;
58 58
59 virtual void autoscroll(const IntPoint&) OVERRIDE FINAL; 59 virtual void autoscroll(const IntPoint&) override final;
60 60
61 // Subclassed to forward to our inner div. 61 // Subclassed to forward to our inner div.
62 virtual LayoutUnit scrollLeft() const OVERRIDE FINAL; 62 virtual LayoutUnit scrollLeft() const override final;
63 virtual LayoutUnit scrollTop() const OVERRIDE FINAL; 63 virtual LayoutUnit scrollTop() const override final;
64 virtual LayoutUnit scrollWidth() const OVERRIDE FINAL; 64 virtual LayoutUnit scrollWidth() const override final;
65 virtual LayoutUnit scrollHeight() const OVERRIDE FINAL; 65 virtual LayoutUnit scrollHeight() const override final;
66 virtual void setScrollLeft(LayoutUnit) OVERRIDE FINAL; 66 virtual void setScrollLeft(LayoutUnit) override final;
67 virtual void setScrollTop(LayoutUnit) OVERRIDE FINAL; 67 virtual void setScrollTop(LayoutUnit) override final;
68 68
69 int textBlockWidth() const; 69 int textBlockWidth() const;
70 virtual float getAvgCharWidth(AtomicString family) OVERRIDE FINAL; 70 virtual float getAvgCharWidth(AtomicString family) override final;
71 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERR IDE FINAL; 71 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const overr ide final;
72 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const OVERRIDE; 72 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const override;
73 73
74 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL; 74 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final;
75 75
76 bool textShouldBeTruncated() const; 76 bool textShouldBeTruncated() const;
77 77
78 HTMLElement* innerSpinButtonElement() const; 78 HTMLElement* innerSpinButtonElement() const;
79 79
80 bool m_shouldDrawCapsLockIndicator; 80 bool m_shouldDrawCapsLockIndicator;
81 LayoutUnit m_desiredInnerEditorLogicalHeight; 81 LayoutUnit m_desiredInnerEditorLogicalHeight;
82 }; 82 };
83 83
84 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField()); 84 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField());
85 85
86 // ---------------------------- 86 // ----------------------------
87 87
88 class RenderTextControlInnerBlock : public RenderBlockFlow { 88 class RenderTextControlInnerBlock : public RenderBlockFlow {
89 public: 89 public:
90 RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { } 90 RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { }
91 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); } 91 virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); }
92 92
93 private: 93 private:
94 virtual bool isIntristicallyScrollable(ScrollbarOrientation orientation) con st OVERRIDE 94 virtual bool isIntristicallyScrollable(ScrollbarOrientation orientation) con st override
95 { 95 {
96 return orientation == HorizontalScrollbar; 96 return orientation == HorizontalScrollbar;
97 } 97 }
98 virtual bool scrollsOverflowX() const OVERRIDE { return hasOverflowClip(); } 98 virtual bool scrollsOverflowX() const override { return hasOverflowClip(); }
99 virtual bool scrollsOverflowY() const OVERRIDE { return false; } 99 virtual bool scrollsOverflowY() const override { return false; }
100 virtual bool hasLineIfEmpty() const OVERRIDE { return true; } 100 virtual bool hasLineIfEmpty() const override { return true; }
101 }; 101 };
102 102
103 } 103 }
104 104
105 #endif 105 #endif
OLDNEW
« 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