Bug 1248913 - Remove mCanBeActive and second nsDisplayBlendContainer constructor. r?mattwoodrow
MozReview-Commit-ID: Jcrip22bW5k
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -4417,26 +4417,16 @@ bool nsDisplayBlendMode::TryMerge(nsDisp
return true;
}
nsDisplayBlendContainer::nsDisplayBlendContainer(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayList* aList,
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);
}
#ifdef NS_BUILD_REFCNT_LOGGING
nsDisplayBlendContainer::~nsDisplayBlendContainer() {
MOZ_COUNT_DTOR(nsDisplayBlendContainer);
}
@@ -4463,17 +4453,17 @@ nsDisplayBlendContainer::BuildLayer(nsDi
return container.forget();
}
LayerState
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) {
if (aItem->GetType() != TYPE_BLEND_CONTAINER)
return false;
// items for the same content element should be merged into a single
// compositing group
// aItem->GetUnderlyingFrame() returns non-null because it's nsDisplayOpacity
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -3427,23 +3427,19 @@ public:
private:
uint8_t mBlendMode;
uint32_t mIndex;
};
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
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters) override;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
@@ -3458,19 +3454,16 @@ public:
nsDisplayItem::GetPerFrameKey();
}
NS_DISPLAY_DECL_NAME("BlendContainer", TYPE_BLEND_CONTAINER)
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;
};
/**
* A display item that has no purpose but to ensure its contents get
* their own layer.
*/
class nsDisplayOwnLayer : public nsDisplayWrapList {
public: