| 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 25 matching lines...) Expand all Loading... |
| 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, | 45 kDrawClear_DrawOp, |
| 46 kDrawData_DrawOp, | |
| 47 kDrawDRRect_DrawOp, | 46 kDrawDRRect_DrawOp, |
| 48 kDrawOval_DrawOp, | 47 kDrawOval_DrawOp, |
| 49 kDrawPaint_DrawOp, | 48 kDrawPaint_DrawOp, |
| 50 kDrawPatch_DrawOp, | 49 kDrawPatch_DrawOp, |
| 51 kDrawPath_DrawOp, | 50 kDrawPath_DrawOp, |
| 52 kDrawPicture_DrawOp, | 51 kDrawPicture_DrawOp, |
| 53 kDrawPoints_DrawOp, | 52 kDrawPoints_DrawOp, |
| 54 kDrawPosText_DrawOp, | 53 kDrawPosText_DrawOp, |
| 55 kDrawPosTextH_DrawOp, | 54 kDrawPosTextH_DrawOp, |
| 56 kDrawRect_DrawOp, | 55 kDrawRect_DrawOp, |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 279 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 281 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 280 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 282 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 281 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 283 | 282 |
| 284 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 283 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 285 (flags << PAINTOPS_DATA_BITS) | | 284 (flags << PAINTOPS_DATA_BITS) | |
| 286 data; | 285 data; |
| 287 } | 286 } |
| 288 | 287 |
| 289 #endif | 288 #endif |
| OLD | NEW |