commit daa9e7455d4f0f54dc07f405becba5d0c5964847
author Adlai Holler <adlai@google.com> Mon Aug 03 12:50:40 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 06 14:02:56 2020 +0000
tree 83eac51be12601d5a2bef789a63685d1e1208c55
parent 066f7d6b1ada68217fba365d30f6dd766ca0139b

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>

tests/SurfaceSemaphoreTest.cpp

diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp
index 990e078..e1509cd 100644
--- a/tests/SurfaceSemaphoreTest.cpp
+++ b/tests/SurfaceSemaphoreTest.cpp
@@ -72,12 +72,12 @@
     const SkImageInfo childII = SkImageInfo::Make(CHILD_W, CHILD_H, kRGBA_8888_SkColorType,
                                                   kPremul_SkAlphaType);
 
-    auto childCtx = childInfo.directContext();
-    sk_sp<SkSurface> childSurface(SkSurface::MakeRenderTarget(childCtx, SkBudgeted::kNo,
+    auto childDContext = childInfo.directContext();
+    sk_sp<SkSurface> childSurface(SkSurface::MakeRenderTarget(childDContext, SkBudgeted::kNo,
                                                               childII, 0, kTopLeft_GrSurfaceOrigin,
                                                               nullptr));
 
-    sk_sp<SkImage> childImage = SkImage::MakeFromTexture(childCtx,
+    sk_sp<SkImage> childImage = SkImage::MakeFromTexture(childDContext,
                                                          backendTexture,
                                                          kTopLeft_GrSurfaceOrigin,
                                                          kRGBA_8888_SkColorType,