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

Side by Side Diff: samplecode/SampleLua.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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
« no previous file with comments | « samplecode/SampleLines.cpp ('k') | samplecode/SampleManyRects.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "SampleCode.h" 8 #include "SampleCode.h"
9 #include "SkView.h" 9 #include "SkView.h"
10 #include "SkLua.h" 10 #include "SkLua.h"
(...skipping 21 matching lines...) Expand all
32 "paint:setAntiAlias(true)" 32 "paint:setAntiAlias(true)"
33 "paint:setTextSize(30)" 33 "paint:setTextSize(30)"
34 "" 34 ""
35 "function onDrawContent(canvas)" 35 "function onDrawContent(canvas)"
36 " canvas:drawText('missing \"test.lua\"', 20, 50, paint)" 36 " canvas:drawText('missing \"test.lua\"', 20, 50, paint)"
37 "end" 37 "end"
38 ; 38 ;
39 39
40 class LuaView : public SampleView { 40 class LuaView : public SampleView {
41 public: 41 public:
42 LuaView() : fLua(NULL) {} 42 LuaView() : fLua(nullptr) {}
43 43
44 virtual ~LuaView() { delete fLua; } 44 virtual ~LuaView() { delete fLua; }
45 45
46 void setImageFilename(lua_State* L) { 46 void setImageFilename(lua_State* L) {
47 SkString str = GetResourcePath("mandrill_256.png"); 47 SkString str = GetResourcePath("mandrill_256.png");
48 48
49 lua_getglobal(L, "setImageFilename"); 49 lua_getglobal(L, "setImageFilename");
50 if (lua_isfunction(L, -1)) { 50 if (lua_isfunction(L, -1)) {
51 fLua->pushString(str.c_str()); 51 fLua->pushString(str.c_str());
52 if (lua_pcall(L, 1, 0, 0) != LUA_OK) { 52 if (lua_pcall(L, 1, 0, 0) != LUA_OK) {
53 SkDebugf("lua err: %s\n", lua_tostring(L, -1)); 53 SkDebugf("lua err: %s\n", lua_tostring(L, -1));
54 } 54 }
55 } 55 }
56 } 56 }
57 57
58 lua_State* ensureLua() { 58 lua_State* ensureLua() {
59 if (NULL == fLua) { 59 if (nullptr == fLua) {
60 fLua = new SkLua; 60 fLua = new SkLua;
61 61
62 SkString str = GetResourcePath(LUA_FILENAME); 62 SkString str = GetResourcePath(LUA_FILENAME);
63 SkData* data = SkData::NewFromFileName(str.c_str()); 63 SkData* data = SkData::NewFromFileName(str.c_str());
64 if (data) { 64 if (data) {
65 fLua->runCode(data->data(), data->size()); 65 fLua->runCode(data->data(), data->size());
66 data->unref(); 66 data->unref();
67 this->setImageFilename(fLua->get()); 67 this->setImageFilename(fLua->get());
68 } else { 68 } else {
69 fLua->runCode(gMissingCode); 69 fLua->runCode(gMissingCode);
(...skipping 13 matching lines...) Expand all
83 lua_State* L = this->ensureLua(); 83 lua_State* L = this->ensureLua();
84 lua_getglobal(L, gUnicharName); 84 lua_getglobal(L, gUnicharName);
85 if (lua_isfunction(L, -1)) { 85 if (lua_isfunction(L, -1)) {
86 SkString str; 86 SkString str;
87 str.appendUnichar(uni); 87 str.appendUnichar(uni);
88 fLua->pushString(str.c_str()); 88 fLua->pushString(str.c_str());
89 if (lua_pcall(L, 1, 1, 0) != LUA_OK) { 89 if (lua_pcall(L, 1, 1, 0) != LUA_OK) {
90 SkDebugf("lua err: %s\n", lua_tostring(L, -1)); 90 SkDebugf("lua err: %s\n", lua_tostring(L, -1));
91 } else { 91 } else {
92 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) { 92 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) {
93 this->inval(NULL); 93 this->inval(nullptr);
94 return true; 94 return true;
95 } 95 }
96 } 96 }
97 } 97 }
98 } 98 }
99 return this->INHERITED::onQuery(evt); 99 return this->INHERITED::onQuery(evt);
100 } 100 }
101 101
102 void onDrawContent(SkCanvas* canvas) override { 102 void onDrawContent(SkCanvas* canvas) override {
103 lua_State* L = this->ensureLua(); 103 lua_State* L = this->ensureLua();
104 104
105 lua_getglobal(L, gDrawName); 105 lua_getglobal(L, gDrawName);
106 if (!lua_isfunction(L, -1)) { 106 if (!lua_isfunction(L, -1)) {
107 int t = lua_type(L, -1); 107 int t = lua_type(L, -1);
108 SkDebugf("--- expected %s function %d, ignoring.\n", gDrawName, t); 108 SkDebugf("--- expected %s function %d, ignoring.\n", gDrawName, t);
109 lua_pop(L, 1); 109 lua_pop(L, 1);
110 } else { 110 } else {
111 // does it make sense to try to "cache" the lua version of this 111 // does it make sense to try to "cache" the lua version of this
112 // canvas between draws? 112 // canvas between draws?
113 fLua->pushCanvas(canvas); 113 fLua->pushCanvas(canvas);
114 fLua->pushScalar(this->width()); 114 fLua->pushScalar(this->width());
115 fLua->pushScalar(this->height()); 115 fLua->pushScalar(this->height());
116 if (lua_pcall(L, 3, 1, 0) != LUA_OK) { 116 if (lua_pcall(L, 3, 1, 0) != LUA_OK) {
117 SkDebugf("lua err: %s\n", lua_tostring(L, -1)); 117 SkDebugf("lua err: %s\n", lua_tostring(L, -1));
118 } else { 118 } else {
119 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) { 119 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) {
120 this->inval(NULL); 120 this->inval(nullptr);
121 } 121 }
122 } 122 }
123 } 123 }
124 } 124 }
125 125
126 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, 126 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
127 unsigned modi) override { 127 unsigned modi) override {
128 lua_State* L = this->ensureLua(); 128 lua_State* L = this->ensureLua();
129 lua_getglobal(L, gClickName); 129 lua_getglobal(L, gClickName);
130 if (lua_isfunction(L, -1)) { 130 if (lua_isfunction(L, -1)) {
131 fLua->pushScalar(x); 131 fLua->pushScalar(x);
132 fLua->pushScalar(y); 132 fLua->pushScalar(y);
133 fLua->pushString("down"); 133 fLua->pushString("down");
134 if (lua_pcall(L, 3, 1, 0) != LUA_OK) { 134 if (lua_pcall(L, 3, 1, 0) != LUA_OK) {
135 SkDebugf("lua err: %s\n", lua_tostring(L, -1)); 135 SkDebugf("lua err: %s\n", lua_tostring(L, -1));
136 } else { 136 } else {
137 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) { 137 if (lua_isboolean(L, -1) && lua_toboolean(L, -1)) {
138 this->inval(NULL); 138 this->inval(nullptr);
139 Click* c = new Click(this); 139 Click* c = new Click(this);
140 c->setType(gLuaClickHandlerName); 140 c->setType(gLuaClickHandlerName);
141 return c; 141 return c;
142 } 142 }
143 } 143 }
144 } 144 }
145 return this->INHERITED::onFindClickHandler(x, y, modi); 145 return this->INHERITED::onFindClickHandler(x, y, modi);
146 } 146 }
147 147
148 bool onClick(Click* click) override { 148 bool onClick(Click* click) override {
149 if (click->getType() != gLuaClickHandlerName) { 149 if (click->getType() != gLuaClickHandlerName) {
150 return this->INHERITED::onClick(click); 150 return this->INHERITED::onClick(click);
151 } 151 }
152 152
153 const char* state = NULL; 153 const char* state = nullptr;
154 switch (click->fState) { 154 switch (click->fState) {
155 case Click::kMoved_State: 155 case Click::kMoved_State:
156 state = "moved"; 156 state = "moved";
157 break; 157 break;
158 case Click::kUp_State: 158 case Click::kUp_State:
159 state = "up"; 159 state = "up";
160 break; 160 break;
161 default: 161 default:
162 break; 162 break;
163 } 163 }
164 if (state) { 164 if (state) {
165 this->inval(NULL); 165 this->inval(nullptr);
166 lua_State* L = fLua->get(); 166 lua_State* L = fLua->get();
167 lua_getglobal(L, gClickName); 167 lua_getglobal(L, gClickName);
168 fLua->pushScalar(click->fCurr.x()); 168 fLua->pushScalar(click->fCurr.x());
169 fLua->pushScalar(click->fCurr.y()); 169 fLua->pushScalar(click->fCurr.y());
170 fLua->pushString(state); 170 fLua->pushString(state);
171 lua_pcall(L, 3, 1, 0); 171 lua_pcall(L, 3, 1, 0);
172 return lua_isboolean(L, -1) && lua_toboolean(L, -1); 172 return lua_isboolean(L, -1) && lua_toboolean(L, -1);
173 } 173 }
174 return true; 174 return true;
175 } 175 }
176 176
177 private: 177 private:
178 SkLua* fLua; 178 SkLua* fLua;
179 179
180 typedef SampleView INHERITED; 180 typedef SampleView INHERITED;
181 }; 181 };
182 182
183 ////////////////////////////////////////////////////////////////////////////// 183 //////////////////////////////////////////////////////////////////////////////
184 184
185 static SkView* MyFactory() { return new LuaView; } 185 static SkView* MyFactory() { return new LuaView; }
186 static SkViewRegister reg(MyFactory); 186 static SkViewRegister reg(MyFactory);
OLDNEW
« no previous file with comments | « samplecode/SampleLines.cpp ('k') | samplecode/SampleManyRects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698