Bug 1318266 - Part 3. Create css mask layer even if there are clips on the layer. r=mstange

MozReview-Commit-ID: 2T1GHOR4PZw

--HG--
extra : rebase_source : 931852196d34f110a098ad5529972984dc8af317
This commit is contained in:
cku 2016-12-19 18:07:39 +08:00
parent a3e3912bbb
commit 33bfa082b6

View File

@ -4314,7 +4314,6 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
"If we have rounded rects, we must have a clip rect");
// It has its own layer. Update that layer's clip and visible rects.
ownLayer->SetClipRect(Nothing());
ownLayer->SetScrolledClip(Nothing());
if (layerClip.HasClip()) {
@ -4337,7 +4336,11 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
SetupMaskLayer(ownLayer, layerClip);
}
}
} else if (item->GetType() == nsDisplayItem::TYPE_MASK) {
}
if (item->GetType() == nsDisplayItem::TYPE_MASK) {
MOZ_ASSERT(layerClip.GetRoundedRectCount() == 0);
nsDisplayMask* maskItem = static_cast<nsDisplayMask*>(item);
SetupMaskLayerForCSSMask(ownLayer, maskItem);