commit d433c4eb6765c1f4654f761e3aad14b9922f44cd
author junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 17 14:50:16 2012 +0000
committer junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 17 14:50:16 2012 +0000
tree ca6d42924b7a3123638e373fc83154d7de7a8f3b
parent f9a90847820a8ec4a3c97a2b544c622e3ca6b09a

Cleaning up deprecated API in SkDeferredCanvas
Review URL: https://codereview.appspot.com/6461077

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

include/utils/SkDeferredCanvas.h

diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h
index ed7ec00..f531371 100644
--- a/include/utils/SkDeferredCanvas.h
+++ b/include/utils/SkDeferredCanvas.h
@@ -33,15 +33,6 @@
     */
     explicit SkDeferredCanvas(SkDevice* device);
 
-    /** Construct a canvas with the specified device to draw into, and
-     *  a device context. Equivalent to calling default constructor, then
-     *  setDevice. The canvas takes reference on the device and notification
-     *  client.
-     *  @param device Specifies a device for the canvas to draw into.
-     *  @param client Interface for dispatching notifications
-     */
-    explicit SkDeferredCanvas(SkDevice* device, NotificationClient* client);
-
     virtual ~SkDeferredCanvas();
 
     /**
@@ -65,10 +56,6 @@
      *  @return The notificationClient argument, for convenience.
      */
     NotificationClient* setNotificationClient(NotificationClient* notificationClient);
-    // Temporarily bootstrapping the deprecated method name
-    NotificationClient* setDeviceContext(NotificationClient* notificationClient) {
-        return setNotificationClient(notificationClient);
-    }
 
     /**
      *  Enable or disable deferred drawing. When deferral is disabled,
@@ -208,9 +195,6 @@
         typedef SkRefCnt INHERITED;
     };
 
-    // Temporarily bootstrapping the deprecated name for a smooth chromium DEPS roll
-    typedef NotificationClient DeviceContext;
-
 protected:
     virtual SkCanvas* canvasForDrawIter();
     DeferredDevice* getDeferredDevice() const;

src/utils/SkDeferredCanvas.cpp

diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index c66e09c..bb33e22 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -571,13 +571,6 @@
     this->setDevice(device);
 }
 
-SkDeferredCanvas::SkDeferredCanvas(SkDevice* device, 
-                                   NotificationClient* notificationClient) {
-    this->init();
-    this->setDevice(device);
-    this->setNotificationClient(notificationClient);
-}
-
 void SkDeferredCanvas::init() {
     fDeferredDrawing = true; // On by default
 }

tests/DeferredCanvasTest.cpp

diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index d56bba6..8f72603 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -241,7 +241,8 @@
     store.allocPixels();
     SkDevice device(store);
     NotificationCounter notificationCounter;
-    SkDeferredCanvas canvas(&device, &notificationCounter);
+    SkDeferredCanvas canvas(&device);
+    canvas.setNotificationClient(&notificationCounter);
 
     const int imageCount = 2;
     SkBitmap sourceImages[imageCount];