Revert of fix the error that path is inversed for stroke and strokeAndFill styles...

R=bsalomon@google.com, reed@google.com, yunchao.he@intel.com
TBR=reed@google.com
NOTRY=True

Reason for revert:
broke unittests

Original issue's description:
> fix the error that path is inversed for stroke and strokeAndFill styles.
>
> However, because hairline stroke + fill = fill (see src/core/SkStrokeRec.cpp), strokeAndFill will be thought as fill style when paint.getStrokeWidth() <= 0, this edge case can be inverse-filled.
>
> BUG=skia:2222
>
> Committed: http://code.google.com/p/skia/source/detail?r=14561

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14562 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index d059490eddbd8a8c264dc163ffee28a024d81c0c..8a4dcc97e129a5b93c0e91ee077a30f975328915 100644 (file)
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -37,16 +37,3 @@
 # This change removes an API that this GM was testing. If/when it lands and sticks,
 # I will likely just delete the GM.
 canvas-layer-state
-
-# yunchao: https://codereview.chromium.org/183683010/
-# This change fixed the error that path is inversed for Stroke and StrokeAndFill
-# styles. These GM cases need to be rebaselined:
-inverse_paths
-degeneratesegments
-quadclosepath
-quadpath
-lineclosepath
-linepath
-cubicclosepath
-cubicpath
-emptypath

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 34559795e4c81f9f16532cc600172908f6a285d6..6c0fc884e1a53472f3a3681df8537c69dc283c6a 100644 (file)
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2076,7 +2076,7 @@ void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
 
     const SkRect& r = path.getBounds();
     if (r.width() <= 0 && r.height() <= 0) {
-        if (path.isInverseFillType() && SkPaint::kFill_Style == paint.getStyle()) {
+        if (path.isInverseFillType()) {
             this->internalDrawPaint(paint);
         }
         return;

diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index ee2e1125ea2003603cd8e95073d5e0c963e7e2dd..c4f5f74eefb93ea0ca539e28b079d4e4125c4149 100644 (file)
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1119,13 +1119,6 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
 
     SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, *paint, drawCoverage);
 
-    // make sure the path will not be inverse-stroked. hairlineStroke + fill = fill,
-    // they can be inverse-filled.
-    if (devPathPtr->isInverseFillType() && (SkPaint::kStroke_Style == paint->getStyle() ||
-            (SkPaint::kStrokeAndFill_Style == paint->getStyle() && paint->getStrokeWidth() > 0))) {
-        devPathPtr->toggleInverseFillType();
-    }
-
     if (paint->getMaskFilter()) {
         SkPaint::Style style = doFill ? SkPaint::kFill_Style :
             SkPaint::kStroke_Style;

diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index 7d8d707752e942982ce51f01af4e7eebe256249b..b138c326bab497c96429ed1d111ff57954c8ab0d 100644 (file)
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -562,9 +562,8 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
         SkPath::Direction dir;
         if (src.isRect(&isClosed, &dir) && isClosed) {
             this->strokeRect(src.getBounds(), dst, dir);
-            // our answer should preserve the inverseness of the src, but the
-            // rect should not be inverse-stroked.
-            if (src.isInverseFillType() && fWidth < 0) {
+            // our answer should preserve the inverseness of the src
+            if (src.isInverseFillType()) {
                 SkASSERT(!dst->isInverseFillType());
                 dst->toggleInverseFillType();
             }
@@ -647,9 +646,8 @@ DONE:
 #endif
     }
 
-    // our answer should preserve the inverseness of the src, but the path
-    // should not be inverse-stroked.
-    if (src.isInverseFillType() && fWidth < 0) {
+    // our answer should preserve the inverseness of the src
+    if (src.isInverseFillType()) {
         SkASSERT(!dst->isInverseFillType());
         dst->toggleInverseFillType();
     }

diff --git a/src/gpu/GrStencilAndCoverPathRenderer.cpp b/src/gpu/GrStencilAndCoverPathRenderer.cpp
index ad6192ae3b11068d38491be30b80e4cfeecac67c..273c01b8618cec3cfdd4c47aade162c035785d2c 100644 (file)
--- a/src/gpu/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/GrStencilAndCoverPathRenderer.cpp
@@ -71,7 +71,7 @@ bool GrStencilAndCoverPathRenderer::onDrawPath(const SkPath& path,
 
     SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
 
-    if (path.isInverseFillType() && SkStrokeRec::kFill_Style == stroke.getStyle()) {
+    if (path.isInverseFillType()) {
         GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
             kZero_StencilOp,
             kZero_StencilOp,