Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: tools/lua/lua_app.cpp

Issue 2206633004: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Gotta catch 'em all. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkLua.h" 8 #include "SkLua.h"
9 #include "SkGraphics.h" 9 #include "SkGraphics.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
11 #include "SkData.h" 11 #include "SkData.h"
12 #include "SkOSFile.h" 12 #include "SkOSFile.h"
13 13
14 #include <stdlib.h> 14 #include <stdlib.h>
15 15
16 extern "C" { 16 extern "C" {
17 #include "lua.h" 17 #include "lua.h"
18 #include "lualib.h" 18 #include "lualib.h"
19 #include "lauxlib.h" 19 #include "lauxlib.h"
20 } 20 }
21 21
22 static SkData* read_into_data(const char file[]) { 22 static sk_sp<SkData> read_into_data(const char file[]) {
23 SkData* data = SkData::NewFromFileName(file); 23 sk_sp<SkData> data(SkData::MakeFromFileName(file));
24 if (!data) { 24 if (!data) {
25 data = SkData::NewEmpty(); 25 data = SkData::MakeEmpty();
26 } 26 }
27 return data; 27 return data;
28 } 28 }
29 29
30 int tool_main(int argc, char** argv); 30 int tool_main(int argc, char** argv);
31 int tool_main(int argc, char** argv) { 31 int tool_main(int argc, char** argv) {
32 SkAutoGraphics ag; 32 SkAutoGraphics ag;
33 SkLua L; 33 SkLua L;
34 34
35 for (int i = 1; i < argc; ++i) { 35 for (int i = 1; i < argc; ++i) {
36 SkData* data = nullptr; 36 sk_sp<SkData> data;
37 const void* ptr; 37 const void* ptr;
38 size_t len; 38 size_t len;
39 39
40 if (!strcmp(argv[i], "--lua") && i < argc-1) { 40 if (!strcmp(argv[i], "--lua") && i < argc-1) {
41 ptr = argv[i + 1]; 41 ptr = argv[i + 1];
42 len = strlen(argv[i + 1]); 42 len = strlen(argv[i + 1]);
43 i += 1; 43 i += 1;
44 } else { 44 } else {
45 data = read_into_data(argv[i]); 45 data = read_into_data(argv[i]);
46 ptr = data->data(); 46 ptr = data->data();
47 len = data->size(); 47 len = data->size();
48 } 48 }
49 if (!L.runCode(ptr, len)) { 49 if (!L.runCode(ptr, len)) {
50 SkDebugf("failed to load %s\n", argv[i]); 50 SkDebugf("failed to load %s\n", argv[i]);
51 exit(-1); 51 exit(-1);
52 } 52 }
53 SkSafeUnref(data);
54 } 53 }
55 return 0; 54 return 0;
56 } 55 }
57 56
58 #if !defined SK_BUILD_FOR_IOS 57 #if !defined SK_BUILD_FOR_IOS
59 int main(int argc, char * const argv[]) { 58 int main(int argc, char * const argv[]) {
60 return tool_main(argc, (char**) argv); 59 return tool_main(argc, (char**) argv);
61 } 60 }
62 #endif 61 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698