Assorted Android fixes

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"
 #include "SkDrawLooper.h"
 #include "SkPaint.h"
 #include "SkPathEffect.h"
 #include "SkShader.h"
 #include "SkSurface.h"
 #include "SkTLazy.h"
 
 namespace {
 
 /** Discard SkShaders not exposed by the Android Java API. */
 
 void CheckShader(SkPaint* paint) {
     SkShader* shader = paint->getShader();
     if (!shader) {
         return;
     }
 
-    if (shader->isABitmap()) {
+    if (shader->isAImage()) {
         return;
     }
     if (shader->asACompose(nullptr)) {
         return;
     }
     SkShader::GradientType gtype = shader->asAGradient(nullptr);
     if (gtype == SkShader::kLinear_GradientType ||
         gtype == SkShader::kRadial_GradientType ||
         gtype == SkShader::kSweep_GradientType) {
         return;
     }
     paint->setShader(nullptr);
 }
 
 void Filter(SkPaint* paint) {
 
     uint32_t flags = paint->getFlags();
     flags &= ~SkPaint::kLCDRenderText_Flag;
     paint->setFlags(flags);
 
-    // Android doesn't support Xfermodes above kLighten_Mode
-    SkXfermode::Mode mode;
-    SkXfermode::AsMode(paint->getXfermode(), &mode);
-    if (mode > SkXfermode::kLighten_Mode) {
-        paint->setXfermode(nullptr);
+    // Android doesn't support blend modes above kLighten_Mode
+    if (paint->getBlendMode() > SkBlendMode::kLighten) {
+        paint->setBlendMode(SkBlendMode::kSrcOver);
     }
 
     // Force bilinear scaling or none
     if (paint->getFilterQuality() != kNone_SkFilterQuality) {
         paint->setFilterQuality(kLow_SkFilterQuality);
     }
 
     CheckShader(paint);
 
     // Android SDK only supports mode & matrix color filters
@@ skipping 273 matching lines @@
 
 void SkAndroidSDKCanvas::didConcat(const SkMatrix& m) {
     fProxyTarget->concat(m);
 }
 
 void SkAndroidSDKCanvas::didSetMatrix(const SkMatrix& m) {
     fProxyTarget->setMatrix(m);
 }
 
 void SkAndroidSDKCanvas::onClipRect(const SkRect& rect,
-                                             SkRegion::Op op,
+                                             ClipOp op,
                                              ClipEdgeStyle style) {
     fProxyTarget->clipRect(rect, op, style);
 }
 
 void SkAndroidSDKCanvas::onClipRRect(const SkRRect& rrect,
-                                              SkRegion::Op op,
+                                              ClipOp op,
                                               ClipEdgeStyle style) {
     fProxyTarget->clipRRect(rrect, op, style);
 }
 
 void SkAndroidSDKCanvas::onClipPath(const SkPath& path,
-                                             SkRegion::Op op,
+                                             ClipOp op,
                                              ClipEdgeStyle style) {
     fProxyTarget->clipPath(path, op, style);
 }
 
-void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
+void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, ClipOp op) {
     fProxyTarget->clipRegion(region, op);
 }
 
 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }