diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 20:02:44 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 20:02:44 +0000 |
| commit | 0cd2ac6c721120a2628524dad91798aa3e7ec41d (patch) | |
| tree | e74814132e499fdbb2fcb74c325b316da1a2a557 /src/pipe/SkGPipePriv.h | |
| parent | ea476e1725f38688b79aadf4c5e36c10c3141927 (diff) | |
change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories)
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/26606004
git-svn-id: http://skia.googlecode.com/svn/trunk@11762 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pipe/SkGPipePriv.h')
| -rw-r--r-- | src/pipe/SkGPipePriv.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/pipe/SkGPipePriv.h b/src/pipe/SkGPipePriv.h index 0d25b5a5f9..2954ebf1f2 100644 --- a/src/pipe/SkGPipePriv.h +++ b/src/pipe/SkGPipePriv.h @@ -25,9 +25,8 @@ enum PaintFlats { kShader_PaintFlat, kImageFilter_PaintFlat, kXfermode_PaintFlat, - kAnnotation_PaintFlat, - kLast_PaintFlat = kAnnotation_PaintFlat + kLast_PaintFlat = kXfermode_PaintFlat }; #define kCount_PaintFlats (kLast_PaintFlat + 1) @@ -70,6 +69,7 @@ enum DrawOps { kPaintOp_DrawOp, kSetTypeface_DrawOp, + kSetAnnotation_DrawOp, kDef_Typeface_DrawOp, kDef_Flattenable_DrawOp, @@ -226,7 +226,7 @@ enum PaintOps { kJoin_PaintOp, // arg inline kCap_PaintOp, // arg inline kWidth_PaintOp, // arg scalar - kMiter_PaintOp,// arg scalar + kMiter_PaintOp, // arg scalar kEncoding_PaintOp, // arg inline - text kHinting_PaintOp, // arg inline - text @@ -236,6 +236,8 @@ enum PaintOps { kTextSkewX_PaintOp, // arg scalar - text kTypeface_PaintOp, // arg inline (index) - text + kAnnotation_PaintOp,// arg SkAnnotation_flat, data=bool-has-size + kFlatIndex_PaintOp, // flags=paintflat, data=index }; |