commit b4aab9ae6d27c446af8302b79d15b832c816c633
author Ben Wagner <bungeman@google.com> Wed Aug 16 10:53:04 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 16 15:37:54 2017 +0000
tree 27e7f87a7a5e3d61990bc2742d9b9f167d26e0c3
parent edf3dc094b0fc55bfc932539da1127484051b474

Replace SkFAIL with SK_ABORT.

SkFAIL is a legacy macro which is just SK_ABORT. This CL mechanically
changes uses of SkFAIL to SK_ABORT in preparation for its removal. The
related sk_throw macro will be changed independently, due to needing to
actually clean up its users.

Change-Id: Id70b5c111a02d2458dc60c8933f444df27d9cebb
Reviewed-on: https://skia-review.googlesource.com/35284
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/gpu/ccpr/GrCCPRCoverageOpsBuilder.cpp

diff --git a/src/gpu/ccpr/GrCCPRCoverageOpsBuilder.cpp b/src/gpu/ccpr/GrCCPRCoverageOpsBuilder.cpp
index 4c61570..19b4049 100644
--- a/src/gpu/ccpr/GrCCPRCoverageOpsBuilder.cpp
+++ b/src/gpu/ccpr/GrCCPRCoverageOpsBuilder.cpp
@@ -88,7 +88,7 @@
         case SkPath::kClose_Verb:
         case SkPath::kDone_Verb:
         default:
-            SkFAIL("Path verb does not have an endpoint.");
+            SK_ABORT("Path verb does not have an endpoint.");
             return 0;
         case SkPath::kMove_Verb:
         case SkPath::kLine_Verb:
@@ -203,9 +203,9 @@
                 continue;
             case SkPath::kConic_Verb:
                 SkASSERT(currFanPts > 0);
-                SkFAIL("Conics are not supported.");
+                SK_ABORT("Conics are not supported.");
             default:
-                SkFAIL("Unexpected path verb.");
+                SK_ABORT("Unexpected path verb.");
         }
     }
 
@@ -254,9 +254,9 @@
                               m.transform(pts[ptsIdx + 2]));
                 break;
             case SkPath::kConic_Verb:
-                SkFAIL("Conics are not supported.");
+                SK_ABORT("Conics are not supported.");
             default:
-                SkFAIL("Unexpected path verb.");
+                SK_ABORT("Unexpected path verb.");
         }
 
         ptsIdx += num_pts(verb);

src/gpu/ccpr/GrCCPRCoverageProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
index 05a3242..e4e59ff 100644
--- a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
@@ -39,7 +39,7 @@
         case Mode::kLoopBorders:
             return "GrCCPRCubicBorderProcessor (loop)";
     }
-    SkFAIL("Unexpected ccpr coverage processor mode.");
+    SK_ABORT("Unexpected ccpr coverage processor mode.");
     return nullptr;
 }
 
@@ -85,7 +85,7 @@
         case Mode::kLoopBorders:
             return new GrCCPRCubicBorderProcessor(GrCCPRCubicProcessor::Type::kLoop);
     }
-    SkFAIL("Unexpected ccpr coverage processor mode.");
+    SK_ABORT("Unexpected ccpr coverage processor mode.");
     return nullptr;
 }
 

src/gpu/ccpr/GrCCPRCoverageProcessor.h

diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.h b/src/gpu/ccpr/GrCCPRCoverageProcessor.h
index c9198d3..198956a 100644
--- a/src/gpu/ccpr/GrCCPRCoverageProcessor.h
+++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.h
@@ -182,7 +182,7 @@
     // TODO: subclasses might have good spots to stuff the winding information without burning a
     // whole new varying slot. Consider requiring them to generate the correct coverage sign.
     virtual void emitShaderCoverage(GrGLSLFragmentBuilder*, const char* outputCoverage) const {
-        SkFAIL("Shader coverage not implemented when using CoverageType::kShader.");
+        SK_ABORT("Shader coverage not implemented when using CoverageType::kShader.");
     }
 
     // Emits one wedge of the conservative raster hull of a convex polygon. The complete hull has