Fix pipe/annotation.

We weren't keeping track of the annotation that's on the other side of the pipe.

BUG=skia:1761
R=scroggo@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/48273011

git-svn-id: http://skia.googlecode.com/svn/trunk@12004 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp
index 4087a31..3fdbbd5 100644 (file)
--- a/gm/internal_links.cpp
+++ b/gm/internal_links.cpp
@@ -50,10 +50,6 @@ protected:
         canvas->restore();
     }
 
-    virtual uint32_t onGetFlags() const {
-        return kSkipPipe_Flag;
-    }
-
 private:
     /** Draw an arbitrary rectangle at a given location and label it with some
      *  text. */

diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index 57d4a0f..53b0ae5 100644 (file)
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -1141,6 +1141,7 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) {
             fWriter.write32(size);
             fWriter.write(storage.get(), size);
         }
+        base.setAnnotation(paint.getAnnotation());
     }
 }