Use SkImage::NewFromGenerator() instead of SkImage::newEncodedData()

src/utils/SkLua.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkLua.h"
 
 #if SK_SUPPORT_GPU
 #include "GrReducedClip.h"
 #endif
 
 #include "SkCanvas.h"
 #include "SkData.h"
+#include "SkDecodingImageGenerator.h"
 #include "SkDocument.h"
 #include "SkImage.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTextBlob.h"
 #include "SkTypeface.h"
@@ skipping 1427 matching lines @@
     push_ref(L, face);
     face->unref();
     return 1;
 }
 
 static int lsk_loadImage(lua_State* L) {
     if (lua_gettop(L) > 0 && lua_isstring(L, 1)) {
         const char* name = lua_tolstring(L, 1, NULL);
         SkAutoDataUnref data(SkData::NewFromFileName(name));
         if (data.get()) {
-            SkImage* image = SkImage::NewEncodedData(data.get());
+            SkImage* image = SkImage::NewFromGenerator(
+                SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()));

[reed1, 2014/09/17 20:56:51]

This Create can return null. Perhaps we should check for that before calling
NewFromGenerator

[Rémi Piotaix, 2014/09/17 21:06:55]

I think it is checked in SkInstallDiscardablePixelRef.

+
             if (image) {
                 push_ref(L, image);
                 image->unref();
                 return 1;
             }
         }
     }
     return 0;
 }
 
@@ skipping 33 matching lines @@
     REG_CLASS(L, SkShader);
     REG_CLASS(L, SkTypeface);
     REG_CLASS(L, SkMatrix);
 }
 
 extern "C" int luaopen_skia(lua_State* L);
 extern "C" int luaopen_skia(lua_State* L) {
     SkLua::Load(L);
     return 0;
 }