| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 if (child->nextOnLine()) | 191 if (child->nextOnLine()) |
| 192 child->nextOnLine()->setPrevOnLine(child->prevOnLine()); | 192 child->nextOnLine()->setPrevOnLine(child->prevOnLine()); |
| 193 if (child->prevOnLine()) | 193 if (child->prevOnLine()) |
| 194 child->prevOnLine()->setNextOnLine(child->nextOnLine()); | 194 child->prevOnLine()->setNextOnLine(child->nextOnLine()); |
| 195 | 195 |
| 196 child->setParent(0); | 196 child->setParent(0); |
| 197 | 197 |
| 198 checkConsistency(); | 198 checkConsistency(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 void InlineFlowBox::deleteLine(RenderArena* arena) | 201 void InlineFlowBox::deleteLine() |
| 202 { | 202 { |
| 203 InlineBox* child = firstChild(); | 203 InlineBox* child = firstChild(); |
| 204 InlineBox* next = 0; | 204 InlineBox* next = 0; |
| 205 while (child) { | 205 while (child) { |
| 206 ASSERT(this == child->parent()); | 206 ASSERT(this == child->parent()); |
| 207 next = child->nextOnLine(); | 207 next = child->nextOnLine(); |
| 208 #ifndef NDEBUG | 208 #ifndef NDEBUG |
| 209 child->setParent(0); | 209 child->setParent(0); |
| 210 #endif | 210 #endif |
| 211 child->deleteLine(arena); | 211 child->deleteLine(); |
| 212 child = next; | 212 child = next; |
| 213 } | 213 } |
| 214 #ifndef NDEBUG | 214 #ifndef NDEBUG |
| 215 m_firstChild = 0; | 215 m_firstChild = 0; |
| 216 m_lastChild = 0; | 216 m_lastChild = 0; |
| 217 #endif | 217 #endif |
| 218 | 218 |
| 219 removeLineBoxFromRenderObject(); | 219 removeLineBoxFromRenderObject(); |
| 220 destroy(arena); | 220 destroy(); |
| 221 } | 221 } |
| 222 | 222 |
| 223 void InlineFlowBox::removeLineBoxFromRenderObject() | 223 void InlineFlowBox::removeLineBoxFromRenderObject() |
| 224 { | 224 { |
| 225 toRenderInline(renderer())->lineBoxes()->removeLineBox(this); | 225 toRenderInline(renderer())->lineBoxes()->removeLineBox(this); |
| 226 } | 226 } |
| 227 | 227 |
| 228 void InlineFlowBox::extractLine() | 228 void InlineFlowBox::extractLine() |
| 229 { | 229 { |
| 230 if (!extracted()) | 230 if (!extracted()) |
| (...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 ASSERT(child->prevOnLine() == prev); | 1635 ASSERT(child->prevOnLine() == prev); |
| 1636 prev = child; | 1636 prev = child; |
| 1637 } | 1637 } |
| 1638 ASSERT(prev == m_lastChild); | 1638 ASSERT(prev == m_lastChild); |
| 1639 #endif | 1639 #endif |
| 1640 } | 1640 } |
| 1641 | 1641 |
| 1642 #endif | 1642 #endif |
| 1643 | 1643 |
| 1644 } // namespace WebCore | 1644 } // namespace WebCore |
| OLD | NEW |