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

Bug 961887 - Find uniform opaque background colors under ContainerLayers. r=roc

Browse Source
This commit is contained in:
Markus Stange
2015-02-25 11:47:22 -05:00
parent 2504af3be6
commit adcd6aa6fb
13 changed files with 261 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
layout/base/FrameLayerBuilder.cpp
View File

@@ -574,7 +574,8 @@ public:
const nsRect& aContainerBounds,
ContainerLayer* aContainerLayer,
const ContainerLayerParameters& aParameters,
bool aFlattenToSingleLayer) :
bool aFlattenToSingleLayer,
nscolor aBackgroundColor) :
mBuilder(aBuilder), mManager(aManager),
mLayerBuilder(aLayerBuilder),
mContainerFrame(aContainerFrame),
@@ -582,6 +583,7 @@ public:
mContainerBounds(aContainerBounds),
mParameters(aParameters),
mNextFreeRecycledPaintedLayer(0),
mContainerUniformBackgroundColor(aBackgroundColor),
mFlattenToSingleLayer(aFlattenToSingleLayer)
{
nsPresContext* presContext = aContainerFrame->PresContext();
@@ -914,8 +916,20 @@ protected:
nsTArray<nsRefPtr<PaintedLayer> > mRecycledPaintedLayers;
nsDataHashtable<nsPtrHashKey<Layer>, nsRefPtr<ImageLayer> >
mRecycledMaskImageLayers;
/**
* The visible region of all visible content in this container layer under
* first PaintedLayerData layer in the PaintedLayerDataStack.
*/
PossiblyInfiniteRegion mVisibleAboveBackgroundRegion;
uint32_t mNextFreeRecycledPaintedLayer;
nscoord mAppUnitsPerDevPixel;
/**
* The uniform opaque color from behind this container layer, or
* NS_RGBA(0,0,0,0) if the background behind this container layer is not
* uniform and opaque. This color can be pulled into ThebesLayers that are
* directly above the background.
*/
nscolor mContainerUniformBackgroundColor;
bool mSnappingEnabled;
bool mFlattenToSingleLayer;
/**
@@ -1925,7 +1939,7 @@ ContainerState::FindOpaqueBackgroundColorFor(const nsIntRegion& aTargetVisibleRe
mParameters.mXScale,
mParameters.mYScale,
mAppUnitsPerDevPixel)) {
break;
return NS_RGBA(0,0,0,0);
}
nscolor color;
@@ -1935,7 +1949,11 @@ ContainerState::FindOpaqueBackgroundColorFor(const nsIntRegion& aTargetVisibleRe
return NS_RGBA(0,0,0,0);
}
}
return NS_RGBA(0,0,0,0);
if (mVisibleAboveBackgroundRegion.Intersects(aTargetVisibleRegion)) {
// Some non-Thebes content is between container background and target.
return NS_RGBA(0,0,0,0);
}
return mContainerUniformBackgroundColor;
}
void
@@ -2290,12 +2308,13 @@ ContainerState::PopPaintedLayerData()
layer->SetEventRegions(regions);
}
if (lastIndex > 0) {
// Since we're going to pop off the last PaintedLayerData, the
// mVisibleAboveRegion of the second-to-last item will need to include
// the regions of the last item.
UpdateVisibleAboveRegionOnPop(data, mPaintedLayerDataStack[lastIndex - 1]);
}
// Since we're going to pop off the last PaintedLayerData, the
// mVisibleAboveRegion of the second-to-last item will need to include
// the regions of the last item. If we're emptying the PaintedLayerDataStack,
// we instead need to accumulate the regions into the container's
// mVisibleAboveBackgroundRegion.
UpdateVisibleAboveRegionOnPop(data,
lastIndex > 0 ? mPaintedLayerDataStack[lastIndex - 1].get() : nullptr);
mPaintedLayerDataStack.RemoveElementAt(lastIndex);
}
@@ -2751,11 +2770,8 @@ ContainerState::UpdateVisibleAboveRegionForNewItem(const nsIntRect& aVisibleRect
const nsIntRect* aClipRectIfAny)
{
PaintedLayerData* data = GetTopPaintedLayerData();
if (!data) {
return;
}
PossiblyInfiniteRegion& visibleAboveRegion = data->mVisibleAboveRegion;
PossiblyInfiniteRegion& visibleAboveRegion = data
? data->mVisibleAboveRegion : mVisibleAboveBackgroundRegion;
if (aCanMoveFreely) {
// Prerendered transform items can be updated without layer building
@@ -2776,8 +2792,8 @@ void
ContainerState::UpdateVisibleAboveRegionOnPop(PaintedLayerData* aData,
PaintedLayerData* aNextPaintedLayerData)
{
PossiblyInfiniteRegion& visibleAboveRegion =
aNextPaintedLayerData->mVisibleAboveRegion;
PossiblyInfiniteRegion& visibleAboveRegion = aNextPaintedLayerData ?
aNextPaintedLayerData->mVisibleAboveRegion : mVisibleAboveBackgroundRegion;
// If aData has a draw region and is subject to async transforms then the
// layer can potentially be moved arbitrarily on the compositor. So we
@@ -2983,6 +2999,16 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
continue;
}
// 3D-transformed layers don't necessarily draw in the order in which
// they're added to their parent container layer.
bool mayDrawOutOfOrder = itemType == nsDisplayItem::TYPE_TRANSFORM &&
(item->Frame()->Preserves3D() || item->Frame()->Preserves3DChildren());
// Pull up a uniform background color into the layer if possible.
mParameters.mBackgroundColor = (prerenderedTransform || mayDrawOutOfOrder)
? NS_RGBA(0,0,0,0)
: FindOpaqueBackgroundColorFor(itemVisibleRect, mPaintedLayerDataStack.Length());
// Just use its layer.
// Set layerContentsVisibleRect.width/height to -1 to indicate we
// currently don't know. If BuildContainerLayerFor gets called by
@@ -3028,8 +3054,9 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
}
// Update the "visible above region" of the topmost PaintedLayerData item
// so that FindPaintedLayerFor and FindOpaqueBackgroundColorFor are aware
// of this item, even though it's not in the PaintedLayerDataStack.
// (or of the container's background) so that FindPaintedLayerFor and
// FindOpaqueBackgroundColorFor are aware of this item, even though it's
// not in the PaintedLayerDataStack.
UpdateVisibleAboveRegionForNewItem(itemVisibleRect, prerenderedTransform,
itemClip.HasClip() ? &clipRect : nullptr);
@@ -4082,11 +4109,18 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
{
flattenToSingleLayer = true;
}
nscolor backgroundColor = NS_RGBA(0,0,0,0);
if (aFlags & CONTAINER_ALLOW_PULL_BACKGROUND_COLOR) {
backgroundColor = aParameters.mBackgroundColor;
}
uint32_t flags;
while (true) {
ContainerState state(aBuilder, aManager, aManager->GetLayerBuilder(),
aContainerFrame, aContainerItem, bounds,
containerLayer, scaleParameters, flattenToSingleLayer);
containerLayer, scaleParameters, flattenToSingleLayer,
backgroundColor);
state.ProcessDisplayItems(aChildren);