Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Unified Diff: src/core/SkBitmapProcShader.cpp

Issue 227433009: Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkBitmapFilter.cpp ('k') | src/core/SkBitmapScaler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapProcShader.cpp
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 9c2c77b9506c6fd0f8107df5fe297d845abddaa9..a397b78439d6f7854f986565b927f0325f0494db 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -22,7 +22,7 @@ bool SkBitmapProcShader::CanDo(const SkBitmap& bm, TileMode tx, TileMode ty) {
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
// if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx))
return true;
default:
@@ -130,7 +130,7 @@ bool SkBitmapProcShader::setContext(const SkBitmap& device,
flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag);
break;
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (bitmapIsOpaque) {
flags |= kHasSpan16_Flag;
}
@@ -279,7 +279,7 @@ static bool canUseColorShader(const SkBitmap& bm, SkColor* color) {
}
switch (bm.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*color = SkUnPreMultiply::PMColorToColor(*bm.getAddr32(0, 0));
return true;
case kRGB_565_SkColorType:
« no previous file with comments | « src/core/SkBitmapFilter.cpp ('k') | src/core/SkBitmapScaler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698