move setDevice() to protected: in preparation for its eventual demise

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

1 files changed, 11 insertions, 8 deletions

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index ce113d021e..3c269bf24c 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -85,14 +85,6 @@ public:
     */
     SkDevice* getDevice() const;
 
-    /** DEPRECATED -- use constructor(device)
-     
-        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 SkDevice* setDevice(SkDevice* device);
-
     /**
      *  saveLayer() can create another device (which is later drawn onto
      *  the previous device). getTopDevice() returns the top-most device current
@@ -977,6 +969,17 @@ protected:
     // can perform copy-on-write or invalidate any cached images
     void predrawNotify();
 
+    /** DEPRECATED -- use constructor(device)
+
+     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 SkDevice* setDevice(SkDevice* device);
+
 private:
     class MCRec;