From d47067392848ba132d4e86ffbeebe2dcacda9534 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 15 Nov 2016 16:44:34 -0500 Subject: 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 Reviewed-by: Florin Malita --- gm/xfermodes2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/xfermodes2.cpp') diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 03da0d3317..4d6b5e7fe9 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -7,7 +7,7 @@ #include "gm.h" #include "SkBitmap.h" #include "SkShader.h" -#include "SkXfermode.h" +#include "SkBlendModePriv.h" #include "SkColorPriv.h" namespace skiagm { @@ -39,7 +39,7 @@ protected: const int W = 6; SkScalar x = 0, y = 0; - for (size_t m = 0; m <= SkXfermode::kLastMode; m++) { + for (size_t m = 0; m <= (size_t)SkBlendMode::kLastMode; m++) { SkBlendMode mode = static_cast(m); canvas->save(); @@ -71,7 +71,7 @@ protected: canvas->restore(); #if 1 - canvas->drawText(SkXfermode::ModeName(mode), strlen(SkXfermode::ModeName(mode)), + canvas->drawText(SkBlendMode_Name(mode), strlen(SkBlendMode_Name(mode)), x + w/2, y - labelP.getTextSize()/2, labelP); #endif x += w + SkIntToScalar(10); -- cgit v1.2.3