diff options
author | 2016-11-03 14:45:31 -0400 | |
---|---|---|
committer | 2016-11-03 19:54:08 +0000 | |
commit | faba3715b8ddfaa0ce4df79bc8006e9bc7694e5b (patch) | |
tree | 7d12df48b54ebdb69209e784872831f32abbe30f /tools/debugger/SkDebugCanvas.cpp | |
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 'tools/debugger/SkDebugCanvas.cpp')
-rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index 8bdaca1815..bc699fce22 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -654,25 +654,15 @@ void SkDebugCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar } 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)); } |