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

Side by Side Diff: Source/core/rendering/RenderInline.h

Issue 137943002: Update more core classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
33 33
34 class RenderInline : public RenderBoxModelObject { 34 class RenderInline : public RenderBoxModelObject {
35 public: 35 public:
36 explicit RenderInline(Element*); 36 explicit RenderInline(Element*);
37 37
38 static RenderInline* createAnonymous(Document*); 38 static RenderInline* createAnonymous(Document*);
39 39
40 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 40 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
41 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); } 41 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); }
42 42
43 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ; 43 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
44 44
45 Element* node() const { return toElement(RenderBoxModelObject::node()); } 45 Element* node() const { return toElement(RenderBoxModelObject::node()); }
46 46
47 virtual LayoutUnit marginLeft() const OVERRIDE FINAL; 47 virtual LayoutUnit marginLeft() const OVERRIDE FINAL;
48 virtual LayoutUnit marginRight() const OVERRIDE FINAL; 48 virtual LayoutUnit marginRight() const OVERRIDE FINAL;
49 virtual LayoutUnit marginTop() const OVERRIDE FINAL; 49 virtual LayoutUnit marginTop() const OVERRIDE FINAL;
50 virtual LayoutUnit marginBottom() const OVERRIDE FINAL; 50 virtual LayoutUnit marginBottom() const OVERRIDE FINAL;
51 virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const OVE RRIDE FINAL; 51 virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const OVE RRIDE FINAL;
52 virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const OVER RIDE FINAL; 52 virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const OVER RIDE FINAL;
53 virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const OVER RIDE FINAL; 53 virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const OVER RIDE FINAL;
54 virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const OVERRI DE FINAL; 54 virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const OVERRI DE FINAL;
55 55
56 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const OVERRIDE FINAL; 56 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const OVERRIDE FINAL;
57 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 57 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRID E;
58 58
59 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bo ol* offsetDependsOnPoint = 0) const OVERRIDE FINAL; 59 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bo ol* offsetDependsOnPoint = 0) const OVERRIDE FINAL;
60 60
61 IntRect linesBoundingBox() const; 61 IntRect linesBoundingBox() const;
62 LayoutRect linesVisualOverflowBoundingBox() const; 62 LayoutRect linesVisualOverflowBoundingBox() const;
63 63
64 InlineFlowBox* createAndAppendInlineFlowBox(); 64 InlineFlowBox* createAndAppendInlineFlowBox();
65 65
66 void dirtyLineBoxes(bool fullLayout); 66 void dirtyLineBoxes(bool fullLayout);
67 void deleteLineBoxTree(); 67 void deleteLineBoxTree();
(...skipping 117 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/RenderImage.h ('k') | Source/core/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698