commit 7fa5c31c2c9af834bee66d5fcf476e250076c8d6
author Stan Iliev <stani@google.com> Wed Apr 19 00:23:39 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 19 00:23:50 2017 +0000
tree 846c27759d4cf4c6487a636872e2e9c88d9137ff
parent edec99b640a7a9dbc7d4fd9f48d35ed3a54c61e3

Revert "Plumb GrBackendTexture throughout skia."

This reverts commit 7da62b9059f3c1d31624a0e4da96ee5f908f9c12.

Reason for revert: fix android roll

Original change's description:
> Plumb GrBackendTexture throughout skia.
> 
> Bug: skia:
> Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875
> Reviewed-on: https://skia-review.googlesource.com/13645
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> 

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,stani@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I5cb8763cc837c83ebc6d10366fe2dd3efe35fb89
Reviewed-on: https://skia-review.googlesource.com/13773
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Stan Iliev <stani@google.com>

gm/rectangletexture.cpp

diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index d4f4552..1359d34 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -11,7 +11,6 @@
 
 #if SK_SUPPORT_GPU
 
-#include "GrBackendSurface.h"
 #include "GrContext.h"
 #include "GrGpu.h"
 #include "GrTest.h"
@@ -108,11 +107,13 @@
         GrGLTextureInfo info;
         info.fID = id;
         info.fTarget = TARGET;
-
-        GrBackendTexture rectangleTex(width, height, kRGBA_8888_GrPixelConfig, &info);
-
-        if (sk_sp<SkImage> image = SkImage::MakeFromAdoptedTexture(context, rectangleTex,
-                                                                   kTopLeft_GrSurfaceOrigin)) {
+        GrBackendTextureDesc desc;
+        desc.fConfig = kRGBA_8888_GrPixelConfig;
+        desc.fWidth = width;
+        desc.fHeight = height;
+        desc.fOrigin = kTopLeft_GrSurfaceOrigin;
+        desc.fTextureHandle = reinterpret_cast<GrBackendObject>(&info);
+        if (sk_sp<SkImage> image = SkImage::MakeFromAdoptedTexture(context, desc)) {
             return image;
         }
         GR_GL_CALL(gl, DeleteTextures(1, &id));