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>

docs/examples/Image_MakeBackendTextureFromSkImage.cpp

diff --git a/docs/examples/Image_MakeBackendTextureFromSkImage.cpp b/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
index aabdaaf..450c1b4 100644
--- a/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
+++ b/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
@@ -3,9 +3,9 @@
 #include "tools/fiddle/examples.h"
 // HASH=06aeb3cf63ffccf7b49fe556e5def351
 REG_FIDDLE(Image_MakeBackendTextureFromSkImage, 256, 64, false, 0) {
-static sk_sp<SkImage> create_gpu_image(GrContext* grContext) {
+static sk_sp<SkImage> create_gpu_image(GrRecordingContext* rContext) {
     const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType);
-    auto surface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+    auto surface(SkSurface::MakeRenderTarget(rContext, SkBudgeted::kNo, info));
     SkCanvas* canvas = surface->getCanvas();
     canvas->clear(SK_ColorWHITE);
     SkPaint paint;
@@ -15,19 +15,19 @@
 }
 
 void draw(SkCanvas* canvas) {
-    GrContext* grContext = canvas->getGrContext();
-    if (!grContext) {
+    auto dContext = GrAsDirectContext(canvas->recordingContext());
+    if (!dContext) {
         return;
     }
-    sk_sp<SkImage> backEndImage = create_gpu_image(grContext);
+    sk_sp<SkImage> backEndImage = create_gpu_image(dContext);
     canvas->drawImage(backEndImage, 0, 0);
     GrBackendTexture texture;
     SkImage::BackendTextureReleaseProc proc;
-    if (!SkImage::MakeBackendTextureFromSkImage(grContext, std::move(backEndImage),
+    if (!SkImage::MakeBackendTextureFromSkImage(dContext, std::move(backEndImage),
             &texture, &proc)) {
         return;
     }
-    sk_sp<SkImage> i2 = SkImage::MakeFromTexture(grContext, texture, kTopLeft_GrSurfaceOrigin,
+    sk_sp<SkImage> i2 = SkImage::MakeFromTexture(dContext, texture, kTopLeft_GrSurfaceOrigin,
             kN32_SkColorType, kOpaque_SkAlphaType, nullptr);
     canvas->drawImage(i2, 30, 30);
 }