| OLD | NEW |
| 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 Loading... |
| 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 Loading... |
| 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 } |
| OLD | NEW |