All SkAnnotations are no-draw. Propose we fold that through.

include/core/SkAnnotation.h

Index: include/core/SkAnnotation.h
diff --git a/include/core/SkAnnotation.h b/include/core/SkAnnotation.h
index 9814f8f76fde45280c7f93949ffca657987ff2f3..4d17b79004a6f522382c19ebe9b715083baa38f1 100644
--- a/include/core/SkAnnotation.h
+++ b/include/core/SkAnnotation.h
@@ -24,18 +24,9 @@ struct SkPoint;
  */
 class SkAnnotation : public SkRefCnt {
 public:
-    enum Flags {
-        // If set, the associated drawing primitive should not be drawn
-        kNoDraw_Flag  = 1 << 0,
-    };
-
-    SkAnnotation(const char key[], SkData* value, uint32_t flags);
+    SkAnnotation(const char key[], SkData* value);
     virtual ~SkAnnotation();
 
-    uint32_t getFlags() const { return fFlags; }
-
-    bool isNoDraw() const { return SkToBool(fFlags & kNoDraw_Flag); }
-
     /**
      *  Return the data for the specified key, or NULL.
      */
@@ -47,7 +38,6 @@ public:
 private:
     SkString    fKey;
     SkData*     fData;
-    uint32_t    fFlags;
 
     typedef SkRefCnt INHERITED;
 };