Revert of Add gpu implementation of SkAvoidXfermode (patchset #10 id:170001 of https://codereview.chromium.org/1658623002/ )

Reason for revert:
shader compilation failures

error C1008: undefined variable "null"

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/4064/steps/dm/logs/stdio

Original issue's description:
> Add gpu implementation of SkAvoidXfermode
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1658623002
>
> TBR=bsalomon@google.com
>
> Committed: https://skia.googlesource.com/skia/+/15691a055db9b68c9b48f589e48d8a85888cf83f

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1663093002

2 files changed, 2 insertions, 86 deletions

diff --git a/gm/avoidxfermode.cpp b/gm/avoidxfermode.cpp
index a015b6bbe7..0d681cb143 100644
--- a/gm/avoidxfermode.cpp
+++ b/gm/avoidxfermode.cpp
@@ -67,9 +67,9 @@ protected:
 
         r.offsetTo(0.0f, 64);
 
-        // LL corner: replace red with transparent blue with a loose tolerance
+        // LL corner: replace red with blue with a loose tolerance
         SkPaint p3;
-        p3.setColor(0x7F0000FF);
+        p3.setColor(SK_ColorBLUE);
         p3.setXfermode(SkAvoidXfermode::Create(SK_ColorRED,
                                                250,
                                                SkAvoidXfermode::kTargetColor_Mode))->unref();
diff --git a/gm/avoidxfermode2.cpp b/gm/avoidxfermode2.cpp
deleted file mode 100644
index 039ed4017b..0000000000
--- a/gm/avoidxfermode2.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gm.h"
-#include "SkAvoidXfermode.h"
-
-class AvoidXfermode2GM : public skiagm::GM {
-public:
-    AvoidXfermode2GM() { }
-
-protected:
-    SkString onShortName() override {
-        return SkString("avoidxfermode2");
-    }
-
-    SkISize onISize() override { return SkISize::Make(128, 128); }
-
-    void onDraw(SkCanvas* canvas) override {
-        canvas->drawARGB(255, 0, 0, 0);
-
-        SkRect r = SkRect::MakeXYWH(32, 32, 64, 64);
-
-        SkPaint p0;
-        p0.setColor(SK_ColorGREEN);
-        p0.setAntiAlias(false);
-
-        canvas->drawRect(r, p0);
-
-        r = SkRect::MakeIWH(64, 64);
-
-        // UL corner: replace the green with a tight tolerance
-        SkPaint p1;
-        p1.setColor(SK_ColorRED);
-        p1.setXfermode(SkAvoidXfermode::Create(SK_ColorGREEN,
-                                               55,
-                                               SkAvoidXfermode::kTargetColor_Mode))->unref();
-
-        canvas->drawRect(r, p1);
-
-        r.offsetTo(64, 0.0f);
-
-        // UR corner: avoid the green with a tight tolerance
-        SkPaint p2;
-        p2.setColor(SK_ColorRED);
-        p2.setXfermode(SkAvoidXfermode::Create(SK_ColorGREEN,
-                                               200,
-                                               SkAvoidXfermode::kAvoidColor_Mode))->unref();
-
-        canvas->drawRect(r, p2);
-
-        r.offsetTo(0.0f, 64);
-
-        // LL corner: replace the green with a loose tolerance
-        SkPaint p3;
-        p3.setColor(SK_ColorRED);
-        p3.setXfermode(SkAvoidXfermode::Create(SK_ColorGREEN,
-                                               200,
-                                               SkAvoidXfermode::kTargetColor_Mode))->unref();
-
-        canvas->drawRect(r, p3);
-
-        r.offsetTo(64, 64);
-
-        // LR corner: avoid the green with a loose tolerance
-        SkPaint p4;
-        p4.setColor(SK_ColorRED);
-        p4.setXfermode(SkAvoidXfermode::Create(SK_ColorGREEN,
-                                               55,
-                                               SkAvoidXfermode::kAvoidColor_Mode))->unref();
-
-        canvas->drawRect(r, p4);
-    }
-
-private:
-    typedef GM INHERITED;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-DEF_GM(return new AvoidXfermode2GM;)