| 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 | 8 |
| 9 | 9 |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 // these match Canvas apis | 36 // these match Canvas apis |
| 37 kClipPath_DrawOp, | 37 kClipPath_DrawOp, |
| 38 kClipRegion_DrawOp, | 38 kClipRegion_DrawOp, |
| 39 kClipRect_DrawOp, | 39 kClipRect_DrawOp, |
| 40 kClipRRect_DrawOp, | 40 kClipRRect_DrawOp, |
| 41 kConcat_DrawOp, | 41 kConcat_DrawOp, |
| 42 kDrawBitmap_DrawOp, | 42 kDrawBitmap_DrawOp, |
| 43 kDrawBitmapNine_DrawOp, | 43 kDrawBitmapNine_DrawOp, |
| 44 kDrawBitmapRectToRect_DrawOp, | 44 kDrawBitmapRectToRect_DrawOp, |
| 45 kDrawClear_DrawOp, | |
| 46 kDrawDRRect_DrawOp, | 45 kDrawDRRect_DrawOp, |
| 47 kDrawOval_DrawOp, | 46 kDrawOval_DrawOp, |
| 48 kDrawPaint_DrawOp, | 47 kDrawPaint_DrawOp, |
| 49 kDrawPatch_DrawOp, | 48 kDrawPatch_DrawOp, |
| 50 kDrawPath_DrawOp, | 49 kDrawPath_DrawOp, |
| 51 kDrawPicture_DrawOp, | 50 kDrawPicture_DrawOp, |
| 52 kDrawPoints_DrawOp, | 51 kDrawPoints_DrawOp, |
| 53 kDrawPosText_DrawOp, | 52 kDrawPosText_DrawOp, |
| 54 kDrawPosTextH_DrawOp, | 53 kDrawPosTextH_DrawOp, |
| 55 kDrawRect_DrawOp, | 54 kDrawRect_DrawOp, |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 } | 126 } |
| 128 | 127 |
| 129 /** DrawOp specific flag bits | 128 /** DrawOp specific flag bits |
| 130 */ | 129 */ |
| 131 | 130 |
| 132 enum { | 131 enum { |
| 133 kSaveLayer_HasBounds_DrawOpFlag = 1 << 0, | 132 kSaveLayer_HasBounds_DrawOpFlag = 1 << 0, |
| 134 kSaveLayer_HasPaint_DrawOpFlag = 1 << 1, | 133 kSaveLayer_HasPaint_DrawOpFlag = 1 << 1, |
| 135 }; | 134 }; |
| 136 enum { | 135 enum { |
| 137 kClear_HasColor_DrawOpFlag = 1 << 0 | |
| 138 }; | |
| 139 enum { | |
| 140 kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0 | 136 kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0 |
| 141 }; | 137 }; |
| 142 enum { | 138 enum { |
| 143 kDrawVertices_HasTexs_DrawOpFlag = 1 << 0, | 139 kDrawVertices_HasTexs_DrawOpFlag = 1 << 0, |
| 144 kDrawVertices_HasColors_DrawOpFlag = 1 << 1, | 140 kDrawVertices_HasColors_DrawOpFlag = 1 << 1, |
| 145 kDrawVertices_HasIndices_DrawOpFlag = 1 << 2, | 141 kDrawVertices_HasIndices_DrawOpFlag = 1 << 2, |
| 146 kDrawVertices_HasXfermode_DrawOpFlag = 1 << 3, | 142 kDrawVertices_HasXfermode_DrawOpFlag = 1 << 3, |
| 147 }; | 143 }; |
| 148 enum { | 144 enum { |
| 149 kDrawBitmap_HasPaint_DrawOpFlag = 1 << 0, | 145 kDrawBitmap_HasPaint_DrawOpFlag = 1 << 0, |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 275 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 280 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 276 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 281 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 277 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 282 | 278 |
| 283 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 279 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 284 (flags << PAINTOPS_DATA_BITS) | | 280 (flags << PAINTOPS_DATA_BITS) | |
| 285 data; | 281 data; |
| 286 } | 282 } |
| 287 | 283 |
| 288 #endif | 284 #endif |
| OLD | NEW |