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_isValid.cpp

diff --git a/docs/examples/Image_isValid.cpp b/docs/examples/Image_isValid.cpp
index ae30b2a..1fde4c3 100644
--- a/docs/examples/Image_isValid.cpp
+++ b/docs/examples/Image_isValid.cpp
@@ -4,6 +4,10 @@
 // HASH=afc62f38aebc56af8e425297ec67dd37
 REG_FIDDLE(Image_isValid, 256, 256, false, 5) {
 void draw(SkCanvas* canvas) {
+    auto dContext = GrAsDirectContext(canvas->recordingContext());
+    if (!dContext) {
+        return;
+    }
     auto drawImage = [=](sk_sp<SkImage> image, const char* label) -> void {
         if (nullptr == image) {
             return;
@@ -13,20 +17,19 @@
         paint.setAntiAlias(true);
         canvas->drawImage(image, 0, 0);
         canvas->drawString(label, image->width() / 2, image->height() / 4, font, paint);
-        if (canvas->recordingContext()) {
-            const char* msg = image->isValid(canvas->recordingContext()) ? "is valid on GPU"
-                                                                         : "not valid on GPU";
+        if (dContext) {
+            const char* msg = image->isValid(dContext) ? "is valid on GPU"
+                                                       : "not valid on GPU";
             canvas->drawString(msg, 20, image->height() * 5 / 8, font, paint);
         }
 
-        // CONTEXT TODO: Once GrContext is gone, remove this cast
-        const char* msg = image->isValid((GrRecordingContext*) nullptr) ? "is valid on CPU"
-                                                                        : "not valid on CPU";
+        const char* msg = image->isValid(nullptr) ? "is valid on CPU"
+                                                  : "not valid on CPU";
 
         canvas->drawString(msg, 20, image->height() * 7 / 8, font, paint);
     };
     sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
-    sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
+    sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
                                 kTopLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType,
                                 kOpaque_SkAlphaType, nullptr));
     drawImage(image, "image");