Fix pipe/annotation.

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 1109 matching lines @@
         fWriter.write(storage, size);
         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()) {
+        base.setAnnotation(paint.getAnnotation());

[scroggo, 2013/10/29 19:06:04]

nit: The other cases all modify base after recording the change. Doesn't make a
difference in execution, but it would be nice to be consistent.

[mtklein, 2013/10/29 19:11:31]

Done, though I suspect this may be why Mike missed it in the first place.

         if (NULL == paint.getAnnotation()) {
             this->writeOp(kSetAnnotation_DrawOp, 0, 0);
         } else {
             SkOrderedWriteBuffer buffer(1024);
             paint.getAnnotation()->writeToBuffer(buffer);
             size = buffer.bytesWritten();
 
             SkAutoMalloc storage(size);
             buffer.writeToMemory(storage.get());
 
@@ skipping 70 matching lines @@
     fCanvas->ref();
 }
 
 BitmapShuttle::~BitmapShuttle() {
     fCanvas->unref();
 }
 
 bool BitmapShuttle::insert(const SkBitmap& bitmap, int32_t slot) {
     return fCanvas->shuttleBitmap(bitmap, slot);
 }