aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gamma.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-11-15 16:44:34 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-16 15:38:11 +0000
commitd47067392848ba132d4e86ffbeebe2dcacda9534 (patch)
tree456bd4182524d55f19117d8e726bacca50059fa8 /gm/gamma.cpp
parent988283c89458442f65d961f2746a9f271a39c31e (diff)
make SkXfermode.h go away
This is step one: - make SkXfermode useless to public clients - everything they should need is in SkBlendMode.h Step two: - remove SkXfermode.h entirely (since skia core will already be using SkXfermodePriv.h) BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4534 Change-Id: If2cea9f71df92430ed6644edb98dd306c5572cbc Reviewed-on: https://skia-review.googlesource.com/4534 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'gm/gamma.cpp')
-rw-r--r--gm/gamma.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gm/gamma.cpp b/gm/gamma.cpp
index 4e80bbf3b0..09f80dd327 100644
--- a/gm/gamma.cpp
+++ b/gm/gamma.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "Resources.h"
+#include "SkBlendModePriv.h"
#include "SkGradientShader.h"
#include "SkPM4fPriv.h"
@@ -86,7 +87,7 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) {
SkString dstText = SkStringPrintf("%08X", dstColor);
canvas->drawText(srcText.c_str(), srcText.size(), 0, sz + textPaint.getFontSpacing(),
textPaint);
- const char* modeName = SkXfermode::ModeName(mode);
+ const char* modeName = SkBlendMode_Name(mode);
canvas->drawText(modeName, strlen(modeName), 0, sz + 2 * textPaint.getFontSpacing(),
textPaint);
canvas->drawText(dstText.c_str(), dstText.size(), 0, sz + 3 * textPaint.getFontSpacing(),