Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change RemoveBidiContinuation() to convert bidi continuations into in-flows instead of actually remove them, in attempt to impreove performance. bug=319930 r=smontagu sr=bzbarsky

Browse Source
This commit is contained in:
uriber%gmail.com 2006-03-08 09:02:42 +00:00
parent ff871e206d
commit 01ef33157a
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
layout/base/nsBidiPresUtils.cpp
View File

@ -204,8 +204,8 @@ CreateBidiContinuation(nsPresContext* aPresContext,
* The rendering layer requires each text frame to contain text in only one
* direction and of only one character type, so we may need to call
* EnsureBidiContinuation() to split frames. We may also need to call
* RemoveBidiContinuation() to delete frames created by
* EnsureBidiContinuation() in previous reflows.
* RemoveBidiContinuation() to convert frames created by
* EnsureBidiContinuation() in previous reflows into fluid continuations.
*/
nsresult
nsBidiPresUtils::Resolve(nsPresContext* aPresContext,
@ -746,33 +746,31 @@ nsBidiPresUtils::RemoveBidiContinuation(nsPresContext* aPresContext,
PRInt32 aLastIndex,
PRInt32& aOffset) const
{
nsIFrame* frame;
PRInt32 index;
aOffset = 0;
for (index = aLastIndex; index > aFirstIndex; index--) {
frame = (nsIFrame*) mLogicalFrames[index];
for (PRInt32 index = aFirstIndex + 1; index <= aLastIndex; index++) {
nsIFrame* frame = (nsIFrame*) mLogicalFrames[index];
if (nsLayoutAtoms::directionalFrame == frame->GetType()) {
frame->Destroy(aPresContext);
++aOffset;
}
else {
if (frame->GetStateBits() & NS_FRAME_IS_BIDI) {
// only delete Bidi frames
nsIFrame* parent = frame->GetParent();
parent->RemoveFrame(nsLayoutAtoms::nextBidi, frame);
// Make parent continuations fluid, so they can be
// reused or deleted by inline reflow code
while (parent) {
nsIFrame* parentPrev = parent->GetPrevContinuation();
if (parentPrev) {
parent->SetPrevInFlow(parentPrev);
parentPrev->SetNextInFlow(parent);
parent = parent->GetParent();
} else {
break;
}
// Make the frame and its continuation ancestors fluid,
// so they can be reused or deleted by normal reflow code
while (frame) {
nsIFrame* prev = frame->GetPrevContinuation();
if (prev) {
NS_ASSERTION (!frame->GetPrevInFlow() || frame->GetPrevInFlow() == prev,
"prev-in-flow is not prev continuation!");
frame->SetPrevInFlow(prev);
NS_ASSERTION (!prev->GetNextInFlow() || prev->GetNextInFlow() == frame,
"next-in-flow is not next continuation!");
prev->SetNextInFlow(frame);
frame = frame->GetParent();
} else {
break;
}
}
}

4
layout/base/nsBidiPresUtils.h
View File

@ -226,8 +226,8 @@ private:
/**
* Helper method for Resolve()
* Delete one or more bidi continuation frames created in a previous reflow by
* EnsureBidiContinuation().
* Convert one or more bidi continuation frames created in a previous reflow by
* EnsureBidiContinuation() into fluid continuations.
* @param aPresContext the pres context
* @param aFrame the frame whose continuations are to be removed
* @param aFirstIndex index of aFrame in mLogicalFrames