commit edcd431f42f129cbef38c8d2c3be905adda79f97
author Robert Phillips <robertphillips@google.com> Thu Jun 03 10:14:16 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 03 16:21:27 2021 +0000
tree c975dfef5fb83b7fe4c02e35ab55281fcd1345d5
parent 4377bc917f847239d62dfb7389078ea0edbcf777

Retract the SDC from GMs where possible (take 2)

In the future, the SDC won't be return by SkCanvas/SkDevices and gms/tests that rely on it won't be run. These GMs don't actually require the SDC.

There is also some opportunistic renaming going on.
TBR=michaelludwig@google.com

Change-Id: I15cbaf69269892fbbf229c0263b567425049c3f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/415167
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

gm/textblobuseaftergpufree.cpp

diff --git a/gm/textblobuseaftergpufree.cpp b/gm/textblobuseaftergpufree.cpp
index c3745cc..c85928c 100644
--- a/gm/textblobuseaftergpufree.cpp
+++ b/gm/textblobuseaftergpufree.cpp
@@ -24,7 +24,7 @@
 
 // This tests that we correctly regenerate textblobs after freeing all gpu resources crbug/491350
 namespace skiagm {
-class TextBlobUseAfterGpuFree : public GpuGM {
+class TextBlobUseAfterGpuFree : public GM {
 public:
     TextBlobUseAfterGpuFree() { }
 
@@ -37,7 +37,9 @@
         return SkISize::Make(kWidth, kHeight);
     }
 
-    void onDraw(GrRecordingContext* context, GrSurfaceDrawContext*, SkCanvas* canvas) override {
+    void onDraw(SkCanvas* canvas) override {
+        auto dContext = GrAsDirectContext(canvas->recordingContext());
+
         const char text[] = "Hamburgefons";
 
         SkFont font(ToolUtils::create_portable_typeface(), 20);
@@ -51,8 +53,8 @@
         canvas->drawTextBlob(blob, 20, 60, SkPaint());
 
         // This text should look fine
-        if (auto direct = context->asDirectContext()) {
-            direct->freeGpuResources();
+        if (dContext) {
+            dContext->freeGpuResources();
         }
         canvas->drawTextBlob(blob, 20, 160, SkPaint());
     }