Zero the saved frame when creating a new line iterator for a new column. Bug 695861, r=roc

2011-11-03 11:35:04 +02:00 · 2011-11-03 11:35:04 +02:00 · 50ed6f94a5
--- a/layout/base/crashtests/695861.html
+++ b/layout/base/crashtests/695861.html
@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body onload="document.documentElement.offsetHeight; document.getElementById('s').style.textTransform='uppercase'; document.documentElement.offsetHeight; ">
+
+<div style="white-space: pre-wrap; -moz-column-count: 2;"><span id="s" style="unicode-bidi: -moz-isolate;">
+ <div style="direction: rtl;"></div></span></div>
+
+</body>
+</html>
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@ -343,3 +343,4 @@ load 665837.html
 load 668941.xhtml
 load 670226.html
 asserts(2) load 675246-1.xhtml # Bug 675713
+load 695861.html
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@ -643,6 +643,7 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
    block->RemoveStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
    nsBlockInFlowLineIterator lineIter(block, block->begin_lines(), false);
    bpd.mPrevFrame = nsnull;
+    bpd.GetSubParagraph()->mPrevFrame = nsnull;
    TraverseFrames(aBlockFrame, &lineIter, block->GetFirstPrincipalChild(), &bpd);
  }