Bug 1470792 - Backout the changeset that introduced UpdateContainingBlock change hint for mask changes. r?heycam
MozReview-Commit-ID: JF88VkutUgG
--- a/layout/style/ComputedStyle.cpp
+++ b/layout/style/ComputedStyle.cpp
@@ -227,18 +227,18 @@ ComputedStyle::CalcStyleDifference(Compu
if (hint & nsChangeHint_UpdateContainingBlock) {
// If a struct returned nsChangeHint_UpdateContainingBlock, that
// means that one property's influence on whether we're a containing
// block for abs-pos or fixed-pos elements has changed. However, we
// only need to return the hint if the overall computation of
// whether we establish a containing block has changed.
- // This depends on data in nsStyleDisplay, nsStyleEffects and
- // nsStyleSVGReset, so we do it here.
+ // This depends on data in nsStyleDisplay and nsStyleEffects, so we do it
+ // here
// Note that it's perhaps good for this test to be last because it
// doesn't use Peek* functions to get the structs on the old
// context. But this isn't a big concern because these struct
// getters should be called during frame construction anyway.
if (ThreadsafeStyleDisplay()->IsAbsPosContainingBlockForAppropriateFrame(*this) ==
aNewContext->ThreadsafeStyleDisplay()->
IsAbsPosContainingBlockForAppropriateFrame(*aNewContext) &&
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1315,21 +1315,16 @@ nsStyleSVGReset::CalcDifference(const ns
mFloodColor != aNewData.mFloodColor ||
mLightingColor != aNewData.mLightingColor ||
mStopOpacity != aNewData.mStopOpacity ||
mFloodOpacity != aNewData.mFloodOpacity ||
mMaskType != aNewData.mMaskType) {
hint |= nsChangeHint_RepaintFrame;
}
- if (HasMask() != aNewData.HasMask()) {
- // A change from/to being a containing block for position:fixed.
- hint |= nsChangeHint_UpdateContainingBlock;
- }
-
hint |= mMask.CalcDifference(aNewData.mMask,
nsStyleImageLayers::LayerType::Mask);
return hint;
}
bool
nsStyleSVGReset::HasMask() const