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

Revert "Revert "SkImageInfoValidConversion (part 2)""

Browse Source 
This reverts commit 8dadd9e893.

Reason for revert: Fixed Chrome.  This should roll now.

Original change's description:
> Revert "SkImageInfoValidConversion (part 2)"
> 
> This reverts commit 94bd50cc55.
> 
> Reason for revert: Still breaking roll
> 
> Original change's description:
> > SkImageInfoValidConversion (part 2)
> > 
> > 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>
> > 
> 
> TBR=msarett@google.com,brianosman@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:6021
> 
> Change-Id: I79843ea6cf60ca94822446c548f3386706924ee6
> Reviewed-on: https://skia-review.googlesource.com/7164
> Commit-Queue: Matt Sarett <msarett@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
> 

TBR=msarett@google.com,brianosman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:6021

Change-Id: I40a85ac2e407de15916f0893d55163aea44157cb
Reviewed-on: https://skia-review.googlesource.com/7181
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
This commit is contained in:
Matt Sarett 2017-01-18 16:04:50 +00:00 committed by Skia Commit-Bot
parent 7a090c403d
commit 93a8a64543
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;
}