| 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 #ifndef SkPictureFlat_DEFINED | 8 #ifndef SkPictureFlat_DEFINED |
| 9 #define SkPictureFlat_DEFINED | 9 #define SkPictureFlat_DEFINED |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 TRANSLATE, | 60 TRANSLATE, |
| 61 NOOP, | 61 NOOP, |
| 62 BEGIN_COMMENT_GROUP, | 62 BEGIN_COMMENT_GROUP, |
| 63 COMMENT, | 63 COMMENT, |
| 64 END_COMMENT_GROUP, | 64 END_COMMENT_GROUP, |
| 65 | 65 |
| 66 // new ops -- feel free to re-alphabetize on next version bump | 66 // new ops -- feel free to re-alphabetize on next version bump |
| 67 DRAW_DRRECT, | 67 DRAW_DRRECT, |
| 68 PUSH_CULL, | 68 PUSH_CULL, |
| 69 POP_CULL, | 69 POP_CULL, |
| 70 |
| 71 DRAW_PATCH, // could not add in aphabetical order |
| 70 | 72 |
| 71 LAST_DRAWTYPE_ENUM = POP_CULL | 73 LAST_DRAWTYPE_ENUM = DRAW_PATCH |
| 72 }; | 74 }; |
| 73 | 75 |
| 74 // In the 'match' method, this constant will match any flavor of DRAW_BITMAP* | 76 // In the 'match' method, this constant will match any flavor of DRAW_BITMAP* |
| 75 static const int kDRAW_BITMAP_FLAVOR = LAST_DRAWTYPE_ENUM+1; | 77 static const int kDRAW_BITMAP_FLAVOR = LAST_DRAWTYPE_ENUM+1; |
| 76 | 78 |
| 77 enum DrawVertexFlags { | 79 enum DrawVertexFlags { |
| 78 DRAW_VERTICES_HAS_TEXS = 0x01, | 80 DRAW_VERTICES_HAS_TEXS = 0x01, |
| 79 DRAW_VERTICES_HAS_COLORS = 0x02, | 81 DRAW_VERTICES_HAS_COLORS = 0x02, |
| 80 DRAW_VERTICES_HAS_INDICES = 0x04, | 82 DRAW_VERTICES_HAS_INDICES = 0x04, |
| 81 DRAW_VERTICES_HAS_XFER = 0x08, | 83 DRAW_VERTICES_HAS_XFER = 0x08, |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 } | 601 } |
| 600 | 602 |
| 601 private: | 603 private: |
| 602 SkChunkAlloc fHeap; | 604 SkChunkAlloc fHeap; |
| 603 SkAutoTUnref<SkRefCntSet> fTypefaceSet; | 605 SkAutoTUnref<SkRefCntSet> fTypefaceSet; |
| 604 void* fLastAllocated; | 606 void* fLastAllocated; |
| 605 mutable SkTypefacePlayback fTypefacePlayback; | 607 mutable SkTypefacePlayback fTypefacePlayback; |
| 606 }; | 608 }; |
| 607 | 609 |
| 608 #endif | 610 #endif |
| OLD | NEW |