From 44b787c2c249f80a279fc6774f91dedc2165f5fc Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 15 Jul 2014 10:30:44 +0200 Subject: [PATCH] Backed out changeset 1ad096055f1d (bug 1022612) --- layout/base/nsDisplayList.cpp | 77 ++++++++++++++++------------------- layout/base/nsDisplayList.h | 17 ++++---- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 2665f76aaf55..c227ab152dda 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -3016,28 +3016,28 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder, mReferenceFrame = aBuilder->FindReferenceFrameFor(GetTransformRootFrame(aFrame)); mToReferenceFrame = aFrame->GetOffsetToCrossDoc(mReferenceFrame); - } else { - // If we're a transformed frame, then we need to find out if we're inside - // the nsDisplayTransform or outside of it. Frames inside the transform - // need mReferenceFrame == mFrame, outside needs the next ancestor - // reference frame. - // If we're inside the transform, then the nsDisplayItem constructor - // will have done the right thing. - // If we're outside the transform, then we should have only one child - // (since nsDisplayTransform wraps all actual content), and that child - // will have the correct reference frame set (since nsDisplayTransform - // handles this explictly). - // - // Preserve-3d can cause us to have multiple nsDisplayTransform - // children. - nsDisplayItem *i = mList.GetBottom(); - if (i && (!i->GetAbove() || i->GetType() == TYPE_TRANSFORM) && - i->Frame() == mFrame) { - mReferenceFrame = i->ReferenceFrame(); - mToReferenceFrame = i->ToReferenceFrame(); - } + return; + } + + // If we're a transformed frame, then we need to find out if we're inside + // the nsDisplayTransform or outside of it. Frames inside the transform + // need mReferenceFrame == mFrame, outside needs the next ancestor + // reference frame. + // If we're inside the transform, then the nsDisplayItem constructor + // will have done the right thing. + // If we're outside the transform, then we should have only one child + // (since nsDisplayTransform wraps all actual content), and that child + // will have the correct reference frame set (since nsDisplayTransform + // handles this explictly). + // + // Preserve-3d can cause us to have multiple nsDisplayTransform + // children. + nsDisplayItem *i = mList.GetBottom(); + if (i && (!i->GetAbove() || i->GetType() == TYPE_TRANSFORM) && + i->Frame() == mFrame) { + mReferenceFrame = i->ReferenceFrame(); + mToReferenceFrame = i->ToReferenceFrame(); } - mVisibleRect = aBuilder->GetDirtyRect() + mToReferenceFrame; } nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder, @@ -3056,14 +3056,14 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder, mReferenceFrame = aBuilder->FindReferenceFrameFor(GetTransformRootFrame(aFrame)); mToReferenceFrame = aFrame->GetOffsetToCrossDoc(mReferenceFrame); - } else { - // See the previous nsDisplayWrapList constructor - if (aItem->Frame() == aFrame) { - mReferenceFrame = aItem->ReferenceFrame(); - mToReferenceFrame = aItem->ToReferenceFrame(); - } + return; + } + + // See the previous nsDisplayWrapList constructor + if (aItem->Frame() == aFrame) { + mReferenceFrame = aItem->ReferenceFrame(); + mToReferenceFrame = aItem->ToReferenceFrame(); } - mVisibleRect = aBuilder->GetDirtyRect() + mToReferenceFrame; } nsDisplayWrapList::~nsDisplayWrapList() { @@ -4336,15 +4336,6 @@ nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder, nsIFrame mStoredList.SetClip(aBuilder, DisplayItemClip::NoClip()); } -void -nsDisplayTransform::SetReferenceFrameToAncestor(nsDisplayListBuilder* aBuilder) -{ - mReferenceFrame = - aBuilder->FindReferenceFrameFor(GetTransformRootFrame(mFrame)); - mToReferenceFrame = mFrame->GetOffsetToCrossDoc(mReferenceFrame); - mVisibleRect = aBuilder->GetDirtyRect() + mToReferenceFrame; -} - nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder, nsIFrame *aFrame, nsDisplayList *aList, uint32_t aIndex) : nsDisplayItem(aBuilder, aFrame) @@ -4354,7 +4345,9 @@ nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder, nsIFrame { MOZ_COUNT_CTOR(nsDisplayTransform); NS_ABORT_IF_FALSE(aFrame, "Must have a frame!"); - SetReferenceFrameToAncestor(aBuilder); + mReferenceFrame = + aBuilder->FindReferenceFrameFor(GetTransformRootFrame(aFrame)); + mToReferenceFrame = aFrame->GetOffsetToCrossDoc(mReferenceFrame); mStoredList.SetClip(aBuilder, DisplayItemClip::NoClip()); } @@ -4367,7 +4360,9 @@ nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder, nsIFrame { MOZ_COUNT_CTOR(nsDisplayTransform); NS_ABORT_IF_FALSE(aFrame, "Must have a frame!"); - SetReferenceFrameToAncestor(aBuilder); + mReferenceFrame = + aBuilder->FindReferenceFrameFor(GetTransformRootFrame(aFrame)); + mToReferenceFrame = aFrame->GetOffsetToCrossDoc(mReferenceFrame); mStoredList.SetClip(aBuilder, DisplayItemClip::NoClip()); } @@ -5056,7 +5051,7 @@ nsRegion nsDisplayTransform::GetOpaqueRegion(nsDisplayListBuilder *aBuilder, if (matrix.Is2D(&matrix2d) && matrix2d.PreservesAxisAlignedRectangles() && mStoredList.GetOpaqueRegion(aBuilder, &tmpSnap).Contains(untransformedVisible)) { - result = mVisibleRect.Intersect(GetBounds(aBuilder, &tmpSnap)); + result = mVisibleRect; } return result; } @@ -5116,7 +5111,7 @@ nsDisplayTransform::TryMerge(nsDisplayListBuilder *aBuilder, /* Now, move everything over to this frame and signal that * we merged things! */ - mStoredList.MergeFromTrackingMergedFrames(&static_cast(aItem)->mStoredList); + mStoredList.MergeFrom(&static_cast(aItem)->mStoredList); return true; } diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index 714fc07ac6d3..217356b9fe78 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -867,10 +867,8 @@ public: , mPainted(false) #endif { - mReferenceFrame = aBuilder->FindReferenceFrameFor(aFrame, &mToReferenceFrame); - NS_ASSERTION(aBuilder->GetDirtyRect().width >= 0 || - !aBuilder->IsForPainting(), "dirty rect not set"); - mVisibleRect = aBuilder->GetDirtyRect() + mToReferenceFrame; + mReferenceFrame = aBuilder->FindReferenceFrameFor(aFrame); + mToReferenceFrame = aBuilder->ToReferenceFrame(aFrame); } /** * This constructor is only used in rare cases when we need to construct @@ -887,7 +885,7 @@ public: { } virtual ~nsDisplayItem() {} - + void* operator new(size_t aSize, nsDisplayListBuilder* aBuilder) CPP_THROW_NEW { return aBuilder->Allocate(aSize); @@ -2681,11 +2679,14 @@ public: protected: nsDisplayWrapList() {} - void MergeFromTrackingMergedFrames(nsDisplayWrapList* aOther) + void MergeFrom(nsDisplayWrapList* aOther) { mList.AppendToBottom(&aOther->mList); mBounds.UnionRect(mBounds, aOther->mBounds); - mVisibleRect.UnionRect(mVisibleRect, aOther->mVisibleRect); + } + void MergeFromTrackingMergedFrames(nsDisplayWrapList* aOther) + { + MergeFrom(aOther); mMergedFrames.AppendElement(aOther->mFrame); mMergedFrames.MoveElementsFrom(aOther->mMergedFrames); } @@ -3427,8 +3428,6 @@ public: virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE; #endif private: - void SetReferenceFrameToAncestor(nsDisplayListBuilder* aBuilder); - static gfx3DMatrix GetResultingTransformMatrixInternal(const FrameTransformProperties& aProperties, const nsPoint& aOrigin, float aAppUnitsPerPixel,