Land the relevant parts of bug 534082. r=tnikkel sr=roc a1.9.2.2=dveditz
authorL. David Baron <dbaron@dbaron.org>
Fri, 05 Feb 2010 14:20:24 -0800
changeset 33566 7580a8c2033deed591422615b2d4e438d85bea0e
parent 33565 0997309eb779b4c6a8046349fdc69792923a9f36
child 33567 525d26b5910440670c4e1f83e4978fa56c787ee8
push id1048
push userdbaron@mozilla.com
push dateFri, 05 Feb 2010 22:21:50 +0000
reviewerstnikkel, roc
bugs534082
milestone1.9.2.2pre
Land the relevant parts of bug 534082. r=tnikkel sr=roc a1.9.2.2=dveditz
layout/generic/nsBlockFrame.cpp
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -5731,24 +5731,24 @@ nsBlockFrame::StealFrame(nsPresContext* 
            line->MarkDirty();
         }
         else {
           // Remove the line box
           nsLineBox* lineBox = line;
           if (searchingOverflowList) {
             // Erase line, but avoid making the overflow line list empty
             nsLineList* lineList = RemoveOverflowLines();
-            lineList->erase(line);
+            line = lineList->erase(line);
             if (!lineList->empty()) {
               nsresult rv = SetOverflowLines(lineList);
               NS_ENSURE_SUCCESS(rv, rv);
             }
           }
           else {
-            mLines.erase(line);
+            line = mLines.erase(line);
           }
           lineBox->Destroy(aPresContext->PresShell());
           if (line != line_end) {
             // Line disappeared, so tell next line it may have to change position
             line->MarkPreviousMarginDirty();
           }
         }