clean ups in SkPixelRef

- isLazyGenerated no longer needed
- requestLock does not need a virtual

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

1 files changed, 1 insertions, 9 deletions

diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index ac2e45e5fd..5987ee59fb 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -208,11 +208,6 @@ public:
 
     virtual SkDiscardableMemory* diagnostic_only_getDiscardable() const { return NULL; }
 
-    /**
-     *  Returns true if the pixels are generated on-the-fly (when required).
-     */
-    bool isLazyGenerated() const { return this->onIsLazyGenerated(); }
-
 protected:
     /**
      *  On success, returns true and fills out the LockRec for the pixels. On
@@ -246,10 +241,6 @@ protected:
      */
     virtual size_t getAllocatedSizeInBytes() const;
 
-    virtual bool onRequestLock(const LockRequest&, LockResult*);
-
-    virtual bool onIsLazyGenerated() const { return false; }
-
     /** Return the mutex associated with this pixelref. This value is assigned
         in the constructor, and cannot change during the lifetime of the object.
     */
@@ -271,6 +262,7 @@ private:
     int             fLockCount;
 
     bool lockPixelsInsideMutex();
+    bool internalRequestLock(const LockRequest&, LockResult*);
 
     // Bottom bit indicates the Gen ID is unique.
     bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); }