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>

2 files changed, 2 insertions, 6 deletions

diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index aa1e539d62..2dc0369f58 100644
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -206,7 +206,7 @@ bool SkPixelRef::requestLock(const LockRequest& request, LockResult* result) {
         result->fSize.set(fInfo.width(), fInfo.height());
     } else {
         SkAutoMutexAcquire  ac(fMutex);
-        if (!this->onRequestLock(request, result)) {
+        if (!this->internalRequestLock(request, result)) {
             return false;
         }
     }
@@ -314,7 +314,7 @@ static void unlock_legacy_result(void* ctx) {
     pr->unref();    // balancing the Ref in onRequestLoc
 }
 
-bool SkPixelRef::onRequestLock(const LockRequest& request, LockResult* result) {
+bool SkPixelRef::internalRequestLock(const LockRequest& request, LockResult* result) {
     if (!this->lockPixelsInsideMutex()) {
         return false;
     }
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index e6905aa5ce..1aca5a9c52 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -117,10 +117,6 @@ public:
         SkASSERT(bitmapMayBeMutable || fBitmap.isImmutable());
     }
 
-    bool onIsLazyGenerated() const override {
-        return fBitmap.pixelRef() && fBitmap.pixelRef()->isLazyGenerated();
-    }
-
     sk_sp<SkImage> onMakeColorSpace(sk_sp<SkColorSpace>) const override;
 
 #if SK_SUPPORT_GPU