From 70295ea220e25ede0f967ad0168c51a8e3fd444d Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 31 Oct 2016 05:27:57 -0700 Subject: update androidsdkcanvas for SkBlendMode BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2464433003 TBR= Review-Url: https://codereview.chromium.org/2464433003 --- tools/android/SkAndroidSDKCanvas.cpp | 12 ++++++------ tools/android/SkAndroidSDKCanvas.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools/android') diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index f205ac49ca..4db8acd6b3 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp @@ -63,12 +63,12 @@ void Filter(SkPaint* paint) { SkColorFilter* cf = paint->getColorFilter(); if (cf) { SkColor color; - SkXfermode::Mode mode; + SK_XFERMODE_MODE_PARAM mode; SkScalar srcColorMatrix[20]; bool isMode = cf->asColorMode(&color, &mode); - if (isMode && mode > SkXfermode::kLighten_Mode) { + if (isMode && (int)mode > (int)SkBlendMode::kLighten) { paint->setColorFilter( - SkColorFilter::MakeModeFilter(color, SkXfermode::kSrcOver_Mode)); + SkColorFilter::MakeModeFilter(color, SkBlendMode::kSrcOver)); } else if (!isMode && !cf->asColorMatrix(srcColorMatrix)) { paint->setColorFilter(nullptr); } @@ -164,7 +164,7 @@ void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap, void SkAndroidSDKCanvas::onDrawVertices(VertexMode vMode, int vertexCount, const SkPoint vertices[], - const SkPoint texs[], const SkColor colors[], SkXfermode* xMode, + const SkPoint texs[], const SkColor colors[], SK_XFERMODE_PARAM xMode, const uint16_t indices[], int indexCount, const SkPaint& paint) { FILTER(paint); @@ -227,7 +227,7 @@ void SkAndroidSDKCanvas::onDrawTextBlob(const SkTextBlob* blob, void SkAndroidSDKCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], - SkXfermode* xmode, + SK_XFERMODE_PARAM xmode, const SkPaint& paint) { FILTER(paint); fProxyTarget->drawPatch(cubics, colors, texCoords, xmode, filteredPaint); @@ -263,7 +263,7 @@ void SkAndroidSDKCanvas::onDrawAtlas(const SkImage* atlas, const SkRect tex[], const SkColor colors[], int count, - SkXfermode::Mode mode, + SK_XFERMODE_MODE_PARAM mode, const SkRect* cullRect, const SkPaint* paint) { FILTER_PTR(paint); diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h index 7d63281dc8..de22dbdc4f 100644 --- a/tools/android/SkAndroidSDKCanvas.h +++ b/tools/android/SkAndroidSDKCanvas.h @@ -49,7 +49,7 @@ protected: 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[], SkXfermode* xMode, + const SkPoint texs[], const SkColor colors[], SK_XFERMODE_PARAM xMode, const uint16_t indices[], int indexCount, const SkPaint& paint) override; @@ -70,7 +70,7 @@ protected: const SkPaint& paint) override; void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], - const SkPoint texCoords[4], SkXfermode* xmode, + const SkPoint texCoords[4], SK_XFERMODE_PARAM xmode, const SkPaint& paint) override; void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override; @@ -78,7 +78,7 @@ protected: SrcRectConstraint) override; void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], - const SkColor[], int count, SkXfermode::Mode, + const SkColor[], int count, SK_XFERMODE_MODE_PARAM, const SkRect* cull, const SkPaint*) override; void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst, const SkPaint*) override; -- cgit v1.2.3