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

Side by Side Diff: Source/core/rendering/RenderInline.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 bool alwaysCreateLineBoxes() const { return m_alwaysCreateLineBoxes; } 90 bool alwaysCreateLineBoxes() const { return m_alwaysCreateLineBoxes; }
91 void setAlwaysCreateLineBoxes() { m_alwaysCreateLineBoxes = true; } 91 void setAlwaysCreateLineBoxes() { m_alwaysCreateLineBoxes = true; }
92 void updateAlwaysCreateLineBoxes(bool fullLayout); 92 void updateAlwaysCreateLineBoxes(bool fullLayout);
93 93
94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL; 94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL;
95 95
96 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset); 96 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
97 97
98 protected: 98 protected:
99 virtual void willBeDestroyed(); 99 virtual void willBeDestroyed() OVERRIDE;
100 100
101 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 101 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
102 102
103 virtual void computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point& layerOffset) const OVERRIDE; 103 virtual void computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point& layerOffset) const OVERRIDE;
104 104
105 private: 105 private:
106 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); } 106 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return chi ldren(); }
107 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 107 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
108 const RenderObjectChildList* children() const { return &m_children; } 108 const RenderObjectChildList* children() const { return &m_children; }
109 RenderObjectChildList* children() { return &m_children; } 109 RenderObjectChildList* children() { return &m_children; }
110 110
111 virtual const char* renderName() const; 111 virtual const char* renderName() const OVERRIDE;
112 112
113 virtual bool isRenderInline() const OVERRIDE FINAL { return true; } 113 virtual bool isRenderInline() const OVERRIDE FINAL { return true; }
114 114
115 LayoutRect culledInlineVisualOverflowBoundingBox() const; 115 LayoutRect culledInlineVisualOverflowBoundingBox() const;
116 InlineBox* culledInlineFirstLineBox() const; 116 InlineBox* culledInlineFirstLineBox() const;
117 InlineBox* culledInlineLastLineBox() const; 117 InlineBox* culledInlineLastLineBox() const;
118 118
119 template<typename GeneratorContext> 119 template<typename GeneratorContext>
120 void generateLineBoxRects(GeneratorContext& yield) const; 120 void generateLineBoxRects(GeneratorContext& yield) const;
121 template<typename GeneratorContext> 121 template<typename GeneratorContext>
122 void generateCulledLineBoxRects(GeneratorContext& yield, const RenderInline* container) const; 122 void generateCulledLineBoxRects(GeneratorContext& yield, const RenderInline* container) const;
123 123
124 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d); 124 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);
125 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) OVERRIDE FINAL; 125 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) OVERRIDE FINAL;
126 126
127 void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock, 127 void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
128 RenderObject* beforeChild, RenderBoxModelObject* oldCont); 128 RenderObject* beforeChild, RenderBoxModelObject* oldCont);
129 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, 129 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
130 RenderObject* newChild, RenderBoxModelObject* oldCont); 130 RenderObject* newChild, RenderBoxModelObject* oldCont);
131 131
132 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } // Do nothing for layout() 132 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } // Do nothing for layout()
133 133
134 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 134 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
135 135
136 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 136 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL;
137 137
138 virtual LayerType layerTypeRequired() const { return isInFlowPositioned() || createsGroup() || hasClipPath() ? NormalLayer : NoLayer; } 138 virtual LayerType layerTypeRequired() const OVERRIDE { return isInFlowPositi oned() || createsGroup() || hasClipPath() ? NormalLayer : NoLayer; }
139 139
140 virtual LayoutUnit offsetLeft() const OVERRIDE FINAL; 140 virtual LayoutUnit offsetLeft() const OVERRIDE FINAL;
141 virtual LayoutUnit offsetTop() const OVERRIDE FINAL; 141 virtual LayoutUnit offsetTop() const OVERRIDE FINAL;
142 virtual LayoutUnit offsetWidth() const OVERRIDE FINAL { return linesBounding Box().width(); } 142 virtual LayoutUnit offsetWidth() const OVERRIDE FINAL { return linesBounding Box().width(); }
143 virtual LayoutUnit offsetHeight() const OVERRIDE FINAL { return linesBoundin gBox().height(); } 143 virtual LayoutUnit offsetHeight() const OVERRIDE FINAL { return linesBoundin gBox().height(); }
144 144
145 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE; 145 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE;
146 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* r epaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL; 146 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* r epaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL;
147 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed) const OVERRIDE FINAL; 147 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed) const OVERRIDE FINAL;
148 148
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes. 185 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
186 186
187 bool m_alwaysCreateLineBoxes : 1; 187 bool m_alwaysCreateLineBoxes : 1;
188 }; 188 };
189 189
190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline()); 190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
191 191
192 } // namespace WebCore 192 } // namespace WebCore
193 193
194 #endif // RenderInline_h 194 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImageResourceStyleImage.h ('k') | Source/core/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698