wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Test for next-continuations before doing bidi resolution. Bug 704837, r=roc

Browse Source
This commit is contained in:
Simon Montagu 2011-11-24 16:16:42 +02:00
parent c76f9e1244
commit fca010f86c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsBidiPresUtils.cpp
View File

@ -1107,11 +1107,21 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
// css "unicode-bidi: isolate" and html5 bdi:
// resolve the element as a separate paragraph
BidiParagraphData* subParagraph = aBpd->GetSubParagraph();
/*
* As at the beginning of the loop, it's important to check for
* next-continuations before handling the frame. If we do
* TraverseFrames and *then* do GetNextContinuation on the original
* first frame, it could return a bidi continuation that had only
* just been created, and we would skip doing bidi resolution on the
* last part of the sub-paragraph.
*/
bool isLastContinuation = !frame->GetNextContinuation();
if (!frame->GetPrevContinuation()) {
subParagraph->Reset(kid, aBpd);
}
TraverseFrames(aBlockFrame, aLineIter, kid, subParagraph);
if (!frame->GetNextContinuation()) {
if (isLastContinuation) {
ResolveParagraph(aBlockFrame, subParagraph);
}