aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-30 21:36:11 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-30 21:36:11 +0000
commit8d3cd7a170c810e3816bf00220cbef51e7b16795 (patch)
tree6a76204c1d68934976e1542fc05e82d5a130a6b0 /gm
parent118c1a70c7e8f9733d406cf69de9a5970b3ceb01 (diff)
Review URL: https://codereview.appspot.com/7232062 git-svn-id: http://skia.googlecode.com/svn/trunk@7476 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r--gm/blend.cpp2
-rw-r--r--gm/modecolorfilters.cpp2
-rw-r--r--gm/xfermodes.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/gm/blend.cpp b/gm/blend.cpp
index 452eb4945c..5b4ff987f8 100644
--- a/gm/blend.cpp
+++ b/gm/blend.cpp
@@ -82,7 +82,7 @@ protected:
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 fa0c09118c..3e1ccb8494 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -116,7 +116,7 @@ protected:
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 0e47de29ad..9eb2f8741c 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -102,7 +102,7 @@ protected:
{ 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" },