change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories)

src/pipe/SkGPipePriv.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkGPipePriv_DEFINED
 #define SkGPipePriv_DEFINED
 
 #include "SkTypes.h"
 
 #define UNIMPLEMENTED
 
 // these must be contiguous, 0...N-1
 enum PaintFlats {
     kColorFilter_PaintFlat,
     kDrawLooper_PaintFlat,
     kMaskFilter_PaintFlat,
     kPathEffect_PaintFlat,
     kRasterizer_PaintFlat,
     kShader_PaintFlat,
     kImageFilter_PaintFlat,
     kXfermode_PaintFlat,
-    kAnnotation_PaintFlat,
 
-    kLast_PaintFlat = kAnnotation_PaintFlat
+    kLast_PaintFlat = kXfermode_PaintFlat
 };
 #define kCount_PaintFlats   (kLast_PaintFlat + 1)
 
 enum DrawOps {
     kSkip_DrawOp,   // skip an addition N bytes (N == data)
 
     // these match Canvas apis
     kClipPath_DrawOp,
     kClipRegion_DrawOp,
     kClipRect_DrawOp,
@@ skipping 22 matching lines @@
     kRotate_DrawOp,
     kSave_DrawOp,
     kSaveLayer_DrawOp,
     kScale_DrawOp,
     kSetMatrix_DrawOp,
     kSkew_DrawOp,
     kTranslate_DrawOp,
 
     kPaintOp_DrawOp,
     kSetTypeface_DrawOp,
+    kSetAnnotation_DrawOp,
 
     kDef_Typeface_DrawOp,
     kDef_Flattenable_DrawOp,
     kDef_Bitmap_DrawOp,
     kDef_Factory_DrawOp,
 
     // these are signals to playback, not drawing verbs
     kReportFlags_DrawOp,
     kShareBitmapHeap_DrawOp,
     kDone_DrawOp,
@@ skipping 136 matching lines @@
 
 enum PaintOps {
     kReset_PaintOp,     // no arg
 
     kFlags_PaintOp,     // arg inline
     kColor_PaintOp,     // arg 32
     kStyle_PaintOp,     // arg inline
     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
     kAlign_PaintOp,     // arg inline - text
     kTextSize_PaintOp,  // arg scalar - text
     kTextScaleX_PaintOp,// arg scalar - text
     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
 };
 
 #define PAINTOPS_OP_BITS     8
 #define PAINTOPS_FLAG_BITS   4
 #define PAINTOPS_DATA_BITS   20
 
 #define PAINTOPS_OP_MASK     ((1 << PAINTOPS_OP_BITS) - 1)
 #define PAINTOPS_FLAG_MASK   ((1 << PAINTOPS_FLAG_BITS) - 1)
 #define PAINTOPS_DATA_MASK   ((1 << PAINTOPS_DATA_BITS) - 1)
@@ skipping 27 matching lines @@
     SkASSERT(0 == (op & ~PAINTOPS_OP_MASK));
     SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK));
     SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK));
 
     return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) |
     (flags << PAINTOPS_DATA_BITS) |
     data;
 }
 
 #endif