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>

1 files changed, 7 insertions, 8 deletions

diff --git a/include/core/SkCrossContextImageData.h b/include/core/SkCrossContextImageData.h
index a408f71446..beaaaa6a28 100644
--- a/include/core/SkCrossContextImageData.h
+++ b/include/core/SkCrossContextImageData.h
@@ -12,7 +12,6 @@
 #include "SkImage.h"
 
 #if SK_SUPPORT_GPU
-#include "GrBackendSurface.h"
 #include "GrExternalTextureData.h"
 #endif
 
@@ -69,15 +68,16 @@ public:
     ~SkCCIDBackendTexture() override {}
 
 private:
-    SkCCIDBackendTexture(const GrBackendTexture& backendTex,
-                         GrSurfaceOrigin origin,
+    SkCCIDBackendTexture(const GrBackendTextureDesc& desc,
                          std::unique_ptr<GrExternalTextureData> textureData,
                          SkAlphaType alphaType, sk_sp<SkColorSpace> colorSpace)
             : fAlphaType(alphaType)
             , fColorSpace(std::move(colorSpace))
-            , fBackendTex(backendTex)
-            , fOrigin(origin)
-            , fTextureData(std::move(textureData)) {}
+            , fDesc(desc)
+            , fTextureData(std::move(textureData)) {
+        // Point our texture desc at our copy of the backend information
+        fDesc.fTextureHandle = fTextureData->getBackendObject();
+    }
 
     sk_sp<SkImage> makeImage(GrContext*) override;
 
@@ -85,8 +85,7 @@ private:
     // and some backend-specific info (to reconstruct the texture).
     SkAlphaType fAlphaType;
     sk_sp<SkColorSpace> fColorSpace;
-    GrBackendTexture fBackendTex;
-    GrSurfaceOrigin fOrigin;
+    GrBackendTextureDesc fDesc;
     std::unique_ptr<GrExternalTextureData> fTextureData;
 
     friend class SkCrossContextImageData;