OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 child->clearKnownToHaveNoOverflow(); | 170 child->clearKnownToHaveNoOverflow(); |
171 } | 171 } |
172 | 172 |
173 if (knownToHaveNoOverflow() && child->isInlineFlowBox() && !toInlineFlow
Box(child)->knownToHaveNoOverflow()) | 173 if (knownToHaveNoOverflow() && child->isInlineFlowBox() && !toInlineFlow
Box(child)->knownToHaveNoOverflow()) |
174 clearKnownToHaveNoOverflow(); | 174 clearKnownToHaveNoOverflow(); |
175 } | 175 } |
176 | 176 |
177 checkConsistency(); | 177 checkConsistency(); |
178 } | 178 } |
179 | 179 |
180 void InlineFlowBox::removeChild(InlineBox* child) | 180 void InlineFlowBox::removeChild(InlineBox* child, MarkLineBoxes markDirty) |
181 { | 181 { |
182 checkConsistency(); | 182 checkConsistency(); |
183 | 183 |
184 if (!isDirty()) | 184 if (markDirty == MarkLineBoxesDirty && !isDirty()) |
185 dirtyLineBoxes(); | 185 dirtyLineBoxes(); |
186 | 186 |
187 root().childRemoved(child); | 187 root().childRemoved(child); |
188 | 188 |
189 if (child == m_firstChild) | 189 if (child == m_firstChild) |
190 m_firstChild = child->nextOnLine(); | 190 m_firstChild = child->nextOnLine(); |
191 if (child == m_lastChild) | 191 if (child == m_lastChild) |
192 m_lastChild = child->prevOnLine(); | 192 m_lastChild = child->prevOnLine(); |
193 if (child->nextOnLine()) | 193 if (child->nextOnLine()) |
194 child->nextOnLine()->setPrevOnLine(child->prevOnLine()); | 194 child->nextOnLine()->setPrevOnLine(child->prevOnLine()); |
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1656 ASSERT(child->prevOnLine() == prev); | 1656 ASSERT(child->prevOnLine() == prev); |
1657 prev = child; | 1657 prev = child; |
1658 } | 1658 } |
1659 ASSERT(prev == m_lastChild); | 1659 ASSERT(prev == m_lastChild); |
1660 #endif | 1660 #endif |
1661 } | 1661 } |
1662 | 1662 |
1663 #endif | 1663 #endif |
1664 | 1664 |
1665 } // namespace WebCore | 1665 } // namespace WebCore |
OLD | NEW |