remove unneeded device:lockpixels

include/core/SkBitmapDevice.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
@@ skipping 101 matching lines @@
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
     // just for subclasses, to assign a custom pixelref
     SkPixelRef* setPixelRef(SkPixelRef* pr) {
         fBitmap.setPixelRef(pr);
         return pr;
     }
 
     bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) override;
     bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) override;
     void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) override;
-
-    /** Called when this device is installed into a Canvas. Balanced by a call
-        to unlockPixels() when the device is removed from a Canvas.
-    */
-    void lockPixels() override;
-    void unlockPixels() override;
+    void onAttachToCanvas(SkCanvas*) override;
+    void onDetachFromCanvas() override;
 
 private:
     friend class SkCanvas;
     friend struct DeviceCM; //for setMatrixClip
     friend class SkDraw;
     friend class SkDrawIter;
     friend class SkDeviceFilteredPaint;
     friend class SkDeviceImageFilterProxy;
 
     friend class SkSurface_Raster;
@@ skipping 11 matching lines @@
     SkImageFilter::Cache* getImageFilterCache() override;
 
     SkBitmap    fBitmap;
 
     void setNewSize(const SkISize&);  // Used by SkCanvas for resetForNextPicture().
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif // SkBitmapDevice_DEFINED