commit 872b4c8cef7cfa67fa7a95be15f279d07cc06ff6
author bsalomon <bsalomon@google.com> Thu Sep 29 13:53:49 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Sep 29 13:53:49 2016 -0700
tree ab4ee6edc6d2b9be782e8cddb5d398e5343aad13
parent 95e8d0a4ae3c755fd9ffbd0c276fc657999fecee

Remove soft clip bool from SkCanvas
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2380163002

Review-Url: https://codereview.chromium.org/2380163002

include/core/SkCanvas.h

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 7bf84c9..dc4289d 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -536,14 +536,6 @@
     }
 
     /** EXPERIMENTAL -- only used for testing
-        Set to false to force clips to be hard, even if doAntiAlias=true is
-        passed to clipRect or clipPath.
-     */
-    void setAllowSoftClip(bool allow) {
-        fAllowSoftClip = allow;
-    }
-
-    /** EXPERIMENTAL -- only used for testing
         Set to simplify clip stack using path ops.
      */
     void setAllowSimplifyClip(bool allow) {

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 33d1dee..6a0d5e6 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -653,7 +653,6 @@
     // const-cast.
     *const_cast<bool*>(&fConservativeRasterClip) = SkToBool(flags & kConservativeRasterClip_InitFlag);
 
-    fAllowSoftClip = true;
     fAllowSimplifyClip = false;
     fDeviceCMDirty = true;
     fSaveCount = 1;
@@ -1540,10 +1539,6 @@
 //////////////////////////////////////////////////////////////////////////////
 
 void SkCanvas::clipRect(const SkRect& rect, ClipOp op, bool doAA) {
-    if (!fAllowSoftClip) {
-        doAA = false;
-    }
-
     this->checkForDeferredSave();
     ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
     this->onClipRect(rect, op, edgeStyle);
@@ -1605,9 +1600,6 @@
         AutoValidateClip avc(this);
 
         fDeviceCMDirty = true;
-        if (!fAllowSoftClip) {
-            edgeStyle = kHard_ClipEdgeStyle;
-        }
 
         fClipStack->clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle);
 
@@ -1653,9 +1645,6 @@
     AutoValidateClip avc(this);
 
     fDeviceCMDirty = true;
-    if (!fAllowSoftClip) {
-        edgeStyle = kHard_ClipEdgeStyle;
-    }
 
     SkPath devPath;
     if (fMCRec->fMatrix.isIdentity()) {