Commit 1f673896 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

ui: CHECK that UnPremultiply is passed a 32bpp image

To do otherwise results in accessing random data.

BUG=1147430
TEST=none

Change-Id: Icedacbaac64cad3fc903e6423c6f9aad8c1e8cb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531118
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826300}
parent 52b1f708
...@@ -630,6 +630,8 @@ SkBitmap SkBitmapOperations::UnPreMultiply(const SkBitmap& bitmap) { ...@@ -630,6 +630,8 @@ SkBitmap SkBitmapOperations::UnPreMultiply(const SkBitmap& bitmap) {
return bitmap; return bitmap;
if (bitmap.alphaType() != kPremul_SkAlphaType) if (bitmap.alphaType() != kPremul_SkAlphaType)
return bitmap; return bitmap;
// It's expected this code is called with a 32bpp image.
CHECK_EQ(kN32_SkColorType, bitmap.colorType());
const SkImageInfo& opaque_info = const SkImageInfo& opaque_info =
bitmap.info().makeAlphaType(kUnpremul_SkAlphaType); bitmap.info().makeAlphaType(kUnpremul_SkAlphaType);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment