Commit cea4f2df authored by darin's avatar darin

- rolled out Beth's RenderFlow::destroy change, which broke 5 editing tests

        * rendering/RenderFlow.cpp: (WebCore::RenderFlow::destroy):
        Used svn merge to roll the change out.



git-svn-id: svn://svn.chromium.org/blink/trunk@18696 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b30006bb
2007-01-08 Darin Adler <darin@apple.com>
- rolled out Beth's RenderFlow::destroy change, which broke 5 editing tests
* rendering/RenderFlow.cpp: (WebCore::RenderFlow::destroy):
Used svn merge to roll the change out.
2007-01-09 Mark Rowe <mrowe@apple.com> 2007-01-09 Mark Rowe <mrowe@apple.com>
Reviewed by Tim H. Reviewed by Tim H.
......
...@@ -201,8 +201,11 @@ void RenderFlow::destroy() ...@@ -201,8 +201,11 @@ void RenderFlow::destroy()
// that will outlast this block. In the non-anonymous block case those // that will outlast this block. In the non-anonymous block case those
// children will be destroyed by the time we return from this function. // children will be destroyed by the time we return from this function.
if (isAnonymousBlock()) { if (isAnonymousBlock()) {
for (InlineFlowBox* box = m_firstLineBox; box; box = box->nextFlowBox()) for (InlineFlowBox* box = m_firstLineBox; box; box = box->nextFlowBox()) {
box->deleteLine(renderArena()); while (InlineBox* childBox = box->firstChild()) {
childBox->remove();
}
}
} }
} else if (isInline() && parent()) } else if (isInline() && parent())
parent()->dirtyLinesFromChangedChild(this); parent()->dirtyLinesFromChangedChild(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment