| commit | 574290f61a47bd1ce1f9e2d941533bda9c8f03fe | [log] [tgz] |
|---|---|---|
| author | scroggo <scroggo@google.com> | Fri Feb 27 06:21:58 2015 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Feb 27 06:21:58 2015 -0800 |
| tree | d52a7b9bd64a97be9d006aa016ffb8f2cf928a2a | |
| parent | 1c8aeeaebce9675197be31bd769e8ffa2531bf86 [diff] [blame] |
Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType (patchset #3 id:40001 of https://codereview.chromium.org/964613002/) Reason for revert: This breaks Android framework build. See https://android-build.storage.googleapis.com/builds/git_master-skia-linux-volantisg-userdebug/1759130/7f0fcdbf3c0d47530d770a15c912298dac20dd7d90a01de63ecb9ba16c96b25c/logs/build_error.log?Expires=1425047630&GoogleAccessId=701025073339-mqn0q2nvir9iurm6q5d00tdv7blbgvjr%40developer.gserviceaccount.com&Signature=BHPS1lffyH7WykwyEw5RXVVXWqQK5rab%2B6Pl1VaUrTlmWT%2FXb6fq%2FBe22AUDZYFPG24MBR%2F2IzIDzTqH3mihQS9wIkcKJ4kJpA2G%2BI3l8jCX20brZSr3bsDSx%2F4wsLwU1bBpIxI%2FbrauoPRqddbXP8sNI1l51u6ZCxpvRQms9Mc%3D We need to stop them from using kIgnore before we can reland this. Original issue's description: > replace kIgnore_SkAlphaType with kUnknown_SkAlphaType > > BUG=skia: > TBR= > > Committed: https://skia.googlesource.com/skia/+/1c8aeeaebce9675197be31bd769e8ffa2531bf86 TBR=reed@google.com,reed@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/966753002
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index 4675d71..51a5ed9 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -12,9 +12,8 @@ static CGBitmapInfo ComputeCGAlphaInfo_RGBA(SkAlphaType at) { CGBitmapInfo info = kCGBitmapByteOrder32Big; switch (at) { - case kUnknown_SkAlphaType: - break; case kOpaque_SkAlphaType: + case kIgnore_SkAlphaType: info |= kCGImageAlphaNoneSkipLast; break; case kPremul_SkAlphaType: @@ -30,9 +29,8 @@ static CGBitmapInfo ComputeCGAlphaInfo_BGRA(SkAlphaType at) { CGBitmapInfo info = kCGBitmapByteOrder32Little; switch (at) { - case kUnknown_SkAlphaType: - break; case kOpaque_SkAlphaType: + case kIgnore_SkAlphaType: info |= kCGImageAlphaNoneSkipFirst; break; case kPremul_SkAlphaType: