OLD | NEW |
1 | |
2 /* | 1 /* |
3 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
4 * | 3 * |
5 * 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 |
6 * found in the LICENSE file. | 5 * found in the LICENSE file. |
7 */ | 6 */ |
| 7 |
8 #ifndef SkScript2_DEFINED | 8 #ifndef SkScript2_DEFINED |
9 #define SkScript2_DEFINED | 9 #define SkScript2_DEFINED |
10 | 10 |
| 11 #include "SkDisplayType.h" |
11 #include "SkOperand2.h" | 12 #include "SkOperand2.h" |
12 #include "SkStream.h" | 13 #include "SkStream.h" |
13 #include "SkTDArray.h" | 14 #include "SkTDArray.h" |
14 #include "SkTDArray_Experimental.h" | 15 #include "SkTDArray_Experimental.h" |
15 #include "SkTDict.h" | 16 #include "SkTDict.h" |
16 #include "SkTDStack.h" | 17 #include "SkTDStack.h" |
17 | 18 |
18 typedef SkLongArray(SkString*) SkTDStringArray; | 19 typedef SkLongArray(SkString*) SkTDStringArray; |
19 | 20 |
20 class SkAnimateMaker; | 21 class SkAnimateMaker; |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 SkOperand2::OpType fType; | 284 SkOperand2::OpType fType; |
284 int32_t fIntAnswer; | 285 int32_t fIntAnswer; |
285 SkScalar fScalarAnswer; | 286 SkScalar fScalarAnswer; |
286 const char* fStringAnswer; | 287 const char* fStringAnswer; |
287 }; | 288 }; |
288 | 289 |
289 #endif | 290 #endif |
290 | 291 |
291 | 292 |
292 #endif // SkScript2_DEFINED | 293 #endif // SkScript2_DEFINED |
OLD | NEW |