Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkBitmap.cpp

diff --git a/src/third_party/skia/src/core/SkBitmap.cpp b/src/third_party/skia/src/core/SkBitmap.cpp
index 0736e17..b8c7fc7 100644 (file)
--- a/src/third_party/skia/src/core/SkBitmap.cpp
+++ b/src/third_party/skia/src/core/SkBitmap.cpp
@@ -346,7 +346,7 @@ static bool config_to_colorType(SkBitmap::Config config, SkColorType* ctOut) {
             ct = kARGB_4444_SkColorType;
             break;
         case SkBitmap::kARGB_8888_Config:
-            ct = kPMColor_SkColorType;
+            ct = kN32_SkColorType;
             break;
         case SkBitmap::kNo_Config:
         default:
@@ -997,7 +997,8 @@ bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
     switch (dstColorType) {
         case kAlpha_8_SkColorType:
         case kRGB_565_SkColorType:
-        case kPMColor_SkColorType:
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType:
             break;
         case kIndex_8_SkColorType:
             if (!sameConfigs) {
@@ -1005,7 +1006,7 @@ bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
             }
             break;
         case kARGB_4444_SkColorType:
-            return sameConfigs || kPMColor_SkColorType == this->colorType();
+            return sameConfigs || kN32_SkColorType == this->colorType();
         default:
             return false;
     }
@@ -1116,7 +1117,7 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType,
             }
         }
     } else if (kARGB_4444_SkColorType == dstColorType
-               && kPMColor_SkColorType == src->colorType()) {
+               && kN32_SkColorType == src->colorType()) {
         SkASSERT(src->height() == tmpDst.height());
         SkASSERT(src->width() == tmpDst.width());
         for (int y = 0; y < src->height(); ++y) {