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

Side by Side Diff: Source/core/rendering/RenderTextControl.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 28 matching lines...) Expand all
39 protected: 39 protected:
40 RenderTextControl(HTMLTextFormControlElement*); 40 RenderTextControl(HTMLTextFormControlElement*);
41 41
42 // This convenience function should not be made public because 42 // This convenience function should not be made public because
43 // innerEditorElement may outlive the render tree. 43 // innerEditorElement may outlive the render tree.
44 HTMLElement* innerEditorElement() const; 44 HTMLElement* innerEditorElement() const;
45 45
46 int scrollbarThickness() const; 46 int scrollbarThickness() const;
47 void adjustInnerEditorStyle(RenderStyle* textBlockStyle) const; 47 void adjustInnerEditorStyle(RenderStyle* textBlockStyle) const;
48 48
49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
50 50
51 void hitInnerEditorElement(HitTestResult&, const LayoutPoint& pointInContain er, const LayoutPoint& accumulatedOffset); 51 void hitInnerEditorElement(HitTestResult&, const LayoutPoint& pointInContain er, const LayoutPoint& accumulatedOffset);
52 52
53 int textBlockLogicalWidth() const; 53 int textBlockLogicalWidth() const;
54 int textBlockLogicalHeight() const; 54 int textBlockLogicalHeight() const;
55 55
56 float scaleEmToUnits(int x) const; 56 float scaleEmToUnits(int x) const;
57 57
58 static bool hasValidAvgCharWidth(AtomicString family); 58 static bool hasValidAvgCharWidth(AtomicString family);
59 virtual float getAvgCharWidth(AtomicString family); 59 virtual float getAvgCharWidth(AtomicString family);
60 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0; 60 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
61 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0; 61 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0;
62 62
63 virtual void updateFromElement() OVERRIDE; 63 virtual void updateFromElement() override;
64 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE; 64 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override;
65 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE; 65 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) override;
66 66
67 // We need to override this function because we don't want overflow:hidden o n an <input> 67 // We need to override this function because we don't want overflow:hidden o n an <input>
68 // to affect the baseline calculation. This is necessary because we are an i nline-block 68 // to affect the baseline calculation. This is necessary because we are an i nline-block
69 // element as an implementation detail which would normally be affected by t his. 69 // element as an implementation detail which would normally be affected by t his.
70 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); } 70 virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); }
71 71
72 private: 72 private:
73 virtual const char* renderName() const OVERRIDE { return "RenderTextControl" ; } 73 virtual const char* renderName() const override { return "RenderTextControl" ; }
74 virtual bool isTextControl() const OVERRIDE FINAL { return true; } 74 virtual bool isTextControl() const override final { return true; }
75 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE FINAL; 75 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override final;
76 virtual void computePreferredLogicalWidths() OVERRIDE FINAL; 76 virtual void computePreferredLogicalWidths() override final;
77 virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE FINAL { } 77 virtual void removeLeftoverAnonymousBlock(RenderBlock*) override final { }
78 virtual bool avoidsFloats() const OVERRIDE FINAL { return true; } 78 virtual bool avoidsFloats() const override final { return true; }
79 virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; } 79 virtual bool canHaveGeneratedChildren() const override final { return false; }
80 80
81 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE FINAL; 81 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override final;
82 82
83 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE FINAL; 83 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const override final;
84 84
85 virtual bool canBeProgramaticallyScrolled() const OVERRIDE FINAL { return tr ue; } 85 virtual bool canBeProgramaticallyScrolled() const override final { return tr ue; }
86 }; 86 };
87 87
88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControl, isTextControl()); 88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControl, isTextControl());
89 89
90 // Renderer for our inner container, for <search> and others. 90 // Renderer for our inner container, for <search> and others.
91 // We can't use RenderFlexibleBox directly, because flexboxes have a different 91 // We can't use RenderFlexibleBox directly, because flexboxes have a different
92 // baseline definition, and then inputs of different types wouldn't line up 92 // baseline definition, and then inputs of different types wouldn't line up
93 // anymore. 93 // anymore.
94 class RenderTextControlInnerContainer FINAL : public RenderFlexibleBox { 94 class RenderTextControlInnerContainer final : public RenderFlexibleBox {
95 public: 95 public:
96 explicit RenderTextControlInnerContainer(Element* element) 96 explicit RenderTextControlInnerContainer(Element* element)
97 : RenderFlexibleBox(element) 97 : RenderFlexibleBox(element)
98 { } 98 { }
99 virtual ~RenderTextControlInnerContainer() { } 99 virtual ~RenderTextControlInnerContainer() { }
100 100
101 virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDire ctionMode direction, LinePositionMode position) const OVERRIDE 101 virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDire ctionMode direction, LinePositionMode position) const override
102 { 102 {
103 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition); 103 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);
104 } 104 }
105 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); } 105 virtual int firstLineBoxBaseline() const override { return RenderBlock::firs tLineBoxBaseline(); }
106 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); } 106 virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); }
107 }; 107 };
108 108
109 109
110 } // namespace blink 110 } // namespace blink
111 111
112 #endif // RenderTextControl_h 112 #endif // RenderTextControl_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/core/rendering/RenderTextControlMultiLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698