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

src/pipe/SkGPipeWrite.cpp

Index: src/pipe/SkGPipeWrite.cpp
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index 58ba102988c8f6a32b586f9852e70d360f69fca3..291633ac02939025c0c7ec3ba59114985c13f5c6 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -48,7 +48,6 @@ static SkFlattenable* get_paintflat(const SkPaint& paint, unsigned paintFlat) {
         case kShader_PaintFlat:         return paint.getShader();
         case kImageFilter_PaintFlat:    return paint.getImageFilter();
         case kXfermode_PaintFlat:       return paint.getXfermode();
-        case kAnnotation_PaintFlat:     return paint.getAnnotation();
     }
     SkDEBUGFAIL("never gets here");
     return NULL;
@@ -1123,6 +1122,27 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) {
 //            SkDebugf("[%d] %08X\n", i, storage[i]);
         }
     }
+
+    //
+    //  Do these after we've written kPaintOp_DrawOp
+    
+    if (base.getAnnotation() != paint.getAnnotation()) {
+        if (NULL == paint.getAnnotation()) {
+            this->writeOp(kSetAnnotation_DrawOp, 0, 0);
+            fWriter.write32(0); // we have no data

[scroggo, 2013/10/14 18:47:19]

0 was already written by writeOp. Why write it again?

[reed1, 2013/10/14 19:38:41]

Done.

+        } else {
+            SkOrderedWriteBuffer buffer(1024);
+            paint.getAnnotation()->writeToBuffer(buffer);
+            size = buffer.bytesWritten();
+            
+            SkAutoMalloc storage(size);
+            buffer.writeToMemory(storage.get());
+            
+            this->writeOp(kSetAnnotation_DrawOp, 0, size);

[scroggo, 2013/10/14 18:47:19]

Do you think Annotations might be reused (but not immediately) and may be large?

The old code stored an Annotation, and it could get reused without flattening it
again. Now we'll write it each time we see it (and we changed paints). So for
the following case:

draw(paint with annotation)
draw(some other paint)
draw(paint with same annotation)

we will have written the annotation twice.

Probably not an issue (does anyone use the annotation?), but just wanted to make
sure it was considered.

[reed1, 2013/10/14 19:38:41]

It was considered. I think annotations are so unbelievably rare right now, that
any complexity around caching previously seen values was not worth it.

+            fWriter.write32(size);

[scroggo, 2013/10/14 18:47:19]

As in the NULL annotation case, size was written by writeOp. Why write it again?
Are you concerned that it might be too big to fit in DRAWOPS_DATA_BITS (20)?

drawData handles that by checking if it's too big, and if so, it puts 0 in the
writeOp call and then writes the size. Not sure the extra complication is worth
saving the extra 4 bytes, but it does seem like the two should be similar.

Either way it seems odd to me to write the same number twice.

[reed1, 2013/10/14 19:38:41]

Done.

+            fWriter.write(storage.get(), size);
+        }
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////