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

Backed out changeset 63e2a056311a (bug 1187464) for reftest failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-02-03 15:04:37 +01:00
parent 0d242cb807
commit a05d5c2081
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/2d/Logging.h
View File

@ -131,7 +131,6 @@ enum class LogReason : int {
GlyphAllocFailedCG,
InvalidRect,
CannotDraw3D, // 20
IncompatibleBasicTexturedEffect,
// End
MustBeLessThanThis = 101,
};

7
gfx/layers/basic/BasicCompositor.cpp
View File

@ -430,14 +430,14 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect,
static_cast<TexturedEffect*>(aEffectChain.mPrimaryEffect.get());
TextureSourceBasic* source = texturedEffect->mTexture->AsSourceBasic();
if (source && texturedEffect->mPremultiplied) {
if (texturedEffect->mPremultiplied) {
DrawSurfaceWithTextureCoords(dest, aRect,
source->GetSurface(dest),
texturedEffect->mTextureCoords,
texturedEffect->mFilter,
DrawOptions(aOpacity, blendMode),
sourceMask, &maskTransform);
} else if (source) {
} else {
RefPtr<DataSourceSurface> srcData = source->GetSurface(dest)->GetDataSurface();
// Yes, we re-create the premultiplied data every time.
@ -450,10 +450,7 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect,
texturedEffect->mFilter,
DrawOptions(aOpacity, blendMode),
sourceMask, &maskTransform);
} else {
gfxDevCrash(LogReason::IncompatibleBasicTexturedEffect) << "Bad for basic";
}
break;
}
case EffectTypes::YCBCR: {