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

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

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated css-properties-as-js-properties.html layout test expectations to match new properties. Created 7 years, 7 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/RenderObject.cpp ('k') | Source/core/rendering/RootInlineBox.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) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 LayoutUnit logicalTopLayoutOverflow() const 175 LayoutUnit logicalTopLayoutOverflow() const
176 { 176 {
177 return InlineFlowBox::logicalTopLayoutOverflow(lineTop()); 177 return InlineFlowBox::logicalTopLayoutOverflow(lineTop());
178 } 178 }
179 LayoutUnit logicalBottomLayoutOverflow() const 179 LayoutUnit logicalBottomLayoutOverflow() const
180 { 180 {
181 return InlineFlowBox::logicalBottomLayoutOverflow(lineBottom()); 181 return InlineFlowBox::logicalBottomLayoutOverflow(lineBottom());
182 } 182 }
183 183
184 #if ENABLE(CSS3_TEXT)
185 // Used to calculate the underline offset for TextUnderlinePositionUnder. 184 // Used to calculate the underline offset for TextUnderlinePositionUnder.
186 float maxLogicalTop() const { return m_maxLogicalTop; } 185 float maxLogicalTop() const { return m_maxLogicalTop; }
187 #endif // CSS3_TEXT
188 186
189 Node* getLogicalStartBoxWithNode(InlineBox*&) const; 187 Node* getLogicalStartBoxWithNode(InlineBox*&) const;
190 Node* getLogicalEndBoxWithNode(InlineBox*&) const; 188 Node* getLogicalEndBoxWithNode(InlineBox*&) const;
191 189
192 #ifndef NDEBUG 190 #ifndef NDEBUG
193 virtual const char* boxName() const; 191 virtual const char* boxName() const;
194 #endif 192 #endif
195 private: 193 private:
196 LayoutUnit lineSnapAdjustment(LayoutUnit delta = 0) const; 194 LayoutUnit lineSnapAdjustment(LayoutUnit delta = 0) const;
197 195
(...skipping 15 matching lines...) Expand all
213 // we can create an InlineIterator beginning just after the end of this line . 211 // we can create an InlineIterator beginning just after the end of this line .
214 RenderObject* m_lineBreakObj; 212 RenderObject* m_lineBreakObj;
215 RefPtr<BidiContext> m_lineBreakContext; 213 RefPtr<BidiContext> m_lineBreakContext;
216 214
217 LayoutUnit m_lineTop; 215 LayoutUnit m_lineTop;
218 LayoutUnit m_lineBottom; 216 LayoutUnit m_lineBottom;
219 217
220 LayoutUnit m_lineTopWithLeading; 218 LayoutUnit m_lineTopWithLeading;
221 LayoutUnit m_lineBottomWithLeading; 219 LayoutUnit m_lineBottomWithLeading;
222 220
223 #if ENABLE(CSS3_TEXT)
224 // Maximum logicalTop among all children of an InlineFlowBox. Used to 221 // Maximum logicalTop among all children of an InlineFlowBox. Used to
225 // calculate the offset for TextUnderlinePositionUnder. 222 // calculate the offset for TextUnderlinePositionUnder.
226 float m_maxLogicalTop; 223 float m_maxLogicalTop;
eseidel 2013/05/10 17:31:40 So every Linebox now gets 4 bytes bigger, eh? Tha
bruno.abinader 2013/05/10 18:23:14 Lamarque (my colleague who implemented text-underl
227 #endif // CSS3_TEXT
228 224
229 struct LineFragmentationData { 225 struct LineFragmentationData {
230 WTF_MAKE_NONCOPYABLE(LineFragmentationData); WTF_MAKE_FAST_ALLOCATED; 226 WTF_MAKE_NONCOPYABLE(LineFragmentationData); WTF_MAKE_FAST_ALLOCATED;
231 public: 227 public:
232 LineFragmentationData() 228 LineFragmentationData()
233 : m_containingRegion(0) 229 : m_containingRegion(0)
234 , m_paginationStrut(0) 230 , m_paginationStrut(0)
235 , m_paginatedLineWidth(0) 231 , m_paginatedLineWidth(0)
236 , m_isFirstAfterPageBreak(false) 232 , m_isFirstAfterPageBreak(false)
237 { 233 {
(...skipping 11 matching lines...) Expand all
249 OwnPtr<LineFragmentationData> m_fragmentationData; 245 OwnPtr<LineFragmentationData> m_fragmentationData;
250 246
251 // Floats hanging off the line are pushed into this vector during layout. It is only 247 // Floats hanging off the line are pushed into this vector during layout. It is only
252 // good for as long as the line has not been marked dirty. 248 // good for as long as the line has not been marked dirty.
253 OwnPtr<Vector<RenderBox*> > m_floats; 249 OwnPtr<Vector<RenderBox*> > m_floats;
254 }; 250 };
255 251
256 } // namespace WebCore 252 } // namespace WebCore
257 253
258 #endif // RootInlineBox_h 254 #endif // RootInlineBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698