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

src/pipe/SkGPipePriv.h

Index: src/pipe/SkGPipePriv.h
diff --git a/src/pipe/SkGPipePriv.h b/src/pipe/SkGPipePriv.h
index 0d25b5a5f90e722e1ecae26f49bc74f50444c55a..2954ebf1f2b8c93a79236d6ffd8f0fb15d19bbee 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
 };