| 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 30 matching lines...) Expand all Loading... |
| 41 kConcat_DrawOp, | 41 kConcat_DrawOp, |
| 42 kDrawBitmap_DrawOp, | 42 kDrawBitmap_DrawOp, |
| 43 kDrawBitmapMatrix_DrawOp, | 43 kDrawBitmapMatrix_DrawOp, |
| 44 kDrawBitmapNine_DrawOp, | 44 kDrawBitmapNine_DrawOp, |
| 45 kDrawBitmapRectToRect_DrawOp, | 45 kDrawBitmapRectToRect_DrawOp, |
| 46 kDrawClear_DrawOp, | 46 kDrawClear_DrawOp, |
| 47 kDrawData_DrawOp, | 47 kDrawData_DrawOp, |
| 48 kDrawDRRect_DrawOp, | 48 kDrawDRRect_DrawOp, |
| 49 kDrawOval_DrawOp, | 49 kDrawOval_DrawOp, |
| 50 kDrawPaint_DrawOp, | 50 kDrawPaint_DrawOp, |
| 51 kDrawPatch_DrawOp, |
| 51 kDrawPath_DrawOp, | 52 kDrawPath_DrawOp, |
| 52 kDrawPicture_DrawOp, | 53 kDrawPicture_DrawOp, |
| 53 kDrawPoints_DrawOp, | 54 kDrawPoints_DrawOp, |
| 54 kDrawPosText_DrawOp, | 55 kDrawPosText_DrawOp, |
| 55 kDrawPosTextH_DrawOp, | 56 kDrawPosTextH_DrawOp, |
| 56 kDrawRect_DrawOp, | 57 kDrawRect_DrawOp, |
| 57 kDrawRRect_DrawOp, | 58 kDrawRRect_DrawOp, |
| 58 kDrawSprite_DrawOp, | 59 kDrawSprite_DrawOp, |
| 59 kDrawText_DrawOp, | 60 kDrawText_DrawOp, |
| 60 kDrawTextOnPath_DrawOp, | 61 kDrawTextOnPath_DrawOp, |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 280 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 280 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 281 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 281 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 282 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 282 | 283 |
| 283 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 284 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 284 (flags << PAINTOPS_DATA_BITS) | | 285 (flags << PAINTOPS_DATA_BITS) | |
| 285 data; | 286 data; |
| 286 } | 287 } |
| 287 | 288 |
| 288 #endif | 289 #endif |
| OLD | NEW |