Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change FinishAndStoreOverflow API to take two overflow areas. (Bug 542595, patch 4) 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 553a77eec8
commit e9aef85b7e
6 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
layout/generic/nsFrame.cpp
View File

@ -6059,14 +6059,19 @@ IsInlineFrame(nsIFrame *aFrame)
}
void
nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsSize aNewSize)
{
nsRect bounds(nsPoint(0, 0), aNewSize);
// This is now called FinishAndStoreOverflow() instead of
// StoreOverflow() because frame-generic ways of adding overflow
// can happen here, e.g. CSS2 outline and native theme.
NS_ASSERTION(aNewSize.width == 0 || aNewSize.height == 0 ||
aOverflowArea->Contains(nsRect(nsPoint(0, 0), aNewSize)),
"Computed overflow area must contain frame bounds");
NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
NS_ASSERTION(aNewSize.width == 0 || aNewSize.height == 0 ||
aOverflowAreas.Overflow(otype).Contains(nsRect(nsPoint(0,0), aNewSize)),
"Computed overflow area must contain frame bounds");
}
// If we clip our children, clear accumulated overflow area. The
// children are actually clipped to the padding-box, but since the
@ -6078,7 +6083,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
"If one overflow is clip, the other should be too");
if (disp->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
// The contents are actually clipped to the padding area
*aOverflowArea = nsRect(nsPoint(0, 0), aNewSize);
aOverflowAreas.SetAllTo(bounds);
}
// Overflow area must always include the frame's top-left and bottom-right,
@ -6086,33 +6091,43 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// Pending a real fix for bug 426879, don't do this for inline frames
// with zero width.
if (aNewSize.width != 0 || !IsInlineFrame(this)) {
aOverflowArea->UnionRectIncludeEmpty(*aOverflowArea,
nsRect(nsPoint(0, 0), aNewSize));
NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
nsRect& o = aOverflowAreas.Overflow(otype);
o.UnionRectIncludeEmpty(o, bounds);
}
}
// Note that NS_STYLE_OVERFLOW_CLIP doesn't clip the frame background,
// so we add theme background overflow here so it's not clipped.
if (!IsBoxWrapped() && IsThemed(disp)) {
nsRect r(nsPoint(0, 0), aNewSize);
nsRect r(bounds);
nsPresContext *presContext = PresContext();
if (presContext->GetTheme()->
GetWidgetOverflow(presContext->DeviceContext(), this,
disp->mAppearance, &r)) {
aOverflowArea->UnionRectIncludeEmpty(*aOverflowArea, r);
NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
nsRect& o = aOverflowAreas.Overflow(otype);
o.UnionRectIncludeEmpty(o, r);
}
}
}
// Nothing in here should affect scrollable overflow.
PRBool hasOutlineOrEffects;
*aOverflowArea =
aOverflowAreas.VisualOverflow() =
ComputeOutlineAndEffectsRect(this, &hasOutlineOrEffects,
*aOverflowArea, aNewSize, PR_TRUE);
aOverflowAreas.VisualOverflow(), aNewSize,
PR_TRUE);
// Absolute position clipping
PRBool didHaveAbsPosClip = (GetStateBits() & NS_FRAME_HAS_CLIP) != 0;
nsRect absPosClipRect;
PRBool hasAbsPosClip = GetAbsPosClipRect(disp, &absPosClipRect, aNewSize);
if (hasAbsPosClip) {
aOverflowArea->IntersectRect(*aOverflowArea, absPosClipRect);
NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
nsRect& o = aOverflowAreas.Overflow(otype);
o.IntersectRect(o, absPosClipRect);
}
AddStateBits(NS_FRAME_HAS_CLIP);
} else {
RemoveStateBits(NS_FRAME_HAS_CLIP);
@ -6121,32 +6136,30 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
/* If we're transformed, transform the overflow rect by the current transformation. */
PRBool hasTransform = IsTransformed();
if (hasTransform) {
Properties().
Set(nsIFrame::PreTransformBBoxProperty(), new nsRect(*aOverflowArea));
Properties().Set(nsIFrame::PreTransformBBoxProperty(),
new nsRect(aOverflowAreas.VisualOverflow()));
/* Since our size might not actually have been computed yet, we need to make sure that we use the
* correct dimensions by overriding the stored bounding rectangle with the value the caller has
* ensured us we'll use.
*/
nsRect newBounds(nsPoint(0, 0), aNewSize);
*aOverflowArea = nsDisplayTransform::TransformRect(*aOverflowArea, this, nsPoint(0, 0), &newBounds);
}
PRBool overflowChanged;
if (!aOverflowArea->IsExactEqual(nsRect(nsPoint(0, 0), aNewSize))) {
overflowChanged = !aOverflowArea->IsExactEqual(GetOverflowRect());
SetOverflowRect(*aOverflowArea);
}
else {
if (HasOverflowRect()) {
// remove the previously stored overflow area
ClearOverflowRect();
overflowChanged = PR_TRUE;
} else {
overflowChanged = PR_FALSE;
// Transform affects both overflow areas.
NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
nsRect& o = aOverflowAreas.Overflow(otype);
o = nsDisplayTransform::TransformRect(o, this, nsPoint(0, 0), &newBounds);
}
}
if (overflowChanged) {
PRBool visualOverflowChanged =
GetVisualOverflowRect() != aOverflowAreas.VisualOverflow();
if (aOverflowAreas != nsOverflowAreas(bounds, bounds)) {
SetOverflowAreas(aOverflowAreas);
} else {
ClearOverflowRects();
}
if (visualOverflowChanged) {
if (hasOutlineOrEffects) {
// When there's an outline or box-shadow or SVG effects,
// changes to those styles might require repainting of the old and new
@ -6159,7 +6172,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// If there is no outline or other effects now, then we don't have
// to do anything here since removing those styles can't require
// repainting of areas that weren't in the old overflow area.
Invalidate(*aOverflowArea);
Invalidate(aOverflowAreas.VisualOverflow());
} else if (hasAbsPosClip || didHaveAbsPosClip) {
// If we are (or were) clipped by the 'clip' property, and our
// overflow area changes, it might be because the clipping changed.
@ -6167,7 +6180,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// repaint the old overflow area, so if the overflow area has
// changed (in particular, if it grows), we have to repaint the
// new area here.
Invalidate(*aOverflowArea);
Invalidate(aOverflowAreas.VisualOverflow());
} else if (hasTransform) {
// When there's a transform, changes to that style might require
// repainting of the old and new overflow areas in the widget.
@ -6184,7 +6197,8 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// the transform will go away and the frame contents will change
// ThebesLayers, forcing it to be invalidated, so it doesn't matter
// that we didn't reach here.
InvalidateLayer(*aOverflowArea, nsDisplayItem::TYPE_TRANSFORM);
InvalidateLayer(aOverflowAreas.VisualOverflow(),
nsDisplayItem::TYPE_TRANSFORM);
}
}
}
@ -6813,7 +6827,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
nsSize size(GetSize());
desiredSize.mOverflowArea.UnionRect(desiredSize.mOverflowArea,
nsRect(nsPoint(0, 0), size));
FinishAndStoreOverflow(&desiredSize.mOverflowArea, size);
FinishAndStoreOverflow(desiredSize.mOverflowAreas, size);
SyncLayout(aState);

3
layout/generic/nsGfxScrollFrame.cpp
View File

@ -698,7 +698,8 @@ nsHTMLScrollFrame::PlaceScrollArea(const ScrollReflowState& aState,
// 'overflow' either.
// This needs to happen before SyncFrameViewAfterReflow so
// HasOverflowRect() will return the correct value.
scrolledFrame->FinishAndStoreOverflow(&scrolledArea,
nsOverflowAreas overflow(scrolledArea, scrolledArea);
scrolledFrame->FinishAndStoreOverflow(overflow,
scrolledFrame->GetSize());
// Note that making the view *exactly* the size of the scrolled area

6
layout/generic/nsIFrame.h
View File

@ -2138,10 +2138,12 @@ public:
* fields or as a frame property in the frame manager so that it can
* be retrieved later without reflowing the frame.
*/
void FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize);
void FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsSize aNewSize);
void FinishAndStoreOverflow(nsHTMLReflowMetrics* aMetrics) {
FinishAndStoreOverflow(&aMetrics->mOverflowArea, nsSize(aMetrics->width, aMetrics->height));
FinishAndStoreOverflow(aMetrics->mOverflowAreas,
nsSize(aMetrics->width, aMetrics->height));
}
/**

15
layout/tables/nsTableFrame.cpp
View File

@ -1990,20 +1990,19 @@ nsTableFrame::AdjustForCollapsingRowsCols(nsHTMLReflowMetrics& aDesiredSize,
nsTableFrame* firstInFlow = static_cast<nsTableFrame*> (GetFirstInFlow());
nscoord width = firstInFlow->GetCollapsedWidth(aBorderPadding);
nscoord rgWidth = width - 2 * GetCellSpacingX();
nsRect overflowArea(0, 0, 0, 0);
nsOverflowAreas overflow;
// Walk the list of children
for (PRUint32 childX = 0; childX < rowGroups.Length(); childX++) {
nsTableRowGroupFrame* rgFrame = rowGroups[childX];
NS_ASSERTION(rgFrame, "Must have row group frame here");
yTotalOffset += rgFrame->CollapseRowGroupIfNecessary(yTotalOffset, rgWidth);
ConsiderChildOverflow(overflowArea, rgFrame);
ConsiderChildOverflow(overflow, rgFrame);
}
aDesiredSize.height -= yTotalOffset;
aDesiredSize.width = width;
overflowArea.UnionRect(nsRect(0, 0, aDesiredSize.width, aDesiredSize.height),
overflowArea);
FinishAndStoreOverflow(&overflowArea,
overflow.UnionAllWith(nsRect(0, 0, aDesiredSize.width, aDesiredSize.height));
FinishAndStoreOverflow(overflow,
nsSize(aDesiredSize.width, aDesiredSize.height));
}
@ -3012,15 +3011,13 @@ void ResizeCells(nsTableFrame& aTableFrame)
rgFrame->ConsiderChildOverflow(groupDesiredSize.mOverflowArea, rowFrame);
rowFrame = rowFrame->GetNextRow();
}
rgFrame->FinishAndStoreOverflow(&groupDesiredSize.mOverflowArea,
nsSize(groupDesiredSize.width, groupDesiredSize.height));
rgFrame->FinishAndStoreOverflow(&groupDesiredSize);
// make the coordinates of |desiredSize.mOverflowArea| incorrect
// since it's about to go away:
groupDesiredSize.mOverflowArea.MoveBy(rgFrame->GetPosition());
tableDesiredSize.mOverflowArea.UnionRect(tableDesiredSize.mOverflowArea, groupDesiredSize.mOverflowArea);
}
aTableFrame.FinishAndStoreOverflow(&tableDesiredSize.mOverflowArea,
nsSize(tableDesiredSize.width, tableDesiredSize.height));
aTableFrame.FinishAndStoreOverflow(&tableDesiredSize);
}
void

17
layout/tables/nsTableRowFrame.cpp
View File

@ -1161,7 +1161,7 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
rowRect.y -= aRowOffset;
rowRect.width = aWidth;
nsRect overflowArea(0, 0, 0, 0);
nsOverflowAreas overflow;
nscoord shift = 0;
nscoord cellSpacingX = tableFrame->GetCellSpacingX();
nscoord cellSpacingY = tableFrame->GetCellSpacingY();
@ -1280,11 +1280,12 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
// XXXbz This looks completely bogus in the cases when we didn't
// collapse the cell!
nsRect cellOverflow = nsRect(0, 0, cRect.width, cRect.height);
cellFrame->FinishAndStoreOverflow(&cellOverflow, nsSize(cRect.width,
cRect.height));
nsRect cellBounds(0, 0, cRect.width, cRect.height);
nsOverflowAreas cellOverflow(cellBounds, cellBounds);
cellFrame->FinishAndStoreOverflow(cellOverflow,
nsSize(cRect.width, cRect.height));
nsTableFrame::RePositionViews(cellFrame);
ConsiderChildOverflow(overflowArea, cellFrame);
ConsiderChildOverflow(overflow, cellFrame);
if (aRowOffset == 0) {
nsTableFrame::InvalidateFrame(cellFrame, oldCellRect,
@ -1296,10 +1297,8 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
}
SetRect(rowRect);
overflowArea.UnionRect(nsRect(0,0,rowRect.width, rowRect.height),
overflowArea);
FinishAndStoreOverflow(&overflowArea, nsSize(rowRect.width,
rowRect.height));
overflow.UnionAllWith(nsRect(0,0,rowRect.width, rowRect.height));
FinishAndStoreOverflow(overflow, nsSize(rowRect.width, rowRect.height));
nsTableFrame::RePositionViews(this);
nsTableFrame::InvalidateFrame(this, oldRect, oldOverflowRect, PR_FALSE);

10
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -854,7 +854,7 @@ nsTableRowGroupFrame::CollapseRowGroupIfNecessary(nscoord aYTotalOffset,
tableFrame->SetNeedToCollapse(PR_TRUE);
}
nsRect overflowArea(0, 0, 0, 0);
nsOverflowAreas overflow;
nsTableRowFrame* rowFrame= GetFirstRow();
PRBool didCollapse = PR_FALSE;
@ -863,7 +863,7 @@ nsTableRowGroupFrame::CollapseRowGroupIfNecessary(nscoord aYTotalOffset,
yGroupOffset += rowFrame->CollapseRowIfNecessary(yGroupOffset,
aWidth, collapseGroup,
didCollapse);
ConsiderChildOverflow(overflowArea, rowFrame);
ConsiderChildOverflow(overflow, rowFrame);
rowFrame = rowFrame->GetNextRow();
}
@ -885,10 +885,8 @@ nsTableRowGroupFrame::CollapseRowGroupIfNecessary(nscoord aYTotalOffset,
}
SetRect(groupRect);
overflowArea.UnionRect(nsRect(0, 0, groupRect.width, groupRect.height),
overflowArea);
FinishAndStoreOverflow(&overflowArea, nsSize(groupRect.width,
groupRect.height));
overflow.UnionAllWith(nsRect(0, 0, groupRect.width, groupRect.height));
FinishAndStoreOverflow(overflow, nsSize(groupRect.width, groupRect.height));
nsTableFrame::RePositionViews(this);
nsTableFrame::InvalidateFrame(this, oldGroupRect, oldGroupOverflowRect,
PR_FALSE);