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

Side by Side Diff: Source/core/layout/line/RootInlineBox.h

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 years, 3 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/layout/line/InlineFlowBox.cpp ('k') | Source/core/layout/line/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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 FontBaseline baselineType() const { return static_cast<FontBaseline>(m_basel ineType); } 141 FontBaseline baselineType() const { return static_cast<FontBaseline>(m_basel ineType); }
142 142
143 bool hasAnnotationsBefore() const { return m_hasAnnotationsBefore; } 143 bool hasAnnotationsBefore() const { return m_hasAnnotationsBefore; }
144 bool hasAnnotationsAfter() const { return m_hasAnnotationsAfter; } 144 bool hasAnnotationsAfter() const { return m_hasAnnotationsAfter; }
145 145
146 LayoutRect paddedLayoutOverflowRect(LayoutUnit endPadding) const; 146 LayoutRect paddedLayoutOverflowRect(LayoutUnit endPadding) const;
147 147
148 void ascentAndDescentForBox(InlineBox*, GlyphOverflowAndFallbackFontsMap&, i nt& ascent, int& descent, bool& affectsAscent, bool& affectsDescent) const; 148 void ascentAndDescentForBox(InlineBox*, GlyphOverflowAndFallbackFontsMap&, i nt& ascent, int& descent, bool& affectsAscent, bool& affectsDescent) const;
149 LayoutUnit verticalPositionForBox(InlineBox*, VerticalPositionCache&); 149 LayoutUnit verticalPositionForBox(InlineBox*, VerticalPositionCache&);
150 bool includeLeadingForBox(InlineBox*) const; 150 bool includeLeadingForBox(InlineBox*) const;
151 bool includeFontForBox(InlineBox*) const;
152 bool includeGlyphsForBox(InlineBox*) const;
153 bool includeMarginForBox(InlineBox*) const;
154 bool fitsToGlyphs() const;
155 151
156 LayoutUnit logicalTopVisualOverflow() const 152 LayoutUnit logicalTopVisualOverflow() const
157 { 153 {
158 return InlineFlowBox::logicalTopVisualOverflow(lineTop()); 154 return InlineFlowBox::logicalTopVisualOverflow(lineTop());
159 } 155 }
160 LayoutUnit logicalBottomVisualOverflow() const 156 LayoutUnit logicalBottomVisualOverflow() const
161 { 157 {
162 return InlineFlowBox::logicalBottomVisualOverflow(lineBottom()); 158 return InlineFlowBox::logicalBottomVisualOverflow(lineBottom());
163 } 159 }
164 LayoutUnit logicalTopLayoutOverflow() const 160 LayoutUnit logicalTopLayoutOverflow() const
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 LayoutUnit m_lineBottom; 193 LayoutUnit m_lineBottom;
198 LayoutUnit m_lineTopWithLeading; 194 LayoutUnit m_lineTopWithLeading;
199 LayoutUnit m_lineBottomWithLeading; 195 LayoutUnit m_lineBottomWithLeading;
200 LayoutUnit m_selectionBottom; 196 LayoutUnit m_selectionBottom;
201 LayoutUnit m_paginationStrut; 197 LayoutUnit m_paginationStrut;
202 }; 198 };
203 199
204 } // namespace blink 200 } // namespace blink
205 201
206 #endif // RootInlineBox_h 202 #endif // RootInlineBox_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/InlineFlowBox.cpp ('k') | Source/core/layout/line/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698