equal
deleted
inserted
replaced
1045 |
1045 |
1046 // FIXME: should not be needed!!! |
1046 // FIXME: should not be needed!!! |
1047 if (!s->len()) { |
1047 if (!s->len()) { |
1048 // We want the box to be destroyed. |
1048 // We want the box to be destroyed. |
1049 s->remove(); |
1049 s->remove(); |
|
1050 if (m_firstTextBox == s) |
|
1051 m_firstTextBox = s->nextTextBox(); |
|
1052 else |
|
1053 s->prevTextBox()->setNextLineBox(s->nextTextBox()); |
|
1054 if (m_lastTextBox == s) |
|
1055 m_lastTextBox = s->prevTextBox(); |
|
1056 else |
|
1057 s->nextTextBox()->setPreviousLineBox(s->prevTextBox()); |
1050 s->destroy(renderArena()); |
1058 s->destroy(renderArena()); |
1051 m_firstTextBox = m_lastTextBox = 0; |
|
1052 return; |
1059 return; |
1053 } |
1060 } |
1054 |
1061 |
1055 m_containsReversedText |= s->direction() == RTL; |
1062 m_containsReversedText |= s->direction() == RTL; |
1056 } |
1063 } |
1347 void RenderText::checkConsistency() const |
1354 void RenderText::checkConsistency() const |
1348 { |
1355 { |
1349 #ifdef CHECK_CONSISTENCY |
1356 #ifdef CHECK_CONSISTENCY |
1350 const InlineTextBox* prev = 0; |
1357 const InlineTextBox* prev = 0; |
1351 for (const InlineTextBox* child = m_firstTextBox; child != 0; child = child->nextTextBox()) { |
1358 for (const InlineTextBox* child = m_firstTextBox; child != 0; child = child->nextTextBox()) { |
1352 ASSERT(child->object() == this); |
1359 ASSERT(child->renderer() == this); |
1353 ASSERT(child->prevTextBox() == prev); |
1360 ASSERT(child->prevTextBox() == prev); |
1354 prev = child; |
1361 prev = child; |
1355 } |
1362 } |
1356 ASSERT(prev == m_lastTextBox); |
1363 ASSERT(prev == m_lastTextBox); |
1357 #endif |
1364 #endif |