Little changes to SkAnnotation in pipe:

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"
@@ skipping 673 matching lines @@
                         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 op32,
                           SkGPipeState* state) {
     SkPaint* p = state->editPaint();
 
-    if (SkToBool(PaintOp_unpackData(op32))) {
-        const size_t size = reader->readU32();
-        SkAutoMalloc storage(size);
-
-        reader->read(storage.get(), size);
-        SkOrderedReadBuffer buffer(storage.get(), size);
+    const size_t size = DrawOp_unpackData(op32);
+    if (size > 0) {
+        SkOrderedReadBuffer buffer(reader->skip(size), size);
         p->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref();
+        SkASSERT(buffer.offset() == size);
     } else {
         p->setAnnotation(NULL);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void def_Typeface_rp(SkCanvas*, SkReader32*, uint32_t, SkGPipeState* state) {
     state->addTypeface();
 }
@@ skipping 175 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }