remove bogus nearlyzero checks

Review URL: https://codereview.appspot.com/6213060

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

diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 2fdda4fae0b3a138439b8c071840d4129646a99d..196b4014953a2977bb0bc4b6ffc114396dd5ea06 100644 (file)
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -10,7 +10,8 @@
 #include "SkPaint.h"
 #include "SkDashPathEffect.h"
 
-static void drawline(SkCanvas* canvas, int on, int off, const SkPaint& paint) {
+static void drawline(SkCanvas* canvas, int on, int off, const SkPaint& paint,
+                     SkScalar finalX = SkIntToScalar(600)) {
     SkPaint p(paint);
 
     const SkScalar intervals[] = {
@@ -19,7 +20,16 @@ static void drawline(SkCanvas* canvas, int on, int off, const SkPaint& paint) {
     };
 
     p.setPathEffect(new SkDashPathEffect(intervals, 2, 0))->unref();
-    canvas->drawLine(0, 0, SkIntToScalar(600), 0, p);
+    canvas->drawLine(0, 0, finalX, 0, p);
+}
+
+// earlier bug stopped us from drawing very long single-segment dashes, because
+// SkPathMeasure was skipping very small delta-T values (nearlyzero). This is
+// now fixes, so this giant dash should appear.
+static void show_giant_dash(SkCanvas* canvas) {
+    SkPaint paint;
+
+    drawline(canvas, 1, 1, paint, SkIntToScalar(20 * 1000));
 }
 
 class DashingGM : public skiagm::GM {
@@ -64,6 +74,8 @@ protected:
                 }
             }
         }
+        
+        show_giant_dash(canvas);
     }
 };
 

diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp
index 887c0c18fbb6093141410e2a1c574676081daf85..b591aacb94373f0e8cbb4a9168dc26b2cc9697f4 100644 (file)
--- a/src/core/SkPathMeasure.cpp
+++ b/src/core/SkPathMeasure.cpp
@@ -96,10 +96,6 @@ SkScalar SkPathMeasure::compute_quad_segs(const SkPoint pts[3],
         distance = this->compute_quad_segs(&tmp[2], distance, halft, maxt, ptIndex);
     } else {
         SkScalar d = SkPoint::Distance(pts[0], pts[2]);
-        SkASSERT(d >= 0);
-        if (SkScalarNearlyZero(d)) {
-            d = 0;
-        }
         SkScalar prevD = distance;
         distance += d;
         if (distance > prevD) {
@@ -124,10 +120,6 @@ SkScalar SkPathMeasure::compute_cubic_segs(const SkPoint pts[4],
         distance = this->compute_cubic_segs(&tmp[3], distance, halft, maxt, ptIndex);
     } else {
         SkScalar d = SkPoint::Distance(pts[0], pts[3]);
-        SkASSERT(d >= 0);
-        if (SkScalarNearlyZero(d)) {
-            d = 0;
-        }
         SkScalar prevD = distance;
         distance += d;
         if (distance > prevD) {
@@ -283,8 +275,8 @@ static void seg_to(const SkPoint pts[], int segType,
     SkASSERT(stopT >= 0 && stopT <= SK_Scalar1);
     SkASSERT(startT <= stopT);
 
-    if (SkScalarNearlyZero(stopT - startT)) {
-        return;
+    if (startT == stopT) {
+        return; // should we report this, to undo a moveTo?
     }
 
     SkPoint         tmp0[7], tmp1[7];