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

Back out changeset 02d17c84afff (bug 1214212) for (mostly) transform-3d reftest failures

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2015-10-21 20:22:45 -07:00
parent 6401c0185c
commit 0f3cf4490c
4 changed files with 47 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/layers/Layers.h
View File

@ -1472,12 +1472,9 @@ public:
bool Extend3DContext() {
return GetContentFlags() & CONTENT_EXTEND_3D_CONTEXT;
}
bool Combines3DTransformWithAncestors() {
return GetParent() &&
reinterpret_cast<Layer*>(GetParent())->Extend3DContext();
}
bool Is3DContextLeaf() {
return !Extend3DContext() && Combines3DTransformWithAncestors();
return !Extend3DContext() && GetParent() &&
reinterpret_cast<Layer*>(GetParent())->Extend3DContext();
}
/**
* It is true if the user can see the back of the layer and the

4
gfx/layers/basic/BasicLayerManager.cpp
View File

@ -864,10 +864,6 @@ InstallLayerClipPreserves3D(gfxContext* aTarget, Layer* aLayer)
if (!clipRect) {
return;
}
MOZ_ASSERT(!aLayer->Extend3DContext() ||
!aLayer->Combines3DTransformWithAncestors(),
"Layers in a preserve 3D context have no clip"
" except leaves and the estabisher!");
Layer* parent = aLayer->GetParent();
Matrix4x4 transform3d =

1
layout/base/nsDisplayList.h
View File

@ -37,7 +37,6 @@
class nsIContent;
class nsRenderingContext;
class nsDisplayList;
class nsDisplayTableItem;
class nsISelection;
class nsDisplayLayerEventRegions;

108
layout/generic/nsFrame.cpp
View File

@ -1901,39 +1901,6 @@ CheckForApzAwareEventHandlers(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
}
}
/**
* True if aDescendant participates the context aAncestor participating.
*/
static bool
Participate3DContextFrame(nsIFrame* aAncestor, nsIFrame* aDescendant) {
MOZ_ASSERT(aAncestor != aDescendant);
MOZ_ASSERT(aAncestor->Extend3DContext());
nsIFrame* frame;
for (frame = nsLayoutUtils::GetCrossDocParentFrame(aDescendant);
frame && aAncestor != frame;
frame = nsLayoutUtils::GetCrossDocParentFrame(frame)) {
if (!frame->Extend3DContext()) {
return false;
}
}
MOZ_ASSERT(frame == aAncestor);
return true;
}
static void
WrapSeparatorTransform(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
nsRect& aDirtyRect,
nsDisplayList* aSource, nsDisplayList* aTarget,
int aIndex) {
if (!aSource->IsEmpty()) {
nsDisplayTransform *sepIdItem =
new (aBuilder) nsDisplayTransform(aBuilder, aFrame, aSource,
aDirtyRect, Matrix4x4(), aIndex);
sepIdItem->SetNoExtendContext();
aTarget->AppendToTop(sepIdItem);
}
}
void
nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -2193,36 +2160,6 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
* we find all the correct children.
*/
if (isTransformed && !resultList.IsEmpty()) {
if (!resultList.IsEmpty() && Extend3DContext()) {
// Install dummy nsDisplayTransform as a leaf containing
// descendants not participating this 3D rendering context.
nsDisplayList nonparticipants;
nsDisplayList participants;
int index = 1;
while (nsDisplayItem* item = resultList.RemoveBottom()) {
if (item->GetType() == nsDisplayItem::TYPE_TRANSFORM &&
Participate3DContextFrame(this, item->Frame())) {
// The frame of this item participates the same 3D context.
WrapSeparatorTransform(aBuilder, this, dirtyRect,
&nonparticipants, &participants, index++);
participants.AppendToTop(item);
} else {
// The frame of the item doesn't participate the current
// context, or has no transform.
//
// For items participating but not transformed, they are add
// to nonparticipants to get a separator layer for handling
// clips, if there is, on an intermediate surface.
// \see ContainerLayer::DefaultComputeEffectiveTransforms().
nonparticipants.AppendToTop(item);
}
}
WrapSeparatorTransform(aBuilder, this, dirtyRect,
&nonparticipants, &participants, index++);
resultList.AppendToTop(&participants);
}
// Restore clip state now so nsDisplayTransform is clipped properly.
clipState.Restore();
// Revert to the dirtyrect coming in from the parent, without our transform
@ -2239,6 +2176,51 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
nsDisplayTransform *transformItem =
new (aBuilder) nsDisplayTransform(aBuilder, this, &resultList, dirtyRect);
resultList.AppendNewToTop(transformItem);
/*
* Create an additional transform item as a separator layer
* between current and parent's 3D context if necessary.
*
* Separator layers avoid improperly exteding 3D context by
* children.
*/
{
bool needAdditionalTransform = false;
if (Extend3DContext()) {
if (outerReferenceFrame->Extend3DContext()) {
for (nsIFrame *f = nsLayoutUtils::GetCrossDocParentFrame(this);
f && f != outerReferenceFrame && !f->IsTransformed();
f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
if (!f->Extend3DContext()) {
// The first one with transform in it's 3D context chain,
// and it is different 3D context with the outer reference
// frame.
needAdditionalTransform = true;
break;
}
}
}
} else if (outerReferenceFrame->Extend3DContext() &&
outerReferenceFrame != nsLayoutUtils::GetCrossDocParentFrame(this)) {
// The content should be transformed and drawn on a buffer,
// then tranformed and drawn again for outerReferenceFrame.
// So, a separator layer is required.
needAdditionalTransform = true;
}
if (needAdditionalTransform) {
nsRect sepDirty = dirtyRectOutsideTransform;
// The separator item is with ID transform and is out of this
// frame, so it is in the coordination of the outer reference
// frame. Here translate the dirty rect back.
sepDirty.MoveBy(toOuterReferenceFrame);
nsDisplayTransform *sepIdItem =
new (aBuilder) nsDisplayTransform(aBuilder, this, &resultList,
sepDirty,
Matrix4x4(), 1);
sepIdItem->SetNoExtendContext();
resultList.AppendNewToTop(sepIdItem);
}
}
}
/* If we're doing VR rendering, then we need to wrap everything in a nsDisplayVR