diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index c47eb74f089..3eccb47081c 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -4409,16 +4409,6 @@ nsDisplayBlendContainer::nsDisplayBlendContainer(nsDisplayListBuilder* aBuilder, const DisplayItemScrollClip* aScrollClip) : nsDisplayWrapList(aBuilder, aFrame, aList, aScrollClip) , mIndex(0) - , mCanBeActive(true) -{ - MOZ_COUNT_CTOR(nsDisplayBlendContainer); -} - -nsDisplayBlendContainer::nsDisplayBlendContainer(nsDisplayListBuilder* aBuilder, - nsIFrame* aFrame, nsDisplayList* aList) - : nsDisplayWrapList(aBuilder, aFrame, aList) - , mIndex(1) - , mCanBeActive(false) { MOZ_COUNT_CTOR(nsDisplayBlendContainer); } @@ -4455,7 +4445,7 @@ nsDisplayBlendContainer::GetLayerState(nsDisplayListBuilder* aBuilder, LayerManager* aManager, const ContainerLayerParameters& aParameters) { - return mCanBeActive ? mozilla::LAYER_ACTIVE : mozilla::LAYER_INACTIVE; + return mozilla::LAYER_ACTIVE; } bool nsDisplayBlendContainer::TryMerge(nsDisplayItem* aItem) { diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index c8705884250..5a45e337af2 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -3426,13 +3426,9 @@ private: class nsDisplayBlendContainer : public nsDisplayWrapList { public: - // Use this constructor for blend containers that can have active child layers. nsDisplayBlendContainer(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayList* aList, const DisplayItemScrollClip* aScrollClip); - // Use this constructor for background-blend-mode blend containers. - nsDisplayBlendContainer(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, - nsDisplayList* aList); #ifdef NS_BUILD_REFCNT_LOGGING virtual ~nsDisplayBlendContainer(); #endif @@ -3457,9 +3453,6 @@ private: // Used to distinguish containers created at building stacking // context or appending background. uint32_t mIndex; - // If this is true, then we should make the layer active if all contained blend - // modes can be supported by the current layer manager. - bool mCanBeActive; }; /**