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

Bug 806256 - Only recompute preserve-3d/perspective children overflow areas if the frame size changed. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2012-11-01 14:25:45 +13:00
parent 1e71bde82b
commit 1509c7378c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/generic/nsFrame.cpp
View File

@ -6870,7 +6870,7 @@ IsInlineFrame(nsIFrame *aFrame)
bool
nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsSize aNewSize)
nsSize aNewSize, nsSize* aOldSize)
{
NS_ASSERTION(!((GetStateBits() & NS_FRAME_SVG_LAYOUT) &&
(GetStateBits() & NS_STATE_SVG_NONDISPLAY_CHILD)),
@ -6965,6 +6965,8 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
/* If we're transformed, transform the overflow rect by the current transformation. */
bool hasTransform = IsTransformed();
nsSize oldSize = aOldSize ? *aOldSize : mRect.Size();
bool sizeChanged = (oldSize != aNewSize);
if (hasTransform) {
Properties().Set(nsIFrame::PreTransformOverflowAreasProperty(),
new nsOverflowAreas(aOverflowAreas));
@ -6978,14 +6980,16 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsRect& o = aOverflowAreas.Overflow(otype);
o = nsDisplayTransform::TransformRect(o, this, nsPoint(0, 0), &newBounds);
}
if (Preserves3DChildren()) {
ComputePreserve3DChildrenOverflow(aOverflowAreas, newBounds);
} else if (ChildrenHavePerspective()) {
RecomputePerspectiveChildrenOverflow(this->GetStyleContext(), &newBounds);
if (sizeChanged) {
if (Preserves3DChildren()) {
ComputePreserve3DChildrenOverflow(aOverflowAreas, newBounds);
} else if (ChildrenHavePerspective()) {
RecomputePerspectiveChildrenOverflow(this->GetStyleContext(), &newBounds);
}
}
} else {
Properties().Delete(nsIFrame::PreTransformOverflowAreasProperty());
if (ChildrenHavePerspective()) {
if (ChildrenHavePerspective() && sizeChanged) {
nsRect newBounds(nsPoint(0, 0), aNewSize);
RecomputePerspectiveChildrenOverflow(this->GetStyleContext(), &newBounds);
}
@ -7799,7 +7803,8 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
reflowState, reflowStatus);
}
FinishAndStoreOverflow(desiredSize.mOverflowAreas, size);
nsSize oldSize(ourRect.Size());
FinishAndStoreOverflow(desiredSize.mOverflowAreas, size, &oldSize);
SyncLayout(aState);

2
layout/generic/nsIFrame.h
View File

@ -2393,7 +2393,7 @@ public:
* the overflow areas changed.
*/
bool FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsSize aNewSize);
nsSize aNewSize, nsSize* aOldSize = nullptr);
bool FinishAndStoreOverflow(nsHTMLReflowMetrics* aMetrics) {
return FinishAndStoreOverflow(aMetrics->mOverflowAreas,