commit 2766cc567d5c939730fadd2d865e4bdf05477263
author fmalita <fmalita@chromium.org> Thu Oct 06 14:37:23 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 06 14:37:24 2016 -0700
tree bb569dd4c92f0aca0f6a31f20347db094578590e
parent 388faa0fb98754da438c34bde0b03a8fb3648b8a

Assorted Android fixes

Ran into these while trying to follow https://skia.org/user/quick/android.

R=reed@google.com,djsollen@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2395273002

Review-Url: https://codereview.chromium.org/2395273002

tools/android/SkAndroidSDKCanvas.cpp

diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 44ceccb..f205ac4 100644
--- a/tools/android/SkAndroidSDKCanvas.cpp
+++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -25,7 +25,7 @@
         return;
     }
 
-    if (shader->isABitmap()) {
+    if (shader->isAImage()) {
         return;
     }
     if (shader->asACompose(nullptr)) {
@@ -46,11 +46,9 @@
     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
@@ -344,24 +342,24 @@
 }
 
 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);
 }