corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make nsLineLayout track two separate overflow areas. (Bug 542595, patch 7) r=roc a2.0=blocking2.0:beta8

Browse Source
This commit is contained in:
L. David Baron
2010-10-06 21:25:45 -07:00
parent 0a3226e10a
commit 08de77780c
3 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
layout/generic/nsLineLayout.cpp
View File

@@ -957,7 +957,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// descendants' bounds. Nor does it include the outline area; it's
// just the union of the bounds of any absolute children. That is
// added in later by nsLineLayout::ReflowInlineFrames.
pfd->mCombinedArea = metrics.mOverflowArea;
pfd->mOverflowAreas = metrics.mOverflowAreas;
pfd->mBounds.width = metrics.width;
pfd->mBounds.height = metrics.height;
@@ -1364,7 +1364,7 @@ nsLineLayout::AddBulletFrame(nsIFrame* aFrame,
// Note: y value will be updated during vertical alignment
pfd->mBounds = aFrame->GetRect();
pfd->mCombinedArea = aMetrics.mOverflowArea;
pfd->mOverflowAreas = aMetrics.mOverflowAreas;
}
return rv;
}
@@ -2511,19 +2511,19 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
}
void
nsLineLayout::RelativePositionFrames(nsRect& aCombinedArea)
nsLineLayout::RelativePositionFrames(nsOverflowAreas& aOverflowAreas)
{
RelativePositionFrames(mRootSpan, aCombinedArea);
RelativePositionFrames(mRootSpan, aOverflowAreas);
}
void
nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsOverflowAreas& aOverflowAreas)
{
nsRect combinedAreaResult;
nsOverflowAreas overflowAreas;
if (nsnull != psd->mFrame) {
// The span's overflow area comes in three parts:
// The span's overflow areas come in three parts:
// -- this frame's width and height
// -- the pfd->mCombinedArea, which is the area of a bullet or the union
// -- pfd->mOverflowAreas, which is the area of a bullet or the union
// of a relatively positioned frame's absolute children
// -- the bounds of all inline descendants
// The former two parts are computed right here, we gather the descendants
@@ -2533,6 +2533,9 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
// rect instead of mBounds.
nsRect adjustedBounds(nsPoint(0, 0), psd->mFrame->mFrame->GetSize());
overflowAreas.ScrollableOverflow().UnionRect(
psd->mFrame->mOverflowAreas.ScrollableOverflow(), adjustedBounds);
// Text-shadow overflow
if (mPresContext->CompatibilityMode() != eCompatibility_NavQuirks) {
nsRect shadowRect = nsLayoutUtils::GetTextShadowRectsUnion(adjustedBounds,
@@ -2540,19 +2543,24 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
adjustedBounds.UnionRect(adjustedBounds, shadowRect);
}
combinedAreaResult.UnionRect(psd->mFrame->mCombinedArea, adjustedBounds);
// Text shadow is only part of visual overflow and not scrollable overflow.
overflowAreas.VisualOverflow().UnionRect(
psd->mFrame->mOverflowAreas.VisualOverflow(), adjustedBounds);
}
else {
// The minimum combined area for the frames that are direct
// children of the block starts at the upper left corner of the
// line and is sized to match the size of the line's bounding box
// (the same size as the values returned from VerticalAlignFrames)
combinedAreaResult.x = psd->mLeftEdge;
overflowAreas.VisualOverflow().x = psd->mLeftEdge;
// If this turns out to be negative, the rect will be treated as empty.
// Which is just fine.
combinedAreaResult.width = psd->mX - combinedAreaResult.x;
combinedAreaResult.y = mTopEdge;
combinedAreaResult.height = mFinalLineHeight;
overflowAreas.VisualOverflow().width =
psd->mX - overflowAreas.VisualOverflow().x;
overflowAreas.VisualOverflow().y = mTopEdge;
overflowAreas.VisualOverflow().height = mFinalLineHeight;
overflowAreas.ScrollableOverflow() = overflowAreas.VisualOverflow();
}
for (PerFrameData* pfd = psd->mFirstFrame; pfd; pfd = pfd->mNext) {
@@ -2573,27 +2581,26 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
// some views have widgets).
if (frame->HasView())
nsContainerFrame::SyncFrameViewAfterReflow(mPresContext, frame,
frame->GetView(),
&pfd->mCombinedArea, //ignored
NS_FRAME_NO_SIZE_VIEW);
frame->GetView(), pfd->mOverflowAreas.VisualOverflow(),
NS_FRAME_NO_SIZE_VIEW);
// Note: the combined area of a child is in its coordinate
// system. We adjust the childs combined area into our coordinate
// system before computing the aggregated value by adding in
// <b>x</b> and <b>y</b> which were computed above.
nsRect r;
nsOverflowAreas r;
if (pfd->mSpan) {
// Compute a new combined area for the child span before
// aggregating it into our combined area.
RelativePositionFrames(pfd->mSpan, r);
} else {
r = pfd->mCombinedArea;
r = pfd->mOverflowAreas;
if (pfd->GetFlag(PFD_ISTEXTFRAME)) {
if (pfd->GetFlag(PFD_RECOMPUTEOVERFLOW)) {
nsTextFrame* f = static_cast<nsTextFrame*>(frame);
r = f->RecomputeOverflowRect();
}
frame->FinishAndStoreOverflow(&r, frame->GetSize());
frame->FinishAndStoreOverflow(r, frame->GetSize());
}
// If we have something that's not an inline but with a complex frame
@@ -2611,10 +2618,11 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
// about the root span, since it doesn't have a frame.
if (frame->HasView())
nsContainerFrame::SyncFrameViewAfterReflow(mPresContext, frame,
frame->GetView(), &r,
frame->GetView(),
r.VisualOverflow(),
NS_FRAME_NO_MOVE_VIEW);
combinedAreaResult.UnionRect(combinedAreaResult, r + origin);
overflowAreas.UnionWith(r + origin);
}
// If we just computed a spans combined area, we need to update its
@@ -2622,7 +2630,7 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
if (psd->mFrame) {
PerFrameData* spanPFD = psd->mFrame;
nsIFrame* frame = spanPFD->mFrame;
frame->FinishAndStoreOverflow(&combinedAreaResult, frame->GetSize());
frame->FinishAndStoreOverflow(overflowAreas, frame->GetSize());
}
aCombinedArea = combinedAreaResult;
aOverflowAreas = overflowAreas;
}