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

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

Issue 1296803004: [Line Layout API] Use LineLayoutItem consistently in RootInlineBox::childRemoved (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | « no previous file | no next file » | 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, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 m_lineBottom += blockDirectionDelta; 175 m_lineBottom += blockDirectionDelta;
176 m_lineTopWithLeading += blockDirectionDelta; 176 m_lineTopWithLeading += blockDirectionDelta;
177 m_lineBottomWithLeading += blockDirectionDelta; 177 m_lineBottomWithLeading += blockDirectionDelta;
178 m_selectionBottom += blockDirectionDelta; 178 m_selectionBottom += blockDirectionDelta;
179 if (hasEllipsisBox()) 179 if (hasEllipsisBox())
180 ellipsisBox()->move(delta); 180 ellipsisBox()->move(delta);
181 } 181 }
182 182
183 void RootInlineBox::childRemoved(InlineBox* box) 183 void RootInlineBox::childRemoved(InlineBox* box)
184 { 184 {
185 if (&box->layoutObject() == m_lineBreakObj) 185 if (box->lineLayoutItem() == m_lineBreakObj)
186 setLineBreakInfo(0, 0, BidiStatus()); 186 setLineBreakInfo(0, 0, BidiStatus());
187 187
188 for (RootInlineBox* prev = prevRootBox(); prev && prev->lineBreakObj() == &b ox->layoutObject(); prev = prev->prevRootBox()) { 188 for (RootInlineBox* prev = prevRootBox(); prev && prev->lineBreakObj() == bo x->lineLayoutItem(); prev = prev->prevRootBox()) {
189 prev->setLineBreakInfo(0, 0, BidiStatus()); 189 prev->setLineBreakInfo(0, 0, BidiStatus());
190 prev->markDirty(); 190 prev->markDirty();
191 } 191 }
192 } 192 }
193 193
194 LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G lyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache& vertical PositionCache) 194 LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G lyphOverflowAndFallbackFontsMap& textBoxDataMap, VerticalPositionCache& vertical PositionCache)
195 { 195 {
196 // SVG will handle vertical alignment on its own. 196 // SVG will handle vertical alignment on its own.
197 if (isSVGRootInlineBox()) 197 if (isSVGRootInlineBox())
198 return 0; 198 return 0;
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 endBox = nullptr; 848 endBox = nullptr;
849 return nullptr; 849 return nullptr;
850 } 850 }
851 851
852 const char* RootInlineBox::boxName() const 852 const char* RootInlineBox::boxName() const
853 { 853 {
854 return "RootInlineBox"; 854 return "RootInlineBox";
855 } 855 }
856 856
857 } // namespace blink 857 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698