clone of https://codereview.appspot.com/7208043/
Review URL: https://codereview.appspot.com/7232062
git-svn-id: http://skia.googlecode.com/svn/trunk@7476 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/blend.cpp b/gm/blend.cpp
index 452eb49..5b4ff98 100644
--- a/gm/blend.cpp
+++ b/gm/blend.cpp
@@ -82,7 +82,7 @@
SkAutoTUnref<SkImageFilter> background(SkNEW_ARGS(SkBitmapSource, (fCheckerboard)));
paint.setImageFilter(SkNEW_ARGS(SkBlendImageFilter, (SkBlendImageFilter::kNormal_Mode, background)))->unref();
drawClippedBitmap(canvas, paint, 0);
- paint.setImageFilter(SkNEW_ARGS(SkBlendImageFilter, (SkBlendImageFilter::kMultiply_Mode, background)))->unref();
+ paint.setImageFilter(SkNEW_ARGS(SkBlendImageFilter, (SkBlendImageFilter::kModulate_Mode, background)))->unref();
drawClippedBitmap(canvas, paint, 100);
paint.setImageFilter(SkNEW_ARGS(SkBlendImageFilter, (SkBlendImageFilter::kScreen_Mode, background)))->unref();
drawClippedBitmap(canvas, paint, 200);
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index fa0c091..3e1ccb8 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -116,7 +116,7 @@
SkXfermode::kDstATop_Mode,
SkXfermode::kXor_Mode,
SkXfermode::kPlus_Mode,
- SkXfermode::kMultiply_Mode,
+ SkXfermode::kModulate_Mode,
};
SkPaint paint;
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp
index 0e47de2..9eb2f87 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -102,7 +102,7 @@
{ SkXfermode::kXor_Mode, "Xor" },
{ SkXfermode::kPlus_Mode, "Plus" },
- { SkXfermode::kMultiply_Mode, "Multiply" },
+ { SkXfermode::kModulate_Mode, "Modulate" },
{ SkXfermode::kScreen_Mode, "Screen" },
{ SkXfermode::kOverlay_Mode, "Overlay" },
{ SkXfermode::kDarken_Mode, "Darken" },
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index e2043ea..1e7e828 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -827,7 +827,7 @@
@param xmode Used if both texs and colors are present. In this
case the colors are combined with the texture using mode,
before being drawn using the paint. If mode is null, then
- kMultiply_Mode is used.
+ kModulate_Mode is used.
@param indices If not null, array of indices to reference into the
vertex (texs, colors) array.
@param indexCount number of entries in the indices array (if not null)
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index 7cb88b9..d396529 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -103,7 +103,7 @@
// all remaining modes are defined in the SVG Compositing standard
// http://www.w3.org/TR/2009/WD-SVGCompositing-20090430/
kPlus_Mode,
- kMultiply_Mode,
+ kModulate_Mode, // multiplies all components (= alpha and color)
// all above modes can be expressed as pair of src/dst Coeffs
kCoeffModesCnt,
diff --git a/include/effects/SkBlendImageFilter.h b/include/effects/SkBlendImageFilter.h
index a2dc847..6b01963 100644
--- a/include/effects/SkBlendImageFilter.h
+++ b/include/effects/SkBlendImageFilter.h
@@ -15,7 +15,7 @@
public:
enum Mode {
kNormal_Mode,
- kMultiply_Mode,
+ kModulate_Mode, // TODO: replace this with the (soon to be) SkXfermode version of kMultiply_Mode
kScreen_Mode,
kDarken_Mode,
kLighten_Mode,
diff --git a/include/effects/SkPorterDuff.h b/include/effects/SkPorterDuff.h
index 1bba171..c5f5492 100644
--- a/include/effects/SkPorterDuff.h
+++ b/include/effects/SkPorterDuff.h
@@ -40,7 +40,7 @@
kXor_Mode, //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc]
kDarken_Mode, //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + min(Sc, Dc)]
kLighten_Mode, //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + max(Sc, Dc)]
- kMultiply_Mode, //!< [Sa * Da, Sc * Dc]
+ kModulate_Mode, //!< [Sa * Da, Sc * Dc] multiplies all components
kScreen_Mode, //!< [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc]
kAdd_Mode, //!< Saturate(S + D)
#ifdef SK_BUILD_FOR_ANDROID
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index 976f15b..41392ac 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -186,7 +186,7 @@
SkXfermode::kDstATop_Mode,
SkXfermode::kXor_Mode,
SkXfermode::kPlus_Mode,
- SkXfermode::kMultiply_Mode,
+ SkXfermode::kModulate_Mode,
};
static const SkColor gColors[] = {
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index 9d368a2..a4e410c 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp
@@ -159,7 +159,7 @@
{ SkXfermode::kXor_Mode, "Xor" },
{ SkXfermode::kPlus_Mode, "Plus" },
- /*{ SkXfermode::kMultiply_Mode, "Multiply" },
+ /*{ SkXfermode::kModulate_Mode, "Modulate" },
{ SkXfermode::kScreen_Mode, "Screen" },
{ SkXfermode::kOverlay_Mode, "Overlay" },
{ SkXfermode::kDarken_Mode, "Darken" },
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 6d8bfc5..4b06b88 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -2499,7 +2499,7 @@
SkASSERT(shader);
bool releaseMode = false;
if (NULL == xmode) {
- xmode = SkXfermode::Create(SkXfermode::kMultiply_Mode);
+ xmode = SkXfermode::Create(SkXfermode::kModulate_Mode);
releaseMode = true;
}
SkShader* compose = SkNEW_ARGS(SkComposeShader,
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index a248cda..520ab87 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -182,8 +182,8 @@
return SkPackARGB32(a, r, g, b);
}
-// kMultiply_Mode
-static SkPMColor multiply_modeproc(SkPMColor src, SkPMColor dst) {
+// kModulate_Mode
+static SkPMColor modulate_modeproc(SkPMColor src, SkPMColor dst) {
int a = SkAlphaMulAlpha(SkGetPackedA32(src), SkGetPackedA32(dst));
int r = SkAlphaMulAlpha(SkGetPackedR32(src), SkGetPackedR32(dst));
int g = SkAlphaMulAlpha(SkGetPackedG32(src), SkGetPackedG32(dst));
@@ -436,7 +436,7 @@
{ xor_modeproc, SkXfermode::kIDA_Coeff, SkXfermode::kISA_Coeff },
{ plus_modeproc, SkXfermode::kOne_Coeff, SkXfermode::kOne_Coeff },
- { multiply_modeproc,SkXfermode::kZero_Coeff, SkXfermode::kSC_Coeff },
+ { modulate_modeproc,SkXfermode::kZero_Coeff, SkXfermode::kSC_Coeff },
{ screen_modeproc, CANNOT_USE_COEFF, CANNOT_USE_COEFF },
{ overlay_modeproc, CANNOT_USE_COEFF, CANNOT_USE_COEFF },
{ darken_modeproc, CANNOT_USE_COEFF, CANNOT_USE_COEFF },
@@ -771,7 +771,7 @@
const char *gModeStrings[kLastMode+1] = {
"Clear", "Src", "Dst", "SrcOver", "DstOver", "SrcIn", "DstIn",
"SrcOut", "DstOut", "SrcATop", "DstATop", "Xor", "Plus",
- "Multiply", "Screen", "Overlay", "Darken", "Lighten", "ColorDodge",
+ "Modulate", "Screen", "Overlay", "Darken", "Lighten", "ColorDodge",
"ColorBurn", "HardLight", "SoftLight", "Difference", "Exclusion"
};
@@ -1234,7 +1234,7 @@
{ NULL, NULL, NULL }, // XOR
{ NULL, NULL, NULL }, // plus
- { NULL, NULL, NULL }, // multiply
+ { NULL, NULL, NULL }, // modulate
{ NULL, NULL, NULL }, // screen
{ NULL, NULL, NULL }, // overlay
{ darken_modeproc16_0, darken_modeproc16_255, NULL }, // darken
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index 775eba6..46f2564 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -24,8 +24,8 @@
switch (mode) {
case SkBlendImageFilter::kNormal_Mode:
return SkXfermode::kSrcOver_Mode;
- case SkBlendImageFilter::kMultiply_Mode:
- return SkXfermode::kMultiply_Mode;
+ case SkBlendImageFilter::kModulate_Mode:
+ return SkXfermode::kModulate_Mode;
case SkBlendImageFilter::kScreen_Mode:
return SkXfermode::kScreen_Mode;
case SkBlendImageFilter::kDarken_Mode:
@@ -100,7 +100,7 @@
// FEBlend's multiply mode is (1 - Sa) * Da + (1 - Da) * Sc + Sc * Dc
// Skia's is just Sc * Dc. So we use a custom proc to implement FEBlend's
// version.
- if (fMode == SkBlendImageFilter::kMultiply_Mode) {
+ if (fMode == SkBlendImageFilter::kModulate_Mode) {
paint.setXfermode(new SkProcXfermode(multiply_proc))->unref();
} else {
paint.setXfermodeMode(modeToXfermode(fMode));
@@ -283,7 +283,7 @@
case SkBlendImageFilter::kNormal_Mode:
code->appendf("\t\t%s.rgb = (1.0 - %s.a) * %s.rgb + %s.rgb;\n", outputColor, fgColor, bgColor, fgColor);
break;
- case SkBlendImageFilter::kMultiply_Mode:
+ case SkBlendImageFilter::kModulate_Mode:
code->appendf("\t\t%s.rgb = (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb + %s.rgb * %s.rgb;\n", outputColor, fgColor, bgColor, bgColor, fgColor, fgColor, bgColor);
break;
case SkBlendImageFilter::kScreen_Mode:
diff --git a/src/effects/SkPorterDuff.cpp b/src/effects/SkPorterDuff.cpp
index 4dc9783..816ddae 100644
--- a/src/effects/SkPorterDuff.cpp
+++ b/src/effects/SkPorterDuff.cpp
@@ -36,7 +36,7 @@
MAKE_PAIR(Xor),
MAKE_PAIR(Darken),
MAKE_PAIR(Lighten),
- MAKE_PAIR(Multiply),
+ MAKE_PAIR(Modulate),
MAKE_PAIR(Screen),
{ SkPorterDuff::kAdd_Mode, SkXfermode::kPlus_Mode },
#ifdef SK_BUILD_FOR_ANDROID
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 50fcc2b..c052091 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -22,7 +22,7 @@
static const SkXfermode::Mode modeMap[] = {
SkXfermode::kDstOut_Mode, // kDifference_Op
- SkXfermode::kMultiply_Mode, // kIntersect_Op
+ SkXfermode::kModulate_Mode, // kIntersect_Op
SkXfermode::kSrcOver_Mode, // kUnion_Op
SkXfermode::kXor_Mode, // kXOR_Op
SkXfermode::kClear_Mode, // kReverseDifference_Op
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index b1170d3..18f66b5 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1629,7 +1629,7 @@
}
if (NULL != xmode && NULL != texs && NULL != colors) {
- if (!SkXfermode::IsMode(xmode, SkXfermode::kMultiply_Mode)) {
+ if (!SkXfermode::IsMode(xmode, SkXfermode::kModulate_Mode)) {
SkDebugf("Unsupported vertex-color/texture xfer mode.\n");
#if 0
return
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index c326b3b..ea8621f 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -16,7 +16,7 @@
static const char* blend_mode_from_xfermode(SkXfermode::Mode mode) {
switch (mode) {
case SkXfermode::kSrcOver_Mode: return "Normal";
- case SkXfermode::kMultiply_Mode: return "Multiply";
+ case SkXfermode::kModulate_Mode: return "Multiply";
case SkXfermode::kScreen_Mode: return "Screen";
case SkXfermode::kOverlay_Mode: return "Overlay";
case SkXfermode::kDarken_Mode: return "Darken";