diff options
Diffstat (limited to 'tools/debugger')
| -rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 14 | ||||
| -rw-r--r-- | tools/debugger/SkDebugCanvas.h | 4 |
2 files changed, 4 insertions, 14 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)); } diff --git a/tools/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h index b7d7f79cb8..6e7086e6ce 100644 --- a/tools/debugger/SkDebugCanvas.h +++ b/tools/debugger/SkDebugCanvas.h @@ -226,7 +226,7 @@ protected: 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 @@ protected: 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; |