Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-31 21:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 948955 - AddMaskEffect handles locking failure. r=bjacob

Browse Source
This commit is contained in:
Nicolas Silva 2013-12-11 18:32:41 +01:00
parent 07c26e237c
commit 7841da0a81
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/layers/composite/CompositableHost.cpp
View File

@ -136,13 +136,11 @@ CompositableHost::AddMaskEffect(EffectChain& aEffects,
{
RefPtr<TextureSource> source;
RefPtr<DeprecatedTextureHost> oldHost = GetDeprecatedTextureHost();
if (oldHost) {
oldHost->Lock();
if (oldHost && oldHost->Lock()) {
source = oldHost;
} else {
RefPtr<TextureHost> host = GetAsTextureHost();
if (host) {
host->Lock();
if (host && host->Lock()) {
source = host->GetTextureSources();
}
}

4
gfx/layers/composite/LayerManagerComposite.cpp
View File

@ -726,7 +726,9 @@ LayerManagerComposite::AutoAddMaskEffect::AutoAddMaskEffect(Layer* aMaskLayer,
gfx::Matrix4x4 transform;
ToMatrix4x4(aMaskLayer->GetEffectiveTransform(), transform);
mCompositable->AddMaskEffect(aEffects, transform, aIs3D);
if (!mCompositable->AddMaskEffect(aEffects, transform, aIs3D)) {
mCompositable = nullptr;
}
}
LayerManagerComposite::AutoAddMaskEffect::~AutoAddMaskEffect()