Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.
Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117
R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384
Author: bensong@google.com
Review URL: https://codereview.chromium.org/234833003
git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index 205e9a9..f938ba6 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -306,9 +306,9 @@
bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
const Context& ctx, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kN32_SkColorType);
+ SkASSERT(src.colorType() == kPMColor_SkColorType);
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkBicubicImageFilter.cpp b/src/effects/SkBicubicImageFilter.cpp
index 8f78ff2..eabf066 100644
--- a/src/effects/SkBicubicImageFilter.cpp
+++ b/src/effects/SkBicubicImageFilter.cpp
@@ -91,7 +91,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 63990ab..363691a 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -149,7 +149,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 3922244..0200cab 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -205,8 +205,8 @@
(displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
return false;
}
- if ((displ.colorType() != kN32_SkColorType) ||
- (color.colorType() != kN32_SkColorType)) {
+ if ((displ.colorType() != kPMColor_SkColorType) ||
+ (color.colorType() != kPMColor_SkColorType)) {
return false;
}
SkIRect bounds;
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index b485ae1..09ceef0 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -943,7 +943,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
SkIRect bounds;
@@ -1034,7 +1034,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 5096640..51ade99 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -282,11 +282,11 @@
bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
const Context&, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kN32_SkColorType);
+ SkASSERT(src.colorType() == kPMColor_SkColorType);
SkASSERT(fSrcRect.width() < src.width());
SkASSERT(fSrcRect.height() < src.height());
- if ((src.colorType() != kN32_SkColorType) ||
+ if ((src.colorType() != kPMColor_SkColorType) ||
(fSrcRect.width() >= src.width()) ||
(fSrcRect.height() >= src.height())) {
return false;
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index 878cbae..7b9812d 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -260,7 +260,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 2350e6c..fb69758 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -149,7 +149,7 @@
return false;
}
- if (src.colorType() != kN32_SkColorType) {
+ if (src.colorType() != kPMColor_SkColorType) {
return false;
}
diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp
index bd8b99a..b6a5e1e 100644
--- a/src/effects/SkTransparentShader.cpp
+++ b/src/effects/SkTransparentShader.cpp
@@ -29,7 +29,7 @@
if (fAlpha == 255)
flags |= kOpaqueAlpha_Flag;
break;
- case kN32_SkColorType:
+ case kPMColor_SkColorType:
if (fAlpha == 255 && fDevice->isOpaque())
flags |= kOpaqueAlpha_Flag;
break;
@@ -43,7 +43,7 @@
unsigned scale = SkAlpha255To256(fAlpha);
switch (fDevice->colorType()) {
- case kN32_SkColorType:
+ case kPMColor_SkColorType:
if (scale == 256) {
SkPMColor* src = fDevice->getAddr32(x, y);
if (src != span) {
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 2ebb9c7..b1fa560 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -517,7 +517,7 @@
info.fWidth = kCache32Count;
info.fHeight = 4; // for our 4 dither rows
info.fAlphaType = kPremul_SkAlphaType;
- info.fColorType = kN32_SkColorType;
+ info.fColorType = kPMColor_SkColorType;
if (NULL == fCache32PixelRef) {
fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, NULL);