Purge cached resources on SkImage destruction.

src/image/SkImage.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
+#include "SkBitmapCache.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkImageGenerator.h"
 #include "SkImagePriv.h"
 #include "SkImage_Base.h"
 #include "SkNextID.h"
 #include "SkPixelRef.h"
 #include "SkPixelSerializer.h"
 #include "SkReadPixelsRec.h"
 #include "SkString.h"
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
 #include "GrTexture.h"
 #include "GrContext.h"
 #include "SkImage_Gpu.h"
 #endif
 
 SkImage::SkImage(int width, int height, uint32_t uniqueID)
     : fWidth(width)
     , fHeight(height)
     , fUniqueID(kNeedNewImageUniqueID == uniqueID ? SkNextID::ImageID() : uniqueID)
 {
     SkASSERT(width > 0);
     SkASSERT(height > 0);
 }
 
+SkImage::~SkImage() { }

[reed1, 2015/09/18 14:32:53]

nit: I think we can put this impl ( {} ) in the header.

[f(malita), 2015/09/18 15:00:40]

Dropped the SkImage dtor completely.

+
 const void* SkImage::peekPixels(SkImageInfo* info, size_t* rowBytes) const {
     SkImageInfo infoStorage;
     size_t rowBytesStorage;
     if (nullptr == info) {
         info = &infoStorage;
     }
     if (nullptr == rowBytes) {
         rowBytes = &rowBytesStorage;
     }
     return as_IB(this)->onPeekPixels(info, rowBytes);
@@ skipping 157 matching lines @@
         case kRGB_565_SkColorType:
             return true;
         case kAlpha_8_SkColorType:
             return true;
         default:
             break;
     }
     return false;
 }
 
+static SkSurfaceProps copy_or_safe_defaults(const SkSurfaceProps* props) {
+    return props ? *props : SkSurfaceProps(0, kUnknown_SkPixelGeometry);

[mtklein, 2015/09/18 14:32:36]

We might even think about adding SkSurfaceProps::SafeDefaults().  I was just
puzzling through this the other day.

+}
+
+SkImage_Base::SkImage_Base(int width, int height, uint32_t uniqueID, const SkSurfaceProps* props)
+    : INHERITED(width, height, uniqueID)
+    , fProps(copy_or_safe_defaults(props))

[mtklein, 2015/09/18 14:32:36]

You ought to be able to do fAddedToCache(false) here.  It'll be a bit faster,
but probably nothing life-changing.  That'd start it off initialized rather than
start it uninitialized then atomically initialize it.  (There's rarely a need to
do anything atomic in constructors.)

[f(malita), 2015/09/18 15:00:40]

Thanks, done.

+{
+    fAddedToCache.store(false);
+}
+
+SkImage_Base::~SkImage_Base() {
+    if (fAddedToCache.load()) {
+        SkNotifyBitmapGenIDIsStale(this->uniqueID());

[mtklein, 2015/09/18 14:32:36]

Are bitmap genids and skimage genids in the same namespace?

[f(malita), 2015/09/18 15:00:40]

Yes.

+    }
+}
+
 bool SkImage_Base::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                                 int srcX, int srcY) const {
     if (!raster_canvas_supports(dstInfo)) {
         return false;
     }
 
     SkBitmap bm;
     bm.installPixels(dstInfo, dstPixels, dstRowBytes);
     SkCanvas canvas(bm);
 
@@ skipping 125 matching lines @@
 
 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
     return nullptr;
 }
 
 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
     return nullptr;
 }
 
 #endif