update androidsdkcanvas for SkBlendMode

tools/android/SkAndroidSDKCanvas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidSDKCanvas.h"
 
 #include "SkColorFilter.h"
@@ skipping 45 matching lines @@
         paint->setFilterQuality(kLow_SkFilterQuality);
     }
 
     CheckShader(paint);
 
     // Android SDK only supports mode & matrix color filters
     // (and, again, no modes above kLighten_Mode).
     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);
         }
     }
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     SkPathEffect* pe = paint->getPathEffect();
     if (pe && !pe->exposedInAndroidJavaAPI()) {
         paint->setPathEffect(nullptr);
     }
@@ skipping 75 matching lines @@
 void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
                                                    const SkIRect& center,
                                                    const SkRect& dst,
                                                    const SkPaint* paint) {
     FILTER_PTR(paint);
     fProxyTarget->drawBitmapNine(bitmap, center, dst, filteredPaint);
 }
 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);
     fProxyTarget->drawVertices(vMode, vertexCount, vertices, texs, colors,
                                xMode, indices, indexCount, filteredPaint);
 }
 
 void SkAndroidSDKCanvas::onDrawDRRect(const SkRRect& outer,
                                                const SkRRect& inner,
                                                const SkPaint& paint) {
@@ skipping 42 matching lines @@
                                                  SkScalar x,
                                                  SkScalar y,
                                                  const SkPaint& paint) {
     FILTER(paint);
     fProxyTarget->drawTextBlob(blob, x, y, filteredPaint);
 }
 
 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);
 }
 
 
 void SkAndroidSDKCanvas::onDrawImage(const SkImage* image,
                                               SkScalar x,
                                               SkScalar y,
                                               const SkPaint* paint) {
@@ skipping 15 matching lines @@
                                        const SkPaint* paint) {
     FILTER_PTR(paint);
     fProxyTarget->drawPicture(picture, matrix, filteredPaint);
 }
 
 void SkAndroidSDKCanvas::onDrawAtlas(const SkImage* atlas,
                                      const SkRSXform xform[],
                                      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);
     fProxyTarget->drawAtlas(atlas, xform, tex, colors, count, mode, cullRect,
                             filteredPaint);
 }
 
 void SkAndroidSDKCanvas::onDrawImageNine(const SkImage* image,
                                          const SkIRect& center,
                                          const SkRect& dst,
@@ skipping 80 matching lines @@
                                              ClipOp op,
                                              ClipEdgeStyle style) {
     fProxyTarget->clipPath(path, op, style);
 }
 
 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, ClipOp op) {
     fProxyTarget->clipRegion(region, op);
 }
 
 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }