add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index dc3953ed4b1df71634992a1bec5bd1d7a85450e3..38ef28f2888081e7be92b9bea77501222627cecc 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -57,7 +57,7 @@ public:
     */
     explicit SkCanvas(SkBaseDevice* device);
 
-    /** Deprecated - Construct a canvas with the specified bitmap to draw into.
+    /** Construct a canvas with the specified bitmap to draw into.
         @param bitmap   Specifies a bitmap for the canvas to draw into. Its
                         structure are copied to the canvas.
     */
@@ -192,6 +192,7 @@ public:
      * canvas bounds. New pixels are always allocated on success. Bitmap is
      * unmodified on failure.
      */
+    SK_ATTR_DEPRECATED("use Config8888 version")
     bool readPixels(const SkIRect& srcRect, SkBitmap* bitmap);
 
     /**
@@ -942,11 +943,10 @@ public:
     */
     ClipType getClipType() const;
 
-    /** Return the current device clip (concatenation of all clip calls).
+    /** DEPRECATED -- need to move this guy to private/friend
+     *  Return the current device clip (concatenation of all clip calls).
      *  This does not account for the translate in any of the devices.
      *  @return the current device clip (concatenation of all clip calls).
-     *
-     *  DEPRECATED -- call getClipDeviceBounds() instead.
      */
     const SkRegion& getTotalClip() const;
 
@@ -1034,8 +1034,8 @@ protected:
     // can perform copy-on-write or invalidate any cached images
     void predrawNotify();
 
-    /** DEPRECATED -- use constructor(device)
-
+    /**
+     DEPRECATED -- need to remove when subclass stop relying on it.
      Marked as 'protected' to avoid new clients using this before we can
      completely remove it.