rename overloaded methods as speculative fix/diagnostic

Bug:783136
Change-Id: I95df299bd9e1c6263b8e79b23fbe90340bd950e9
Reviewed-on: https://skia-review.googlesource.com/72240
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/core/SkRasterClip.cpp b/src/core/SkRasterClip.cpp
index b2b0bdcd0b..7738f1a08f 100644
--- a/src/core/SkRasterClip.cpp
+++ b/src/core/SkRasterClip.cpp
@@ -56,12 +56,12 @@ static MutateResult mutate_conservative_op(SkRegion::Op* op, bool inverseFilled)
                 return kContinue_MutateResult;
         }
     }
-    SK_ABORT("should not get here");
+    SkASSERT(false);    // unknown op
     return kDoNothing_MutateResult;
 }
 
-void SkConservativeClip::op(const SkRect& localRect, const SkMatrix& ctm, const SkIRect& devBounds,
-                            SkRegion::Op op, bool doAA) {
+void SkConservativeClip::opRect(const SkRect& localRect, const SkMatrix& ctm,
+                                const SkIRect& devBounds, SkRegion::Op op, bool doAA) {
     SkIRect ir;
     switch (mutate_conservative_op(&op, false)) {
         case kDoNothing_MutateResult:
@@ -75,16 +75,16 @@ void SkConservativeClip::op(const SkRect& localRect, const SkMatrix& ctm, const
             ir = doAA ? devRect.roundOut() : devRect.round();
         } break;
     }
-    this->op(ir, op);
+    this->opIRect(ir, op);
 }
 
-void SkConservativeClip::op(const SkRRect& rrect, const SkMatrix& ctm, const SkIRect& devBounds,
-                            SkRegion::Op op, bool doAA) {
-    this->op(rrect.getBounds(), ctm, devBounds, op, doAA);
+void SkConservativeClip::opRRect(const SkRRect& rrect, const SkMatrix& ctm,
+                                 const SkIRect& devBounds, SkRegion::Op op, bool doAA) {
+    this->opRect(rrect.getBounds(), ctm, devBounds, op, doAA);
 }
 
-void SkConservativeClip::op(const SkPath& path, const SkMatrix& ctm, const SkIRect& devBounds,
-                            SkRegion::Op op, bool doAA) {
+void SkConservativeClip::opPath(const SkPath& path, const SkMatrix& ctm, const SkIRect& devBounds,
+                                SkRegion::Op op, bool doAA) {
     SkIRect ir;
     switch (mutate_conservative_op(&op, path.isInverseFillType())) {
         case kDoNothing_MutateResult:
@@ -99,14 +99,14 @@ void SkConservativeClip::op(const SkPath& path, const SkMatrix& ctm, const SkIRe
             break;
         }
     }
-    return this->op(ir, op);
+    return this->opIRect(ir, op);
 }
 
-void SkConservativeClip::op(const SkRegion& rgn, SkRegion::Op op) {
-    this->op(rgn.getBounds(), op);
+void SkConservativeClip::opRegion(const SkRegion& rgn, SkRegion::Op op) {
+    this->opIRect(rgn.getBounds(), op);
 }
 
-void SkConservativeClip::op(const SkIRect& devRect, SkRegion::Op op) {
+void SkConservativeClip::opIRect(const SkIRect& devRect, SkRegion::Op op) {
     if (SkRegion::kIntersect_Op == op) {
         if (!fBounds.intersect(devRect)) {
             fBounds.setEmpty();