Look at all continuations, not just in-flows, when tracking frames sharing a background image. bug=411046, r+sr=roc

This commit is contained in:
uriber@gmail.com 2008-01-09 11:19:49 -08:00
Родитель b8083290f1
Коммит db8f1e5d62
1 изменённых файлов: 5 добавлений и 5 удалений

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

@ -157,9 +157,9 @@ protected:
{
NS_PRECONDITION(aFrame, "Need a frame");
nsIFrame *prevInFlow = aFrame->GetPrevInFlow();
nsIFrame *prevContinuation = aFrame->GetPrevContinuation();
if (!prevInFlow || mFrame != prevInFlow) {
if (!prevContinuation || mFrame != prevContinuation) {
// Ok, we've got the wrong frame. We have to start from scratch.
Reset();
Init(aFrame);
@ -177,14 +177,14 @@ protected:
{
// Start with the previous flow frame as our continuation point
// is the total of the widths of the previous frames.
nsIFrame* inlineFrame = aFrame->GetPrevInFlow();
nsIFrame* inlineFrame = aFrame->GetPrevContinuation();
while (inlineFrame) {
nsRect rect = inlineFrame->GetRect();
mContinuationPoint += rect.width;
mUnbrokenWidth += rect.width;
mBoundingBox.UnionRect(mBoundingBox, rect);
inlineFrame = inlineFrame->GetPrevInFlow();
inlineFrame = inlineFrame->GetPrevContinuation();
}
// Next add this frame and subsequent frames to the bounding box and
@ -194,7 +194,7 @@ protected:
nsRect rect = inlineFrame->GetRect();
mUnbrokenWidth += rect.width;
mBoundingBox.UnionRect(mBoundingBox, rect);
inlineFrame = inlineFrame->GetNextInFlow();
inlineFrame = inlineFrame->GetNextContinuation();
}
mFrame = aFrame;