commit 2700abc4cba46d18f675b90e7fbb73f6363c7f89
author Brian Osman <brianosman@google.com> Wed Sep 12 10:19:41 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 12 15:00:46 2018 +0000
tree c0c3ddea53d61c35e13dbac5125e617b0c414e1d
parent c3d8a48f1b27370049aa512019cd726c59354743

Remove raw-data version of createTextureProxy

This had poorly defined semantics in the world of DDL, and was only used
for a handful of GMs and tests. Switch those to use the SkImage version.

Bug: skia:
Change-Id: I2bec65c7547b2c904bd7f57a6296aacc0f7b4ed2
Reviewed-on: https://skia-review.googlesource.com/153886
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 368e594..32769af 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -231,10 +231,10 @@
 
     {
         // gpu
-        const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info());
-
-        sk_sp<GrTextureProxy> proxy = proxyProvider->createTextureProxy(
-                desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes());
+        sk_sp<SkImage> rasterImage = SkImage::MakeFromBitmap(bm);
+        sk_sp<GrTextureProxy> proxy =
+                proxyProvider->createTextureProxy(rasterImage, kNone_GrSurfaceFlags, 1,
+                                                  SkBudgeted::kNo, SkBackingFit::kExact);
         if (!proxy) {
             return;
         }
@@ -263,11 +263,11 @@
     GrContext* context = ctxInfo.grContext();
     GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
     SkBitmap bm = create_bm();
-
-    const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bm.info());
+    sk_sp<SkImage> rasterImage = SkImage::MakeFromBitmap(bm);
 
     sk_sp<GrTextureProxy> proxy =
-            proxyProvider->createTextureProxy(desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes());
+            proxyProvider->createTextureProxy(rasterImage, kNone_GrSurfaceFlags, 1,
+                                              SkBudgeted::kNo, SkBackingFit::kExact);
     if (!proxy) {
         return;
     }
@@ -298,15 +298,11 @@
     GrContext* context = ctxInfo.grContext();
     GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
     SkBitmap bm = create_bm();
-
-    GrSurfaceDesc desc;
-    desc.fFlags  = kNone_GrSurfaceFlags;
-    desc.fWidth  = kFullSize;
-    desc.fHeight = kFullSize;
-    desc.fConfig = kSkia8888_GrPixelConfig;
+    sk_sp<SkImage> rasterImage = SkImage::MakeFromBitmap(bm);
 
     sk_sp<GrTextureProxy> proxy =
-            proxyProvider->createTextureProxy(desc, SkBudgeted::kNo, bm.getPixels(), bm.rowBytes());
+            proxyProvider->createTextureProxy(rasterImage, kNone_GrSurfaceFlags, 1,
+                                              SkBudgeted::kNo, SkBackingFit::kExact);
     if (!proxy) {
         return;
     }