Backing out bug 151375 for now, because of scrolling regressions in HTML and XUL listboxes and comboboxes
git-svn-id: svn://10.0.0.236/trunk@159268 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -3008,14 +3008,21 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
|
||||
combinedAreaResult.UnionRect(combinedAreaResult, *r + origin);
|
||||
}
|
||||
|
||||
aCombinedArea = combinedAreaResult;
|
||||
|
||||
// If we just computed a spans combined area, we need to update its
|
||||
// NS_FRAME_OUTSIDE_CHILDREN bit..
|
||||
if (psd->mFrame) {
|
||||
PerFrameData* spanPFD = psd->mFrame;
|
||||
nsIFrame* frame = spanPFD->mFrame;
|
||||
frame->FinishAndStoreOverflow(&combinedAreaResult, frame->GetSize());
|
||||
if ((combinedAreaResult.x < 0) || (combinedAreaResult.y < 0) ||
|
||||
(combinedAreaResult.XMost() > spanPFD->mBounds.width) ||
|
||||
(combinedAreaResult.YMost() > spanPFD->mBounds.height)) {
|
||||
frame->AddStateBits(NS_FRAME_OUTSIDE_CHILDREN);
|
||||
} else {
|
||||
frame->RemoveStateBits(NS_FRAME_OUTSIDE_CHILDREN);
|
||||
}
|
||||
}
|
||||
aCombinedArea = combinedAreaResult;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user