Index: src/codec/SkSwizzler.cpp |
diff --git a/src/codec/SkSwizzler.cpp b/src/codec/SkSwizzler.cpp |
index 563933f13a03c16e880c2b8132c7df3657fc4868..4ab742c7b7cacecee947f32aa583677ab4af75fb 100644 |
--- a/src/codec/SkSwizzler.cpp |
+++ b/src/codec/SkSwizzler.cpp |
@@ -134,8 +134,8 @@ static bool swizzle_rgba_to_n32_unpremul_skipZ(void* SK_RESTRICT dstRow, |
*/ |
SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc, const SkPMColor* ctable, |
- const SkImageInfo& info, void* dst, |
- size_t dstRowBytes, bool skipZeroes) { |
+ const SkImageInfo& info, void* dst, size_t dstRowBytes, |
+ SkImageGenerator::ZeroInitialized zeroInit) { |
if (info.colorType() == kUnknown_SkColorType) { |
return NULL; |
} |
@@ -151,7 +151,7 @@ SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc, const SkPMColor |
switch (info.colorType()) { |
case kN32_SkColorType: |
// We assume the color premultiplied ctable (or not) as desired. |
- if (skipZeroes) { |
+ if (SkImageGenerator::kYes_ZeroInitialized == zeroInit) { |
proc = &swizzle_index_to_n32_skipZ; |
} else { |
proc = &swizzle_index_to_n32; |
@@ -176,10 +176,10 @@ SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc, const SkPMColor |
switch (info.colorType()) { |
case kN32_SkColorType: |
if (info.alphaType() == kUnpremul_SkAlphaType) { |
- // Respect skipZeroes? |
+ // Respect zeroInit? |
proc = &swizzle_rgba_to_n32_unpremul; |
} else { |
- if (skipZeroes) { |
+ if (SkImageGenerator::kYes_ZeroInitialized == zeroInit) { |
proc = &swizzle_rgba_to_n32_premul_skipZ; |
} else { |
proc = &swizzle_rgba_to_n32_premul; |