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

include/core/SkPaint.h

Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 52321ddaf6c8738a83d69e156d4fb7cd70e98271..c3c4a894e0d788417d57bad9f862082aada4ad99 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -640,7 +640,8 @@ public:
      *  the annotation specifics no-drawing.

[edisonn, 2013/10/29 19:44:36]

update comment

[reed1, 2013/10/29 19:48:49]

Perhaps mark as DEPRECATED, since getAnnotation already exists.

[mtklein, 2013/10/29 20:28:53]

Done.

      */
     bool isNoDrawAnnotation() const {
-        return SkToBool(fPrivFlags & kNoDrawAnnotation_PrivFlag);
+        // All annotations are no-draw.
+        return this->getAnnotation() != NULL;
     }
 
     /**
@@ -1006,11 +1007,8 @@ private:
     unsigned        fStyle : 2;
     unsigned        fTextEncoding : 2;  // 3 values
     unsigned        fHinting : 2;
-    unsigned        fPrivFlags : 4; // these are not flattened/unflattened
+    //unsigned      fFreeBits : 4;
 
-    enum PrivFlags {
-        kNoDrawAnnotation_PrivFlag  = 1 << 0,
-    };
 
     SkDrawCacheProc    getDrawCacheProc() const;
     SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,