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

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

Issue 1065783002: Remove legacy markup box behavior when line-clamping. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename new layout test to reflect intent. Created 5 years, 8 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/EllipsisBox.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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 unsigned lineBreakPos() const { return m_lineBreakPos; } 86 unsigned lineBreakPos() const { return m_lineBreakPos; }
87 void setLineBreakPos(unsigned p) { m_lineBreakPos = p; } 87 void setLineBreakPos(unsigned p) { m_lineBreakPos = p; }
88 88
89 using InlineBox::endsWithBreak; 89 using InlineBox::endsWithBreak;
90 using InlineBox::setEndsWithBreak; 90 using InlineBox::setEndsWithBreak;
91 91
92 void childRemoved(InlineBox*); 92 void childRemoved(InlineBox*);
93 93
94 bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, in t ellipsisWidth); 94 bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, in t ellipsisWidth);
95 // Return the truncatedWidth, the width of the truncated text + ellipsis. 95 // Return the truncatedWidth, the width of the truncated text + ellipsis.
96 FloatWillBeLayoutUnit placeEllipsis(const AtomicString& ellipsisStr, bool lt r, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, Fl oatWillBeLayoutUnit ellipsisWidth, InlineBox* markupBox = 0); 96 FloatWillBeLayoutUnit placeEllipsis(const AtomicString& ellipsisStr, bool lt r, FloatWillBeLayoutUnit blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, Fl oatWillBeLayoutUnit ellipsisWidth);
97 // Return the position of the EllipsisBox or -1. 97 // Return the position of the EllipsisBox or -1.
98 virtual FloatWillBeLayoutUnit placeEllipsisBox(bool ltr, FloatWillBeLayoutUn it blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit el lipsisWidth, FloatWillBeLayoutUnit &truncatedWidth, bool& foundBox) override fin al; 98 virtual FloatWillBeLayoutUnit placeEllipsisBox(bool ltr, FloatWillBeLayoutUn it blockLeftEdge, FloatWillBeLayoutUnit blockRightEdge, FloatWillBeLayoutUnit el lipsisWidth, FloatWillBeLayoutUnit &truncatedWidth, bool& foundBox) override fin al;
99 99
100 using InlineBox::hasEllipsisBox; 100 using InlineBox::hasEllipsisBox;
101 EllipsisBox* ellipsisBox() const; 101 EllipsisBox* ellipsisBox() const;
102 102
103 virtual void clearTruncation() override final; 103 virtual void clearTruncation() override final;
104 104
105 virtual int baselinePosition(FontBaseline baselineType) const override final ; 105 virtual int baselinePosition(FontBaseline baselineType) const override final ;
106 virtual LayoutUnit lineHeight() const override final; 106 virtual LayoutUnit lineHeight() const override final;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 LayoutUnit m_lineBottom; 197 LayoutUnit m_lineBottom;
198 LayoutUnit m_lineTopWithLeading; 198 LayoutUnit m_lineTopWithLeading;
199 LayoutUnit m_lineBottomWithLeading; 199 LayoutUnit m_lineBottomWithLeading;
200 LayoutUnit m_selectionBottom; 200 LayoutUnit m_selectionBottom;
201 LayoutUnit m_paginationStrut; 201 LayoutUnit m_paginationStrut;
202 }; 202 };
203 203
204 } // namespace blink 204 } // namespace blink
205 205
206 #endif // RootInlineBox_h 206 #endif // RootInlineBox_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/EllipsisBox.cpp ('k') | Source/core/layout/line/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698