lock pixels in image when bitmap is immutable and not-lazy

include/core/SkPixelRef.h

 /*
  * Copyright 2008 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 SkPixelRef_DEFINED
 #define SkPixelRef_DEFINED
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 #include "SkMutex.h"
 #include "SkPixmap.h"
 #include "SkRefCnt.h"
 #include "SkSize.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 
-#ifdef SK_DEBUG
-    /**
-     *  Defining SK_IGNORE_PIXELREF_SETPRELOCKED will force all pixelref
-     *  subclasses to correctly handle lock/unlock pixels. For performance
-     *  reasons, simple malloc-based subclasses call setPreLocked() to skip
-     *  the overhead of implementing these calls.
-     *
-     *  This build-flag disables that optimization, to add in debugging our
-     *  call-sites, to ensure that they correctly balance their calls of
-     *  lock and unlock.
-     */
-//    #define SK_IGNORE_PIXELREF_SETPRELOCKED
-#endif
-
 class SkColorTable;
 class SkData;
 struct SkIRect;
 
 class GrTexture;
 
 /** \class SkPixelRef
 
     This class is the smart container for pixel memory, and is used with
     SkBitmap. A pixelref is installed into a bitmap, and then the bitmap can
@@ skipping 332 matching lines @@
 
     void needsNewGenID();
     void callGenIDChangeListeners();
 
     void setMutex(SkBaseMutex* mutex);
 
     void setTemporarilyImmutable();
     void restoreMutability();
     friend class SkSurface_Raster;   // For the two methods above.
 
+    bool isPreLocked() const { return fPreLocked; }
+    friend class SkImage_Raster;
+
     // When copying a bitmap to another with the same shape and config, we can safely
     // clone the pixelref generation ID too, which makes them equivalent under caching.
     friend class SkBitmap;  // only for cloneGenID
     void cloneGenID(const SkPixelRef&);
 
     typedef SkRefCnt INHERITED;
 };
 
 class SkPixelRefFactory : public SkRefCnt {
 public:
     /**
      *  Allocate a new pixelref matching the specified ImageInfo, allocating
      *  the memory for the pixels. If the ImageInfo requires a ColorTable,
      *  the pixelref will ref() the colortable.
      *  On failure return NULL.
      */
     virtual SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) = 0;
 };
 
 #endif