Remove usage of SkImageDecoder in debugger

tools/debugger/SkDrawCommand.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawCommand.h"
@@ skipping 736 matching lines @@
 }
 
 // caller is responsible for freeing return value
 static SkBitmap* load_bitmap(const Json::Value& jsonBitmap, UrlDataManager& urlDataManager) {
     if (!jsonBitmap.isMember(SKDEBUGCANVAS_ATTRIBUTE_DATA)) {
         SkDebugf("invalid bitmap\n");
         return nullptr;
     }
     const void* data;
     int size = decode_data(jsonBitmap[SKDEBUGCANVAS_ATTRIBUTE_DATA], urlDataManager, &data);
-    SkMemoryStream stream(data, size);
-    SkImageDecoder* decoder = SkImageDecoder::Factory(&stream);
-    SkBitmap* bitmap = new SkBitmap();
-    SkImageDecoder::Result result = decoder->decode(&stream, bitmap, 
-                                                    SkImageDecoder::kDecodePixels_Mode);
-    sk_free(decoder);
-    if (result != SkImageDecoder::kFailure) {
+    SkAutoTUnref<SkData> encoded(SkData::NewWithoutCopy(data, size));
+    SkAutoTDelete<SkImage> image(SkImage::NewFromEncoded(encoded, nullptr));
+
+    SkAutoTDelete<SkBitmap> bitmap(new SkBitmap());
+    if (nullptr != image) {
+        if (!image->asLegacyBitmap(bitmap, SkImage::kRW_LegacyBitmapMode)) {
+            SkDebugf("image decode failed\n");
+            return nullptr;
+        }
+
         if (jsonBitmap.isMember(SKDEBUGCANVAS_ATTRIBUTE_COLOR)) {
             const char* ctName = jsonBitmap[SKDEBUGCANVAS_ATTRIBUTE_COLOR].asCString();
             SkColorType ct = colortype_from_name(ctName);
             if (ct != kIndex_8_SkColorType) {
-                bitmap = convert_colortype(bitmap, ct);
+                bitmap.reset(convert_colortype(bitmap.detach(), ct));
             }
         }
-        return bitmap;
+        return bitmap.detach();
     }
     SkDebugf("image decode failed\n");
     return nullptr;
 }
 
 static SkImage* load_image(const Json::Value& jsonImage, UrlDataManager& urlDataManager) {
     SkBitmap* bitmap = load_bitmap(jsonImage, urlDataManager);
     if (bitmap == nullptr) {
         return nullptr;
     }
@@ skipping 2289 matching lines @@
     result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(fMatrix);
     return result;
 }
 
 SkSetMatrixCommand* SkSetMatrixCommand::fromJSON(Json::Value& command, 
                                                  UrlDataManager& urlDataManager) {
     SkMatrix matrix;
     extract_json_matrix(command[SKDEBUGCANVAS_ATTRIBUTE_MATRIX], &matrix);
     return new SkSetMatrixCommand(matrix);
 }