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

src/pipe/SkGPipeRead.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmapHeap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkGPipe.h"
 #include "SkGPipePriv.h"
 #include "SkReader32.h"
 #include "SkStream.h"
 
+#include "SkAnnotation.h"
 #include "SkColorFilter.h"
 #include "SkDrawLooper.h"
 #include "SkMaskFilter.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkTypeface.h"
 #include "SkXfermode.h"
@@ skipping 18 matching lines @@
             break;
         case kShader_PaintFlat:
             paint->setShader((SkShader*)obj);
             break;
         case kImageFilter_PaintFlat:
             paint->setImageFilter((SkImageFilter*)obj);
             break;
         case kXfermode_PaintFlat:
             paint->setXfermode((SkXfermode*)obj);
             break;
-        case kAnnotation_PaintFlat:
-            paint->setAnnotation((SkAnnotation*)obj);
-            break;
         default:
             SkDEBUGFAIL("never gets here");
     }
 }
 
 template <typename T> class SkRefCntTDArray : public SkTDArray<T> {
 public:
     ~SkRefCntTDArray() { this->unrefAll(); }
 };
 
@@ skipping 596 matching lines @@
     } while (reader->offset() < stop);
 }
 
 static void typeface_rp(SkCanvas*, SkReader32* reader, uint32_t,
                         SkGPipeState* state) {
     SkASSERT(!SkToBool(state->getFlags() & SkGPipeWriter::kCrossProcess_Flag));
     SkPaint* p = state->editPaint();
     p->setTypeface(static_cast<SkTypeface*>(reader->readPtr()));
 }
 
+static void annotation_rp(SkCanvas*, SkReader32* reader, uint32_t,
+                          SkGPipeState* state) {
+    SkPaint* p = state->editPaint();
+    
+    size_t size = reader->readInt();

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

Should this be cast from int32_t to size_t?

Also, size could be const. 

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

const -- done
changed readInt to readU32, to match other call-sites that assign to size_t

+    SkAutoMalloc storage(size);
+    reader->read(storage.get(), size);
+    SkOrderedReadBuffer buffer(storage.get(), size);
+    p->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref();

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

If the buffer has size 0, won't SkAnnotation's constructor fail when it tries to
read from the buffer?

I think you'll want to call setAnnotation(NULL) if the size was zero.

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

Done.

+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static void def_Typeface_rp(SkCanvas*, SkReader32*, uint32_t, SkGPipeState* state) {
     state->addTypeface();
 }
 
 static void def_PaintFlat_rp(SkCanvas*, SkReader32*, uint32_t op32,
                              SkGPipeState* state) {
     PaintFlats pf = (PaintFlats)DrawOp_unpackFlags(op32);
     unsigned index = DrawOp_unpackData(op32);
@@ skipping 63 matching lines @@
     rotate_rp,
     save_rp,
     saveLayer_rp,
     scale_rp,
     setMatrix_rp,
     skew_rp,
     translate_rp,
 
     paintOp_rp,
     typeface_rp,
+    annotation_rp,
+
     def_Typeface_rp,
     def_PaintFlat_rp,
     def_Bitmap_rp,
     def_Factory_rp,
 
     reportFlags_rp,
     shareBitmapHeap_rp,
     done_rp
 };
 
@@ skipping 85 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }