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

This commit is contained in:
Simon Montagu 2012-01-15 06:56:04 -08:00
Родитель 923521efb3
Коммит 3e9552b5a9
3 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -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>

Просмотреть файл

@ -345,4 +345,5 @@ load 670226.html
asserts(2) load 675246-1.xhtml # Bug 675713 asserts(2) load 675246-1.xhtml # Bug 675713
load 691118-1.html load 691118-1.html
load 695861.html load 695861.html
load 698335.html
load 707098.html load 707098.html

Просмотреть файл

@ -820,11 +820,11 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame,
frameIndex, newIndex, lineOffset); frameIndex, newIndex, lineOffset);
} }
} else if (runLength == fragmentLength && } else if (runLength == fragmentLength &&
numRun + 1 < runCount) { frame->GetNextSibling()) {
/* /*
* If the directional run ends at the end of the frame, and this is * 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 * not the containing frame's last child, make sure that the next
* non-fluid continuation * frame is a non-fluid continuation
*/ */
nsIFrame* next = frame->GetNextInFlow(); nsIFrame* next = frame->GetNextInFlow();
if (next) { if (next) {