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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderInline.cpp » ('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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 virtual IntRect borderBoundingBox() const OVERRIDE FINAL 158 virtual IntRect borderBoundingBox() const OVERRIDE FINAL
159 { 159 {
160 IntRect boundingBox = linesBoundingBox(); 160 IntRect boundingBox = linesBoundingBox();
161 return IntRect(0, 0, boundingBox.width(), boundingBox.height()); 161 return IntRect(0, 0, boundingBox.width(), boundingBox.height());
162 } 162 }
163 163
164 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby 164 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
165 165
166 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 166 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
167 167
168 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const OVERRIDE FINAL; 168 virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const OVERRIDE FINAL;
169 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; 169 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
170 170
171 virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL; 171 virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL;
172 172
173 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRID E FINAL; 173 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRID E FINAL;
174 174
175 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE FINA L; 175 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE FINA L;
176 176
177 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) OVERRIDE FIN AL; 177 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) OVERRIDE FIN AL;
178 178
179 virtual void updateFromStyle() OVERRIDE FINAL; 179 virtual void updateFromStyle() OVERRIDE FINAL;
180 180
181 RenderInline* clone() const; 181 RenderInline* clone() const;
182 182
183 void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutR ect& prevLine, const LayoutRect& thisLine, 183 void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutR ect& prevLine, const LayoutRect& thisLine,
184 const LayoutRect& nextLine, const Color); 184 const LayoutRect& nextLine, const Color);
185 RenderBoxModelObject* continuationBefore(RenderObject* beforeChild); 185 RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
186 186
187 RenderObjectChildList m_children; 187 RenderObjectChildList m_children;
188 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. 188 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.
189 189
190 bool m_alwaysCreateLineBoxes : 1; 190 bool m_alwaysCreateLineBoxes : 1;
191 }; 191 };
192 192
193 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline()); 193 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
194 194
195 } // namespace WebCore 195 } // namespace WebCore
196 196
197 #endif // RenderInline_h 197 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698