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

Side by Side Diff: src/animator/SkScriptRuntime.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 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 | « src/animator/SkScript.cpp ('k') | src/c/sk_paint.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkScriptRuntime.h" 8 #include "SkScriptRuntime.h"
9 #include "SkScript2.h" 9 #include "SkScript2.h"
10 #include "SkMath.h" 10 #include "SkMath.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 break; 214 break;
215 // arithmetic ops 215 // arithmetic ops
216 case SkScriptEngine2::kAddInt: 216 case SkScriptEngine2::kAddInt:
217 operand[0].fS32 += operand[1].fS32; 217 operand[0].fS32 += operand[1].fS32;
218 break; 218 break;
219 case SkScriptEngine2::kAddScalar: 219 case SkScriptEngine2::kAddScalar:
220 operand[0].fScalar += operand[1].fScalar; 220 operand[0].fScalar += operand[1].fScalar;
221 break; 221 break;
222 case SkScriptEngine2::kAddString: 222 case SkScriptEngine2::kAddString:
223 // if (fTrackString.find(operand[1].fString) < 0) { 223 // if (fTrackString.find(operand[1].fString) < 0) {
224 // operand[1].fString = SkNEW_ARGS(SkString, (*operand[1].fString )); 224 // operand[1].fString = new SkString (*operand[1].fS tring);
225 // track(operand[1].fString); 225 // track(operand[1].fString);
226 // } 226 // }
227 operand[0].fString->append(*operand[1].fString); 227 operand[0].fString->append(*operand[1].fString);
228 break; 228 break;
229 case SkScriptEngine2::kBitAndInt: 229 case SkScriptEngine2::kBitAndInt:
230 operand[0].fS32 &= operand[1].fS32; 230 operand[0].fS32 &= operand[1].fS32;
231 break; 231 break;
232 case SkScriptEngine2::kBitNotInt: 232 case SkScriptEngine2::kBitNotInt:
233 operand[0].fS32 = ~operand[0].fS32; 233 operand[0].fS32 = ~operand[0].fS32;
234 break; 234 break;
235 case SkScriptEngine2::kBitOrInt: 235 case SkScriptEngine2::kBitOrInt:
236 operand[0].fS32 |= operand[1].fS32; 236 operand[0].fS32 |= operand[1].fS32;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 int index = fTrackArray.find(array); 342 int index = fTrackArray.find(array);
343 SkASSERT(index >= 0); 343 SkASSERT(index >= 0);
344 fTrackArray.begin()[index] = NULL; 344 fTrackArray.begin()[index] = NULL;
345 } 345 }
346 346
347 void SkScriptRuntime::untrack(SkString* string) { 347 void SkScriptRuntime::untrack(SkString* string) {
348 int index = fTrackString.find(string); 348 int index = fTrackString.find(string);
349 SkASSERT(index >= 0); 349 SkASSERT(index >= 0);
350 fTrackString.begin()[index] = NULL; 350 fTrackString.begin()[index] = NULL;
351 } 351 }
OLDNEW
« no previous file with comments | « src/animator/SkScript.cpp ('k') | src/c/sk_paint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698