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

include/core/SkCanvas.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkCanvas_DEFINED
@@ skipping 39 matching lines @@
     SK_DECLARE_INST_COUNT(SkCanvas)
 
     SkCanvas();
 
     /** Construct a canvas with the specified device to draw into.
 
         @param device   Specifies a device for the canvas to draw into.
     */
     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.
     */
     explicit SkCanvas(const SkBitmap& bitmap);
     virtual ~SkCanvas();
 
     SkMetaData& getMetaData();
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ skipping 114 matching lines @@
     bool readPixels(SkBitmap* bitmap,
                     int x, int y,
                     Config8888 config8888 = kNative_Premul_Config8888);
 
     /**
      * DEPRECATED: This will be removed as soon as webkit is no longer relying
      * on it. The bitmap is resized to the intersection of srcRect and the
      * 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);
 
     /**
      *  Similar to draw sprite, this method will copy the pixels in bitmap onto
      *  the canvas, with the top/left corner specified by (x, y). The canvas'
      *  pixel values are completely replaced: there is no blending.
      *
      *  Currently if bitmap is backed by a texture this is a no-op. This may be
      *  relaxed in the future.
      *
@@ skipping 730 matching lines @@
         kEmpty_ClipType = 0,
         kRect_ClipType,
         kComplex_ClipType
     };
 
     /** Returns a description of the total clip; may be cheaper than
         getting the clip and querying it directly.
     */
     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;
 
     /** Return the clip stack. The clip stack stores all the individual
      *  clips organized by the save/restore frame in which they were
      *  added.
      *  @return the current clip stack ("list" of individual clip elements)
      */
     const SkClipStack* getClipStack() const {
         return &fClipStack;
@@ skipping 67 matching lines @@
 
     // Called by child classes that override clipPath and clipRRect to only
     // track fast conservative clip bounds, rather than exact clips.
     bool updateClipConservativelyUsingBounds(const SkRect&, SkRegion::Op,
                                              bool inverseFilled);
 
     // notify our surface (if we have one) that we are about to draw, so it
     // 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.
 
      Specify a device for this canvas to draw into. If it is not null, its
      reference count is incremented. If the canvas was already holding a
      device, its reference count is decremented. The new device is returned.
      */
     virtual SkBaseDevice* setDevice(SkBaseDevice* device);
 
 private:
@@ skipping 141 matching lines @@
         if (NULL != fCanvas) {
             fCanvas->endCommentGroup();
         }
     }
 
 private:
     SkCanvas* fCanvas;
 };
 
 #endif