expand SkLua to handle creation of its own State

tools/lua/lua_pictures.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"
 #include "SkLuaCanvas.h"
 #include "SkPicture.h"
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkData.h"
 #include "picture_utils.h"
 #include "SkOSFile.h"
 #include "SkImageDecoder.h"
 
@@ skipping 35 matching lines @@
     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);
 }
 
-class SkAutoLua {
-public:
-    SkAutoLua(const char termCode[] = NULL) : fTermCode(termCode) {
-        fL = luaL_newstate();
-        luaL_openlibs(fL);
-    }
-    ~SkAutoLua() {
-        if (fTermCode.size() > 0) {
-            lua_getglobal(fL, fTermCode.c_str());
-            if (lua_pcall(fL, 0, 0, 0) != LUA_OK) {
-                SkDebugf("lua err: %s\n", lua_tostring(fL, -1));
-            }
-        }
-        lua_close(fL);
-    }
-
-    lua_State* get() const { return fL; }
-    lua_State* operator*() const { return fL; }
-    lua_State* operator->() const { return fL; }
-
-    bool load(const char code[]) {
-        int err = luaL_loadstring(fL, code) || lua_pcall(fL, 0, 0, 0);
-        if (err) {
-            SkDebugf("--- lua failed\n");
-            return false;
-        }
-        return true;
-    }
-    bool load(const void* code, size_t size) {
-        SkString str((const char*)code, size);
-        return load(str.c_str());
-        int err = luaL_loadbufferx(fL, (const char*)code, size, NULL, NULL)
-               || lua_pcall(fL, 0, 0, 0);
-        if (err) {
-            SkDebugf("--- lua failed\n");
-            return false;
-        }
-        return true;
-    }
-private:
-    lua_State* fL;
-    SkString   fTermCode;
-};
-
 static void call_canvas(lua_State* L, SkLuaCanvas* canvas,
                         const char pictureFile[], const char funcName[]) {
     lua_getglobal(L, funcName);
     if (!lua_isfunction(L, -1)) {
         int t = lua_type(L, -1);
         SkDebugf("--- expected %s function %d, ignoring.\n", funcName, t);
         lua_settop(L, -2);
     } else {
         canvas->pushThis();
         lua_pushstring(L, pictureFile);
@@ skipping 11 matching lines @@
     if (FLAGS_skpPath.isEmpty()) {
         SkDebugf(".skp files or directories are required.\n");
         exit(-1);
     }
     if (FLAGS_luaFile.isEmpty()) {
         SkDebugf("missing luaFile(s)\n");
         exit(-1);
     }
 
     SkAutoGraphics ag;
-    SkAutoLua L(gSummarizeFunc);
+    SkLua L(gSummarizeFunc);
 
     for (int i = 0; i < FLAGS_luaFile.count(); ++i) {
         SkAutoDataUnref data(read_into_data(FLAGS_luaFile[i]));
         SkDebugf("loading %s...\n", FLAGS_luaFile[i]);
-        if (!L.load(data->data(), data->size())) {
+        if (!L.runCode(data->data(), data->size())) {
             SkDebugf("failed to load luaFile %s\n", FLAGS_luaFile[i]);
             exit(-1);
         }
     }
 
     for (int i = 0; i < FLAGS_skpPath.count(); i ++) {
         SkOSFile::Iter iter(FLAGS_skpPath[i], "skp");
         SkString inputFilename;
 
         while (iter.next(&inputFilename)) {
@@ skipping 20 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif