commit fa694ad067976a5b713eec0b6f92ba5efeb0aa9d
author fmalita <fmalita@chromium.org> Fri Oct 16 07:39:33 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 16 07:39:33 2015 -0700
tree 0fae38eca76ebde15c3980193f021c2d329274df
parent 338047e21fa321a708cd59d6f3dfdab753cf6404

Remove SkDEPRECATED_InstallDiscardablePixelRef from SkPictureShader

Use an SkImage generator/shader instead.

R=reed@google.com

Review URL: https://codereview.chromium.org/1405103003

src/core/SkPictureShader.cpp

diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
index 92e6157..ab59932 100644
--- a/src/core/SkPictureShader.cpp
+++ b/src/core/SkPictureShader.cpp
@@ -10,6 +10,7 @@
 #include "SkBitmap.h"
 #include "SkBitmapProcShader.h"
 #include "SkCanvas.h"
+#include "SkImage.h"
 #include "SkImageGenerator.h"
 #include "SkMatrixUtils.h"
 #include "SkPicture.h"
@@ -217,18 +218,28 @@
     if (!SkResourceCache::Find(key, BitmapShaderRec::Visitor, &tileShader)) {
         SkMatrix tileMatrix;
         tileMatrix.setRectToRect(fTile, SkRect::MakeIWH(tileSize.width(), tileSize.height()),
-                             SkMatrix::kFill_ScaleToFit);
-        SkBitmap bm;
-        if (!SkDEPRECATED_InstallDiscardablePixelRef(
-            SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nullptr), &bm)) {
+                                 SkMatrix::kFill_ScaleToFit);
+
+        SkAutoTDelete<SkImageGenerator> tileGenerator(
+            SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nullptr));
+        if (!tileGenerator) {
+            return nullptr;
+        }
+
+        // Grab this before the generator goes poof!
+        const SkImageInfo tileInfo = tileGenerator->getInfo();
+
+        SkAutoTUnref<SkImage> tileImage(SkImage::NewFromGenerator(tileGenerator.detach()));
+        if (!tileImage) {
             return nullptr;
         }
 
         SkMatrix shaderMatrix = this->getLocalMatrix();
         shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height());
-        tileShader.reset(CreateBitmapShader(bm, fTmx, fTmy, &shaderMatrix));
+        tileShader.reset(tileImage->newShader(fTmx, fTmy, &shaderMatrix));
 
-        SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(), bm.getSize()));
+        SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(),
+                                                 tileInfo.getSafeSize(tileInfo.minRowBytes())));
     }
 
     return tileShader.detach();