Little changes to SkAnnotation in pipe:

src/pipe/SkGPipeWrite.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 "SkAnnotation.h"
 #include "SkBitmapDevice.h"
@@ skipping 1110 matching lines @@
         for (size_t i = 0; i < size/4; i++) {
 //            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);
+            if (this->needOpBytes()) {
+                this->writeOp(kSetAnnotation_DrawOp, 0, 0);
+            }
         } else {
             SkOrderedWriteBuffer buffer(1024);
             paint.getAnnotation()->writeToBuffer(buffer);
-            size = buffer.bytesWritten();
-
-            SkAutoMalloc storage(size);
-            buffer.writeToMemory(storage.get());
-
-            this->writeOp(kSetAnnotation_DrawOp, 0, 1);
-            fWriter.write32(size);
-            fWriter.write(storage.get(), size);
+            const size_t size = buffer.bytesWritten();
+            if (this->needOpBytes(size)) {
+                this->writeOp(kSetAnnotation_DrawOp, 0, size);
+                buffer.writeToMemory(fWriter.reserve(size));
+            }
         }
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkGPipe.h"
 
 SkGPipeController::~SkGPipeController() {
     SkSafeUnref(fCanvas);
@@ skipping 57 matching lines @@
     fCanvas->ref();
 }
 
 BitmapShuttle::~BitmapShuttle() {
     fCanvas->unref();
 }
 
 bool BitmapShuttle::insert(const SkBitmap& bitmap, int32_t slot) {
     return fCanvas->shuttleBitmap(bitmap, slot);
 }