commit d1ab9320b09b922bd2f3b3d4f888c754fde5b58c
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 10 18:40:03 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 10 18:40:03 2012 +0000
tree 211edc69f0a303c94e33c833a6d87ef7fc222d9c
parent df6bcb14126853b16bcca75401644cef6055d200

restore (debugged) cheapComputeDirection



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

src/core/SkPath.cpp

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 960d2ab..50c7c59 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -1856,6 +1856,7 @@
     const uint8_t* fCurrVerb;
     const uint8_t* fStopVerbs;
     bool fDone;
+    SkDEBUGCODE(int fContourCounter;)
 };
 
 ContourIter::ContourIter(const SkTDArray<uint8_t>& verbs,
@@ -1866,6 +1867,7 @@
     fCurrPt = pts.begin();
     fCurrVerb = verbs.begin();
     fCurrPtCount = 0;
+    SkDEBUGCODE(fContourCounter = 0;)
     this->next();
 }
 
@@ -1887,11 +1889,6 @@
     for (++verbs; verbs < fStopVerbs; ++verbs) {
         switch (*verbs) {
             case SkPath::kMove_Verb:
-                if (ptCount > 1) {
-                    // back up to revisit this Move next time arround, unless
-                    // the prev verb was also Move, which we know if ptCount==1
-                    verbs -= 1;
-                }
                 goto CONTOUR_END;
             case SkPath::kLine_Verb:
                 ptCount += 1;
@@ -1909,6 +1906,7 @@
 CONTOUR_END:
     fCurrPtCount = ptCount;
     fCurrVerb = verbs;
+    SkDEBUGCODE(++fContourCounter;)
 }
 
 static SkScalar cross_prod(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2) {

src/core/SkStroke.cpp

diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index a7452be..1ec3a57 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -619,15 +619,11 @@
 #endif
 
     if (fDoFill) {
-#if 0 // while I debug this
         if (src.cheapIsDirection(SkPath::kCW_Direction)) {
             dst->reverseAddPath(src);
         } else {
             dst->addPath(src);
         }
-#else
-        dst->addPath(src);
-#endif
     } else {
         //  Seems like we can assume that a 2-point src would always result in
         //  a convex stroke, but testing has proved otherwise.