diff options
| author |  Mike Reed <reed@google.com> | 2016-11-03 14:45:31 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:54:08 +0000 |
| commit | faba3715b8ddfaa0ce4df79bc8006e9bc7694e5b (patch) | |
| tree | 7d12df48b54ebdb69209e784872831f32abbe30f /include/utils | |
| parent | 8b1fb741f196b78479b9d5bb2b33875aaa9709bb (diff) | |
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>
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/SkDumpCanvas.h | 4 | ||||
| -rw-r--r-- | include/utils/SkLuaCanvas.h | 2 | ||||
| -rw-r--r-- | include/utils/SkNWayCanvas.h | 4 | ||||
| -rw-r--r-- | include/utils/SkPaintFilterCanvas.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index a25f2b8470..c2152f23d8 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -93,7 +93,7 @@ protected: virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint) override; virtual 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 onDrawPaint(const SkPaint&) override; @@ -113,7 +113,7 @@ protected: const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM xmode, + const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) override; diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h index 6342fba4d4..c03a1f0afc 100644 --- a/include/utils/SkLuaCanvas.h +++ b/include/utils/SkLuaCanvas.h @@ -59,7 +59,7 @@ protected: const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM xmode, + const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) override; diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h index 6a3728bdb9..e8b88ab157 100644 --- a/include/utils/SkNWayCanvas.h +++ b/include/utils/SkNWayCanvas.h @@ -52,7 +52,7 @@ protected: void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[], const SkRect* cull, const SkPaint& paint) override; virtual 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 onDrawPaint(const SkPaint&) override; @@ -72,7 +72,7 @@ protected: const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM xmode, + const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) override; diff --git a/include/utils/SkPaintFilterCanvas.h b/include/utils/SkPaintFilterCanvas.h index 69cdff42d3..7dc7969e6e 100644 --- a/include/utils/SkPaintFilterCanvas.h +++ b/include/utils/SkPaintFilterCanvas.h @@ -76,11 +76,11 @@ protected: const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM xmode, + const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) 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 onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; |