remove fClipStack and attach/deattach-from-canvas

include/core/SkDevice.h

 /*
  * Copyright 2010 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 SkDevice_DEFINED
 #define SkDevice_DEFINED
 
@@ skipping 94 matching lines @@
      *  On failure, returns false and ignores the pixmap parameter.
      */
     bool peekPixels(SkPixmap*);
 
     /**
      *  Return the device's origin: its offset in device coordinates from
      *  the default origin in its canvas' matrix/clip
      */
     const SkIPoint& getOrigin() const { return fOrigin; }
 
-    /**
-     * onAttachToCanvas is invoked whenever a device is installed in a canvas
-     * (i.e., setDevice, saveLayer (for the new device created by the save),
-     * and SkCanvas' SkBaseDevice & SkBitmap -taking ctors). It allows the
-     * devices to prepare for drawing (e.g., locking their pixels, etc.)
-     */
-    virtual void onAttachToCanvas(SkCanvas*) {
-        SkASSERT(!fAttachedToCanvas);
-#ifdef SK_DEBUG
-        fAttachedToCanvas = true;
-#endif
-    };
-
-    /**
-     * onDetachFromCanvas notifies a device that it will no longer be drawn to.
-     * It gives the device a chance to clean up (e.g., unlock its pixels). It
-     * is invoked from setDevice (for the displaced device), restore and
-     * possibly from SkCanvas' dtor.
-     */
-    virtual void onDetachFromCanvas() {
-        SkASSERT(fAttachedToCanvas);
-#ifdef SK_DEBUG
-        fAttachedToCanvas = false;
-#endif
-    };
-
 protected:
     enum TileUsage {
         kPossible_TileUsage,    //!< the created device may be drawn tiled
         kNever_TileUsage,       //!< the created device will never be drawn tiled
     };
 
     struct TextFlags {
         uint32_t    fFlags;     // SkPaint::getFlags()
     };
 
@@ skipping 240 matching lines @@
     virtual SkImageFilterCache* getImageFilterCache() { return NULL; }
 
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
     SkSurfaceProps fSurfaceProps;
 
 #ifdef SK_SUPPORT_LEGACY_ACCESSBITMAP
     SkBitmap    fLegacyBitmap;
 #endif
 
-#ifdef SK_DEBUG
-    bool        fAttachedToCanvas;
-#endif
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif