Revert "Revert "Revert "Revert of https://codereview.chromium.org/110593003/"""

include/images/SkImageRef.h

Index: include/images/SkImageRef.h
diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h
index 30b1562c98490dfdf9e444c170e335d965a202e6..36f95e64b2410f1fe2909ff015f3b3d2ff572cc9 100644
--- a/include/images/SkImageRef.h
+++ b/include/images/SkImageRef.h
@@ -72,9 +72,9 @@ protected:
         When these are called, we will have already acquired the mutex!
      */
 
-    virtual void* onLockPixels(SkColorTable**);
+    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
     // override this in your subclass to clean up when we're unlocking pixels
-    virtual void onUnlockPixels() {}
+    virtual void onUnlockPixels() SK_OVERRIDE {}
 
     SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL);
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;