| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 kDrawPatch_DrawOp, | 51 kDrawPatch_DrawOp, |
| 52 kDrawPath_DrawOp, | 52 kDrawPath_DrawOp, |
| 53 kDrawPicture_DrawOp, | 53 kDrawPicture_DrawOp, |
| 54 kDrawPoints_DrawOp, | 54 kDrawPoints_DrawOp, |
| 55 kDrawPosText_DrawOp, | 55 kDrawPosText_DrawOp, |
| 56 kDrawPosTextH_DrawOp, | 56 kDrawPosTextH_DrawOp, |
| 57 kDrawRect_DrawOp, | 57 kDrawRect_DrawOp, |
| 58 kDrawRRect_DrawOp, | 58 kDrawRRect_DrawOp, |
| 59 kDrawSprite_DrawOp, | 59 kDrawSprite_DrawOp, |
| 60 kDrawText_DrawOp, | 60 kDrawText_DrawOp, |
| 61 kDrawTextBlob_DrawOp, |
| 61 kDrawTextOnPath_DrawOp, | 62 kDrawTextOnPath_DrawOp, |
| 62 kDrawVertices_DrawOp, | 63 kDrawVertices_DrawOp, |
| 63 kRestore_DrawOp, | 64 kRestore_DrawOp, |
| 64 kRotate_DrawOp, | 65 kRotate_DrawOp, |
| 65 kSave_DrawOp, | 66 kSave_DrawOp, |
| 66 kSaveLayer_DrawOp, | 67 kSaveLayer_DrawOp, |
| 67 kScale_DrawOp, | 68 kScale_DrawOp, |
| 68 kSetMatrix_DrawOp, | 69 kSetMatrix_DrawOp, |
| 69 kSkew_DrawOp, | 70 kSkew_DrawOp, |
| 70 kTranslate_DrawOp, | 71 kTranslate_DrawOp, |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 281 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 281 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 282 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 282 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 283 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 283 | 284 |
| 284 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 285 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 285 (flags << PAINTOPS_DATA_BITS) | | 286 (flags << PAINTOPS_DATA_BITS) | |
| 286 data; | 287 data; |
| 287 } | 288 } |
| 288 | 289 |
| 289 #endif | 290 #endif |
| OLD | NEW |