commit 290690c73a4bcb91eb54f72f0b35c1a47151ca18
author Mike Klein <mtklein@google.com> Tue Apr 02 18:11:57 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 03 14:06:18 2019 +0000
tree c3eb2bef4151bd095f9b69c4d4ee89b1914c181a
parent 176da0bb8a1002d2fe4c4edf4ce9fde609bda256

GrContext abandon: fail -> skip

It's hard to run the preAbandonGpuContext bots if we consider abandoned
to be a hard failure.

Actually, can you double check my suspicion that checking
ctx->abandoned() here might kind of make the whole bot moot?  If we
check ctx->abandoned() here before drawing any GpuGM's content, isn't
the bot just spinning through without ever attempting to draw anything?

Cq-Include-Trybots: skia.primary:Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext
Change-Id: Id545ce88faef3bab6150cb5229422ab48399f5b3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205594
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

gm/simple_magnification.cpp

diff --git a/gm/simple_magnification.cpp b/gm/simple_magnification.cpp
index 0cd21e2..3311f85 100644
--- a/gm/simple_magnification.cpp
+++ b/gm/simple_magnification.cpp
@@ -16,39 +16,36 @@
         SkImageInfo ii = SkImageInfo::Make(size, size, kN32_SkColorType, kPremul_SkAlphaType);
         sk_sp<SkSurface> surf(SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, ii, 0,
                                                           origin, nullptr));
-        if (!surf) {
-            return nullptr;
+        if (surf) {
+            SkCanvas* canvas = surf->getCanvas();
+
+            canvas->clear(SK_ColorRED);
+            const struct {
+                SkPoint fPt;
+                SkColor fColor;
+            } rec[] = {
+                { { 1.5f, 1.5f }, SK_ColorGREEN },
+                { { 2.5f, 1.5f }, SK_ColorBLUE },
+                { { 1.5f, 2.5f }, SK_ColorCYAN },
+                { { 2.5f, 2.5f }, SK_ColorGRAY },
+            };
+            SkPaint paint;
+            for (const auto& r : rec) {
+                paint.setColor(r.fColor);
+                canvas->drawPoints(SkCanvas::kPoints_PointMode, 1, &r.fPt, paint);
+            }
+            return surf->makeImageSnapshot();
         }
-
-        SkCanvas* canvas = surf->getCanvas();
-
-        canvas->clear(SK_ColorRED);
-        const struct {
-            SkPoint fPt;
-            SkColor fColor;
-        } rec[] = {
-            { { 1.5f, 1.5f }, SK_ColorGREEN },
-            { { 2.5f, 1.5f }, SK_ColorBLUE },
-            { { 1.5f, 2.5f }, SK_ColorCYAN },
-            { { 2.5f, 2.5f }, SK_ColorGRAY },
-        };
-        SkPaint paint;
-        for (const auto& r : rec) {
-            paint.setColor(r.fColor);
-            canvas->drawPoints(SkCanvas::kPoints_PointMode, 1, &r.fPt, paint);
-        }
-        return surf->makeImageSnapshot();
-    } else {
-        SkBitmap bm;
-        bm.allocN32Pixels(size, size);
-        bm.eraseColor(SK_ColorRED);
-        *bm.getAddr32(1, 1) = SkPackARGB32(0xFF, 0x00, 0xFF, 0x00);
-        *bm.getAddr32(2, 1) = SkPackARGB32(0xFF, 0x00, 0x00, 0xFF);
-        *bm.getAddr32(1, 2) = SkPackARGB32(0xFF, 0x00, 0xFF, 0xFF);
-        *bm.getAddr32(2, 2) = SkPackARGB32(0xFF, 0x88, 0x88, 0x88);
-
-        return SkImage::MakeFromBitmap(bm);
     }
+
+    SkBitmap bm;
+    bm.allocN32Pixels(size, size);
+    bm.eraseColor(SK_ColorRED);
+    *bm.getAddr32(1, 1) = SkPackARGB32(0xFF, 0x00, 0xFF, 0x00);
+    *bm.getAddr32(2, 1) = SkPackARGB32(0xFF, 0x00, 0x00, 0xFF);
+    *bm.getAddr32(1, 2) = SkPackARGB32(0xFF, 0x00, 0xFF, 0xFF);
+    *bm.getAddr32(2, 2) = SkPackARGB32(0xFF, 0x88, 0x88, 0x88);
+    return SkImage::MakeFromBitmap(bm);
 }
 
 /*