remove vestigle code for lockpixels

Bug: skia:6481
Change-Id: Icfd53981b8588fbea74fca2e3be58bc6f13ef923
Reviewed-on: https://skia-review.googlesource.com/13968
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 0 insertions, 50 deletions

diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h
index d028124222..af8618b4de 100644
--- a/include/core/SkPixmap.h
+++ b/include/core/SkPixmap.h
@@ -219,54 +219,4 @@ private:
     SkImageInfo     fInfo;
 };
 
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_SUPPORT_OBSOLETE_LOCKPIXELS
-class SK_API SkAutoPixmapUnlock : ::SkNoncopyable {
-public:
-    SkAutoPixmapUnlock() : fUnlockProc(NULL), fIsLocked(false) {}
-    SkAutoPixmapUnlock(const SkPixmap& pm, void (*unlock)(void*), void* ctx)
-        : fUnlockProc(unlock), fUnlockContext(ctx), fPixmap(pm), fIsLocked(true)
-    {}
-    ~SkAutoPixmapUnlock() { this->unlock(); }
-
-    /**
-     *  Return the currently locked pixmap. Undefined if it has been unlocked.
-     */
-    const SkPixmap& pixmap() const {
-        SkASSERT(this->isLocked());
-        return fPixmap;
-    }
-
-    bool isLocked() const { return fIsLocked; }
-
-    /**
-     *  Unlocks the pixmap. Can safely be called more than once as it will only call the underlying
-     *  unlock-proc once.
-     */
-    void unlock() {
-        if (fUnlockProc) {
-            SkASSERT(fIsLocked);
-            fUnlockProc(fUnlockContext);
-            fUnlockProc = NULL;
-            fIsLocked = false;
-        }
-    }
-
-    /**
-     *  If there is a currently locked pixmap, unlock it, then copy the specified pixmap
-     *  and (optional) unlock proc/context.
-     */
-    void reset(const SkPixmap& pm, void (*unlock)(void*), void* ctx);
-
-private:
-    void        (*fUnlockProc)(void*);
-    void*       fUnlockContext;
-    SkPixmap    fPixmap;
-    bool        fIsLocked;
-
-    friend class SkBitmap;
-};
-#endif
-
 #endif