commit c77392ed58ec78ab19fa0e3ff99fb8110854fba2
author reed <reed@google.com> Mon Jun 02 13:07:26 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 02 13:07:26 2014 -0700
tree 35917d403903038c3e266f20fd14886ac22d9c98
parent 80f709a0d7f2f1d0d35a292c0c3189d3a50b4993

use colortype instead of config

clone of https://codereview.chromium.org/305133006/

TBR=

BUG=skia:

Author: reed@google.com

Review URL: https://codereview.chromium.org/301233011

src/utils/SkPictureUtils.cpp

diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp
index 4dcb855..a2d6da1 100644
--- a/src/utils/SkPictureUtils.cpp
+++ b/src/utils/SkPictureUtils.cpp
@@ -114,7 +114,7 @@
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
                             const SkMatrix&, const SkPaint& paint) SK_OVERRIDE {
         this->addBitmap(bitmap);
-        if (SkBitmap::kA8_Config == bitmap.config()) {
+        if (kAlpha_8_SkColorType == bitmap.colorType()) {
             this->addBitmapFromPaint(paint);
         }
     }
@@ -123,7 +123,7 @@
                                 const SkPaint& paint,
                                 SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE {
         this->addBitmap(bitmap);
-        if (SkBitmap::kA8_Config == bitmap.config()) {
+        if (kAlpha_8_SkColorType == bitmap.colorType()) {
             this->addBitmapFromPaint(paint);
         }
     }