remove unused code around SK_SUPPORT_LEGACY_XFERMODE_PARAM
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4384
Change-Id: I5121acd027d935ade169ff65941f29f654a47bd0
Reviewed-on: https://skia-review.googlesource.com/4384
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 887d416..85a3e98 100644
--- a/tools/android/SkAndroidSDKCanvas.cpp
+++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -64,7 +64,7 @@
SkColorFilter* cf = paint->getColorFilter();
if (cf) {
SkColor color;
- SK_XFERMODE_MODE_PARAM mode;
+ SkBlendMode mode;
SkScalar srcColorMatrix[20];
bool isMode = cf->asColorMode(&color, &mode);
if (isMode && (int)mode > (int)SkBlendMode::kLighten) {
@@ -165,12 +165,12 @@
void SkAndroidSDKCanvas::onDrawVertices(VertexMode vMode,
int vertexCount,
const SkPoint vertices[],
- const SkPoint texs[], const SkColor colors[], SK_XFERMODE_PARAM xMode,
+ const SkPoint texs[], const SkColor colors[], SkBlendMode bmode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) {
FILTER(paint);
fProxyTarget->drawVertices(vMode, vertexCount, vertices, texs, colors,
- xMode, indices, indexCount, filteredPaint);
+ bmode, indices, indexCount, filteredPaint);
}
void SkAndroidSDKCanvas::onDrawDRRect(const SkRRect& outer,
@@ -228,10 +228,10 @@
void SkAndroidSDKCanvas::onDrawPatch(const SkPoint cubics[12],
const SkColor colors[4],
const SkPoint texCoords[4],
- SK_XFERMODE_PARAM xmode,
+ SkBlendMode bmode,
const SkPaint& paint) {
FILTER(paint);
- fProxyTarget->drawPatch(cubics, colors, texCoords, xmode, filteredPaint);
+ fProxyTarget->drawPatch(cubics, colors, texCoords, bmode, filteredPaint);
}
@@ -264,12 +264,11 @@
const SkRect tex[],
const SkColor colors[],
int count,
- SK_XFERMODE_MODE_PARAM mode,
+ SkBlendMode mode,
const SkRect* cullRect,
const SkPaint* paint) {
FILTER_PTR(paint);
- fProxyTarget->drawAtlas(atlas, xform, tex, colors, count, mode, cullRect,
- filteredPaint);
+ fProxyTarget->drawAtlas(atlas, xform, tex, colors, count, mode, cullRect, filteredPaint);
}
void SkAndroidSDKCanvas::onDrawImageNine(const SkImage* image,
diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h
index de22dbd..ca92ea4 100644
--- a/tools/android/SkAndroidSDKCanvas.h
+++ b/tools/android/SkAndroidSDKCanvas.h
@@ -49,7 +49,7 @@
void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint) override;
void onDrawVertices(VertexMode vMode, int vertexCount, const SkPoint vertices[],
- const SkPoint texs[], const SkColor colors[], SK_XFERMODE_PARAM xMode,
+ const SkPoint texs[], const SkColor colors[], SkBlendMode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) override;
@@ -70,7 +70,7 @@
const SkPaint& paint) override;
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
- const SkPoint texCoords[4], SK_XFERMODE_PARAM xmode,
+ const SkPoint texCoords[4], SkBlendMode,
const SkPaint& paint) override;
void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
@@ -78,7 +78,7 @@
SrcRectConstraint) override;
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[],
- const SkColor[], int count, SK_XFERMODE_MODE_PARAM,
+ const SkColor[], int count, SkBlendMode,
const SkRect* cull, const SkPaint*) override;
void onDrawImageNine(const SkImage*, const SkIRect& center,
const SkRect& dst, const SkPaint*) override;
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp
index 8bdaca1..bc699fc 100644
--- a/tools/debugger/SkDebugCanvas.cpp
+++ b/tools/debugger/SkDebugCanvas.cpp
@@ -654,25 +654,15 @@
}
void SkDebugCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
- const SkPoint texCoords[4], SK_XFERMODE_PARAM xmode,
+ const SkPoint texCoords[4], SkBlendMode bmode,
const SkPaint& paint) {
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM
- SkBlendMode bmode = xmode ? xmode->blend() : SkBlendMode::kModulate;
-#else
- SkBlendMode bmode = xmode;
-#endif
this->addDrawCommand(new SkDrawPatchCommand(cubics, colors, texCoords, bmode, paint));
}
void SkDebugCanvas::onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[],
const SkPoint texs[], const SkColor colors[],
- SK_XFERMODE_PARAM xmode, const uint16_t indices[], int indexCount,
+ SkBlendMode bmode, const uint16_t indices[], int indexCount,
const SkPaint& paint) {
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM
- SkBlendMode bmode = xmode ? xmode->blend() : SkBlendMode::kModulate;
-#else
- SkBlendMode bmode = xmode;
-#endif
this->addDrawCommand(new SkDrawVerticesCommand(vmode, vertexCount, vertices,
texs, colors, bmode, indices, indexCount, paint));
}
diff --git a/tools/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h
index b7d7f79..6e7086e 100644
--- a/tools/debugger/SkDebugCanvas.h
+++ b/tools/debugger/SkDebugCanvas.h
@@ -226,7 +226,7 @@
const SkPaint& paint) override;
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
- const SkPoint texCoords[4], SK_XFERMODE_PARAM, const SkPaint& paint) override;
+ const SkPoint texCoords[4], SkBlendMode, const SkPaint& paint) override;
void onDrawPaint(const SkPaint&) override;
void onDrawRect(const SkRect&, const SkPaint&) override;
@@ -236,7 +236,7 @@
void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
void onDrawVertices(VertexMode vmode, int vertexCount,
const SkPoint vertices[], const SkPoint texs[],
- const SkColor colors[], SK_XFERMODE_PARAM,
+ const SkColor colors[], SkBlendMode,
const uint16_t indices[], int indexCount,
const SkPaint&) override;
void onDrawPath(const SkPath&, const SkPaint&) override;