commit 74b83a4ea9e31dbdc1996a1ed2d1844d5cdbe9b7
author Adlai Holler <adlai@google.com> Thu Aug 06 17:24:53 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 06 17:25:09 2020 +0000
tree 5920b377d35f9ea713ec9ecc1aba5e479dea3e82
parent ae04cc9099b367c81a11a6e77162410e7941056a

Revert "Migrate SkImage::MakeFromTexture to GrRecordingContext"

This reverts commit daa9e7455d4f0f54dc07f405becba5d0c5964847.

Reason for revert: Broke Build-Debian9-Clang-arm-Release-Flutter_Android_Docker

Original change's description:
> Migrate SkImage::MakeFromTexture to GrRecordingContext
> 
> Android migration landed in Android CL 12234077
> Chrome migration is landing in Chrome CL 2335812
> 
> Note: makeFromCompressedTexture is not used by Chrome.
> 
> Bug: skia:104662
> Change-Id: Ibbe6d412cf22e87188926383d10b21f780208e48
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305102
> Commit-Queue: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Auto-Submit: Adlai Holler <adlai@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,adlai@google.com

Change-Id: I570945521c6cd78dfeea81e492b7e2b31dd0e6f5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:104662
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/308505
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

tests/CompressedBackendAllocationTest.cpp

diff --git a/tests/CompressedBackendAllocationTest.cpp b/tests/CompressedBackendAllocationTest.cpp
index ee9d7c7..7e41871 100644
--- a/tests/CompressedBackendAllocationTest.cpp
+++ b/tests/CompressedBackendAllocationTest.cpp
@@ -36,14 +36,14 @@
 }
 
 // Create an SkImage to wrap 'backendTex'
-sk_sp<SkImage> create_image(GrDirectContext* dContext, const GrBackendTexture& backendTex) {
+sk_sp<SkImage> create_image(GrContext* context, const GrBackendTexture& backendTex) {
     SkImage::CompressionType compression =
             GrBackendFormatToCompressionType(backendTex.getBackendFormat());
 
     SkAlphaType at = SkCompressionTypeIsOpaque(compression) ? kOpaque_SkAlphaType
                                                             : kPremul_SkAlphaType;
 
-    return SkImage::MakeFromCompressedTexture(dContext,
+    return SkImage::MakeFromCompressedTexture(context,
                                               backendTex,
                                               kTopLeft_GrSurfaceOrigin,
                                               at,