use SkData::NewUninitialized

tools/lua/lua_pictures.cpp

Index: tools/lua/lua_pictures.cpp
diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp
index 635cf0bed0152b5626231b58de855ed619d3815a..d3ca5b759ce8a98ee31375eaee0a1c182436a898 100644
--- a/tools/lua/lua_pictures.cpp
+++ b/tools/lua/lua_pictures.cpp
@@ -47,17 +47,6 @@ static SkPicture* load_picture(const char path[]) {
     return pic;
 }
 
-static SkData* read_into_data(const char file[]) {
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(file));
-    if (!stream.get()) {
-        return SkData::NewEmpty();
-    }
-    size_t len = stream->getLength();
-    void* buffer = sk_malloc_throw(len);
-    stream->read(buffer, len);
-    return SkData::NewFromMalloc(buffer, len);
-}
-
 static void call_canvas(lua_State* L, SkLuaCanvas* canvas,
                         const char pictureFile[], const char funcName[]) {
     lua_getglobal(L, funcName);
@@ -97,7 +86,7 @@ int tool_main(int argc, char** argv) {
     SkLua L(summary);
 
     for (int i = 0; i < FLAGS_luaFile.count(); ++i) {
-        SkAutoDataUnref data(read_into_data(FLAGS_luaFile[i]));
+        SkAutoDataUnref data(SkData::NewFromFileName(FLAGS_luaFile[i]));

[bungeman-skia, 2014/09/12 14:50:27]

Seems that you still need to test for non NULL data here (like lua_app.cpp)? If
not, then lua_app.cpp shouldn't have it either.

[reed1, 2014/09/12 18:55:17]

Done.

         if (!FLAGS_quiet) {
             SkDebugf("loading %s...\n", FLAGS_luaFile[i]);
         }