Add a mechanism for GMs to silently exclude themselves from Gold

This is useful, for example, when trying to test a hardware feature
that isn't supported in the current context.

Bug: skia:8731
Change-Id: I9a363159300c92e4039bfd05400238c27002efb1
Reviewed-on: https://skia-review.googlesource.com/c/189133
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index ec05d21f9d..52df12a4ff 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -60,18 +60,13 @@ protected:
 
     SkISize onISize() override { return SkISize::Make(kImageWidth, kImageHeight); }
 
-    void onDraw(SkCanvas* canvas) override {
+    DrawResult onDraw(SkCanvas* canvas, SkString* errorMsg) override {
         GrRenderTargetContext* renderTargetContext =
             canvas->internal_private_accessTopLayerRenderTargetContext();
-        if (kEffect_Type == fType && !renderTargetContext) {
-            skiagm::GM::DrawGpuOnlyMessage(canvas);
-            return;
-        }
-
         GrContext* context = canvas->getGrContext();
-        if (kEffect_Type == fType && !context) {
-            skiagm::GM::DrawGpuOnlyMessage(canvas);
-            return;
+        if (kEffect_Type == fType && (!renderTargetContext || !context)) {
+            *errorMsg = kErrorMsg_DrawSkippedGpuOnly;
+            return DrawResult::kSkip;
         }
 
         SkPaint paint;
@@ -142,6 +137,7 @@ protected:
                 y += kTileY;
             }
         }
+        return DrawResult::kOk;
     }
 
     void setUpRRects() {