commit 4dea72a987611181265ce1350ff690c141c51b99
author Brian Salomon <bsalomon@google.com> Wed Dec 18 10:43:10 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 18 17:14:45 2019 +0000
tree fc11749d797b1f17add61242ee7f2e108ff7487c
parent ee94693c7ab124bf40bb72a8c28873c566b3b881

Reland x3 "Remove most of GrConfig.h"

This change makes this safe for Chrome:
https://skia-review.googlesource.com/c/skia/+/260779

This reverts commit 3f1a98b779ace0df57ff31edc0a4a28ddfd4a477.

Change-Id: Ic6886ceabbf626040fc527ea10fe06cbe74a3854
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260783
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrPathRendererChain.cpp

diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index e21d1bc..71efe38 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -78,10 +78,10 @@
         const GrPathRenderer::CanDrawPathArgs& args,
         DrawType drawType,
         GrPathRenderer::StencilSupport* stencilSupport) {
-    GR_STATIC_ASSERT(GrPathRenderer::kNoSupport_StencilSupport <
-                     GrPathRenderer::kStencilOnly_StencilSupport);
-    GR_STATIC_ASSERT(GrPathRenderer::kStencilOnly_StencilSupport <
-                     GrPathRenderer::kNoRestriction_StencilSupport);
+    static_assert(GrPathRenderer::kNoSupport_StencilSupport <
+                  GrPathRenderer::kStencilOnly_StencilSupport);
+    static_assert(GrPathRenderer::kStencilOnly_StencilSupport <
+                  GrPathRenderer::kNoRestriction_StencilSupport);
     GrPathRenderer::StencilSupport minStencilSupport;
     if (DrawType::kStencil == drawType) {
         minStencilSupport = GrPathRenderer::kStencilOnly_StencilSupport;