AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkImageInfoValidConversion (part 2)

Browse Source 
Disabling non-opaque -> opaque should be fine now that the
Chrome unit test has been fixed.

BUG=skia:6021

Change-Id: I39f087e2695bdefacf793bd137931e3115ec58cb
Reviewed-on: https://skia-review.googlesource.com/7121
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
This commit is contained in:
Matt Sarett 2017-01-17 13:57:45 -05:00 committed by Skia Commit-Bot
parent 8446854348
commit 94bd50cc55
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/SkImageInfoPriv.h
View File

@ -69,11 +69,9 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm
return false;
}
// FIXME (msarett): This is commented out until a fix to Chrome's gfx_unittest lands.
// In those tests, they write kPremul pixels to a kOpaque canvas.
//if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
// return false;
//}
if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
return false;
}
return true;
}