Make continuations non-fluid when the end of a bidi paragraph is forced by a preformatted newline. Bug 698335, r=roc

2012-01-15 06:56:04 -08:00 · 2012-01-15 06:56:04 -08:00 · 3e9552b5a9
--- a/layout/base/crashtests/698335.html
+++ b/layout/base/crashtests/698335.html
@ -0,0 +1,2 @@
+<!DOCTYPE html><html style="white-space: pre-wrap; direction: rtl; -moz-column-width: 1px;"><style style="display: none;">.fl:first-letter { }</style><body class="fl">&#xD288;&#x062A;
+D</body></html>
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@ -345,4 +345,5 @@ load 670226.html
 asserts(2) load 675246-1.xhtml # Bug 675713
 load 691118-1.html
 load 695861.html
+load 698335.html
 load 707098.html
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@ -820,11 +820,11 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame,
                                     frameIndex, newIndex, lineOffset);
            }
          } else if (runLength == fragmentLength &&
-                     numRun + 1 < runCount) {
+                     frame->GetNextSibling()) {
            /*
             * If the directional run ends at the end of the frame, and this is
-             * not the end of our paragraph, make sure that the next frame is a
-             * non-fluid continuation
+             * not the containing frame's last child, make sure that the next
+             * frame is a non-fluid continuation
             */
            nsIFrame* next = frame->GetNextInFlow();
            if (next) {