Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1248913 - Remove mCanBeActive and second nsDisplayBlendContainer constructor. r=mattwoodrow

Browse Source 
MozReview-Commit-ID: Jcrip22bW5k

--HG--
extra : rebase_source : a2601fd33f6ec7cafa6902abb2ece13d4b0a9428
This commit is contained in:
Markus Stange 2016-03-08 14:38:22 -05:00
parent 08e56286e7
commit 46dbf6fc7d
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsDisplayList.cpp
View File

@ -4419,16 +4419,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);
}
@ -4465,7 +4455,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) {

7
layout/base/nsDisplayList.h
View File

@ -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;
};
/**