some catchup CL revisions

src/core/SkImageCacherator.cpp

 /*
  * Copyright 2015 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 "SkImageCacherator.h"
 #include "SkPixelRef.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrGpuResourcePriv.h"
 #include "GrResourceKey.h"
 #include "GrTextureAccess.h"
 #include "SkGr.h"
 #include "SkGrPriv.h"
 #endif
 
+SkImageCacherator* SkImageCacherator::NewFromGenerator(SkImageGenerator* gen) {
+    if (!gen) {
+        return nullptr;
+    }
+    return SkNEW_ARGS(SkImageCacherator, (gen));
+}
+
 SkImageCacherator::SkImageCacherator(SkImageGenerator* gen) : fGenerator(gen) {}
 
 SkImageCacherator::~SkImageCacherator() {
-    delete fGenerator;
+    SkDELETE(fGenerator);
 }
 
 static bool check_output_bitmap(const SkBitmap& bitmap, uint32_t expectedID) {
     SkASSERT(bitmap.getGenerationID() == expectedID);
     SkASSERT(bitmap.isImmutable());
     SkASSERT(bitmap.getPixels());
     return true;
 }
 
 static bool generate_bitmap(SkImageGenerator* generator, SkBitmap* bitmap) {
@@ skipping 99 matching lines @@
     SkBitmap bitmap;
     if (!generate_bitmap(fGenerator, &bitmap)) {
         return nullptr;
     }
     return GrRefCachedBitmapTexture(ctx, bitmap, usage);
 #else
     return nullptr;
 #endif
 }