wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1024148 - Part 1: Merge nsDisplayOpacity items together. r=mattwoodrow

Browse Source 
--HG--
extra : rebase_source : f461cb97357c854db22122b40777358a17f736ec
This commit is contained in:
Benoit Girard 2014-06-12 11:34:35 -04:00
parent 6682b8f84f
commit c38907de9d
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
layout/base/nsDisplayList.cpp
View File

@ -3274,7 +3274,8 @@ nsresult nsDisplayWrapper::WrapListsInPlace(nsDisplayListBuilder* aBuilder,
nsDisplayOpacity::nsDisplayOpacity(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayList* aList)
: nsDisplayWrapList(aBuilder, aFrame, aList) {
: nsDisplayWrapList(aBuilder, aFrame, aList)
, mOpacity(aFrame->StyleDisplay()->mOpacity) {
MOZ_COUNT_CTOR(nsDisplayOpacity);
}
@ -3287,8 +3288,9 @@ nsDisplayOpacity::~nsDisplayOpacity() {
nsRegion nsDisplayOpacity::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap) {
*aSnap = false;
// We are never opaque, if our opacity was < 1 then we wouldn't have
// been created.
// The only time where mOpacity == 1.0 should be when we have will-change.
// We could report this as opaque then but when the will-change value starts
// animating the element would become non opaque and could cause repaints.
return nsRegion();
}
@ -3297,7 +3299,7 @@ already_AddRefed<Layer>
nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters) {
if (mFrame->StyleDisplay()->mOpacity == 0 && mFrame->GetContent() &&
if (mOpacity == 0 && mFrame->GetContent() &&
!nsLayoutUtils::HasAnimations(mFrame->GetContent(), eCSSProperty_opacity)) {
return nullptr;
}
@ -3307,7 +3309,7 @@ nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder,
if (!container)
return nullptr;
container->SetOpacity(mFrame->StyleDisplay()->mOpacity);
container->SetOpacity(mOpacity);
nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer(container, aBuilder,
this, mFrame,
eCSSProperty_opacity);
@ -3344,6 +3346,18 @@ nsDisplayOpacity::NeedsActiveLayer()
return false;
}
bool
nsDisplayOpacity::ApplyOpacity(nsDisplayListBuilder* aBuilder,
float aOpacity,
const DisplayItemClip* aClip)
{
mOpacity = mOpacity * aOpacity;
if (aClip) {
IntersectClip(aBuilder, *aClip);
}
return true;
}
bool
nsDisplayOpacity::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
{
@ -3358,7 +3372,7 @@ nsDisplayOpacity::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
return false;
}
return child->ApplyOpacity(aBuilder, mFrame->StyleDisplay()->mOpacity, mClip);
return child->ApplyOpacity(aBuilder, mOpacity, mClip);
}
nsDisplayItem::LayerState
@ -3408,7 +3422,7 @@ bool nsDisplayOpacity::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* a
void
nsDisplayOpacity::WriteDebugInfo(nsACString& aTo)
{
aTo += nsPrintfCString(" (opacity %f)", mFrame->StyleDisplay()->mOpacity);
aTo += nsPrintfCString(" (opacity %f)", mOpacity);
}
#endif

6
layout/base/nsDisplayList.h
View File

@ -2747,6 +2747,9 @@ public:
{
// We don't need to compute an invalidation region since we have LayerTreeInvalidation
}
virtual bool ApplyOpacity(nsDisplayListBuilder* aBuilder,
float aOpacity,
const DisplayItemClip* aClip) MOZ_OVERRIDE;
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
bool NeedsActiveLayer();
NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
@ -2755,6 +2758,9 @@ public:
#endif
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
private:
float mOpacity;
};
class nsDisplayMixBlendMode : public nsDisplayWrapList {