| Index: src/image/SkImage_Raster.cpp
|
| diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
|
| index 5025dfa8c458007623b8544f634eda31b65686a9..7eff9ef0f696d80fa016f4bc484f5c38bb049a88 100644
|
| --- a/src/image/SkImage_Raster.cpp
|
| +++ b/src/image/SkImage_Raster.cpp
|
| @@ -64,7 +64,6 @@ public:
|
|
|
| SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) const override;
|
| bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY) const override;
|
| - void onPreroll(GrContext*) const override;
|
| const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const override;
|
| SkData* onRefEncoded() const override;
|
| bool getROPixels(SkBitmap*) const override;
|
| @@ -164,14 +163,6 @@ const void* SkImage_Raster::onPeekPixels(SkImageInfo* infoPtr, size_t* rowBytesP
|
| return fBitmap.getPixels();
|
| }
|
|
|
| -void SkImage_Raster::onPreroll(GrContext* ctx) const {
|
| - // SkImage can be called from lots of threads, but our fBitmap is *not* thread-safe,
|
| - // so we have to perform this lock/unlock in a non-racy way... we make a copy!
|
| - SkBitmap localShallowCopy(fBitmap);
|
| - localShallowCopy.lockPixels();
|
| - localShallowCopy.unlockPixels();
|
| -}
|
| -
|
| SkData* SkImage_Raster::onRefEncoded() const {
|
| SkPixelRef* pr = fBitmap.pixelRef();
|
| const SkImageInfo prInfo = pr->info();
|
|
|