Bug 1325550 - Add default layer state value as a parameter of RequiredLayerStateForChildren. r=mstange

MozReview-Commit-ID: CXCaGjLF6kL

--HG--
extra : rebase_source : 9935eb7352c3dedcec57fce100b85e34e6166043
This commit is contained in:
cku 2016-12-23 09:08:31 +08:00
Родитель 37742f608d
Коммит 9cd00cb9cb
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -4576,9 +4576,10 @@ RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters,
const nsDisplayList& aList,
AnimatedGeometryRoot* aExpectedAnimatedGeometryRootForChildren)
AnimatedGeometryRoot* aExpectedAnimatedGeometryRootForChildren,
LayerState aDefaultState = LAYER_INACTIVE)
{
LayerState result = LAYER_INACTIVE;
LayerState result = aDefaultState;
for (nsDisplayItem* i = aList.GetBottom(); i; i = i->GetAbove()) {
if (result == LAYER_INACTIVE &&
i->GetAnimatedGeometryRoot() != aExpectedAnimatedGeometryRootForChildren) {
@ -7336,7 +7337,8 @@ nsDisplayMask::GetLayerState(nsDisplayListBuilder* aBuilder,
{
if (ShouldPaintOnMaskLayer(aManager)) {
return RequiredLayerStateForChildren(aBuilder, aManager, aParameters,
mList, GetAnimatedGeometryRoot());
mList, GetAnimatedGeometryRoot(),
LAYER_SVG_EFFECTS);
}
return LAYER_SVG_EFFECTS;