| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 kDrawOval_DrawOp, | 50 kDrawOval_DrawOp, |
| 51 kDrawPaint_DrawOp, | 51 kDrawPaint_DrawOp, |
| 52 kDrawPatch_DrawOp, | 52 kDrawPatch_DrawOp, |
| 53 kDrawPath_DrawOp, | 53 kDrawPath_DrawOp, |
| 54 kDrawPicture_DrawOp, | 54 kDrawPicture_DrawOp, |
| 55 kDrawPoints_DrawOp, | 55 kDrawPoints_DrawOp, |
| 56 kDrawPosText_DrawOp, | 56 kDrawPosText_DrawOp, |
| 57 kDrawPosTextH_DrawOp, | 57 kDrawPosTextH_DrawOp, |
| 58 kDrawRect_DrawOp, | 58 kDrawRect_DrawOp, |
| 59 kDrawRRect_DrawOp, | 59 kDrawRRect_DrawOp, |
| 60 kDrawSprite_DrawOp, | |
| 61 kDrawText_DrawOp, | 60 kDrawText_DrawOp, |
| 62 kDrawTextBlob_DrawOp, | 61 kDrawTextBlob_DrawOp, |
| 63 kDrawTextOnPath_DrawOp, | 62 kDrawTextOnPath_DrawOp, |
| 64 kDrawVertices_DrawOp, | 63 kDrawVertices_DrawOp, |
| 65 kRestore_DrawOp, | 64 kRestore_DrawOp, |
| 66 kRotate_DrawOp, | 65 kRotate_DrawOp, |
| 67 kSave_DrawOp, | 66 kSave_DrawOp, |
| 68 kSaveLayer_DrawOp, | 67 kSaveLayer_DrawOp, |
| 69 kScale_DrawOp, | 68 kScale_DrawOp, |
| 70 kSetMatrix_DrawOp, | 69 kSetMatrix_DrawOp, |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 304 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 306 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 305 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 307 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 306 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 308 | 307 |
| 309 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 308 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 310 (flags << PAINTOPS_DATA_BITS) | | 309 (flags << PAINTOPS_DATA_BITS) | |
| 311 data; | 310 data; |
| 312 } | 311 } |
| 313 | 312 |
| 314 #endif | 313 #endif |
| OLD | NEW |