fix minor skp-found bugs

remove globals from pathops_unittest

BUG=skia:2460
TBR=mtklein

Author: caryclark@google.com

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

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

1 files changed, 51 insertions, 2 deletions

diff --git a/tools/pathops_sorter.htm b/tools/pathops_sorter.htm
index 216d35b46c..59ae2b6d90 100644
--- a/tools/pathops_sorter.htm
+++ b/tools/pathops_sorter.htm
@@ -826,11 +826,60 @@ op intersect
 {{{1000, 13}, {999.969971f, 37.0299988f}}}
 </div>
 
+<div id="skpwww_maturesupertube_com_21">
+    {{{{3.87867975f, 11831.8789f}, {4.7573595f, 11831}, {6, 11831}}},
+     {{{2, 11830}, {4.5f, 11832.5f}}}},
+</div>
+
+<div id="loop1">
+{{1, 4, 2, 6, 0, 5, 4.5f, 4.33333302f
+{{2, 6, 0, 5, 4.5f, 4.33333302f, 1, 4
+{{{3, 5}, {2.33333325f, 4.33333349f}, {3.83333325f, 3.83333349f}, {2, 4}}}
+{{{2, 4}, {3, 5}, {2.33333325f, 4.33333349f}, {3.83333325f, 3.83333349f}}}
+</div>
+
+<div id="serp1">
+{{{0.55431359440952721, 2.1086271888190544}, {0.1588954256872922, 2.3078315988141811}, {0.57446808656344528, 2.1489361731268914}, {0, 1}}}
+{{{0.55431359440952721, 2.1086271888190544}, {0.1588954256872922, 2.3078315988141811}, {0.57446808656344528, 2.1489361731268914}, {0, 1}}}
+</div>
+<div id="serp2">
+{{{4.0946656649135988, 3.283996994740797}, {4.1983471074380168, 2.1074380165289259}, {4.5454545454545459, 1.3636363636363635}, {4, 3}}}
+{{{4.0946656649135988, 3.283996994740797}, {4.1983471074380168, 2.1074380165289259}, {4.5454545454545459, 1.3636363636363635}, {4, 3}}}
+</div>
+<div id="serp3">
+{{{2.2015477442471254, 1.1371488033013577}, {2.3167674423028526, 0.68323255769714741}, {2.4076432497431028, 0.59235675025689716}, {2, 1}}}
+{{{2.2015477442471254, 1.1371488033013577}, {2.3167674423028526, 0.68323255769714741}, {2.4076432497431028, 0.59235675025689716}, {2, 1}}}
+</div>
+
+<div id="skpwww_seopack_blogspot_com_2153">
+{{{924, 245.472672f}, {1143, 247}}}
+{{{1000, 246}, {927.340759f, 245.505722f}}}
+{{{999.892212f, 246}, {927.340759f, 245.505722f}}}
+</div>
+
+<div id="self1">
+{{{2, 3}, {0, 4}, {3, 2}, {5, 3}}}
+{{{2, 3}, {0, 4}, {3, 2}, {5, 3}}}
+</div>
+
+<div id="skpwww_pindosiya_com_99">
+{{{901.0869140625, 547}, {899, 556}}}
+{{{900.0235595703125, 551.60284423828125}, {900.06072998046875, 551.29705810546875}, {900.15655517578125, 551.0157470703125}}}
+</div>
+
 </div>
 
 <script type="text/javascript">
 
     var testDivs = [
+        skpwww_pindosiya_com_99,
+        self1,
+        skpwww_seopack_blogspot_com_2153,
+        serp1,
+        serp2,
+        serp3,
+        loop1,
+        skpwww_maturesupertube_com_21,
         skpwww_cityads_ru_249,
         skpelpais_com_18,
         testQuads60_b,
@@ -1492,7 +1541,7 @@ function dxy_at_t(curve, t) {
         for (var curves in test) {
             var curve = test[curves];
             if (curve.length == 6 || curve.length == 8) {
-                var opp = curves == 1 ? 0 : 1;
+                var opp = curves == 0 || curves == 1 ? 0 : 1;
                 var sects = ray_curve_intersect(origin, hullEnds[opp], curve);
                 intersect.push(sects);
                 if (sects.length > 1) {
@@ -1515,7 +1564,7 @@ function dxy_at_t(curve, t) {
                 }
             }
         }
-        var midLeft = crossPt(origin, midSpokes[0], midSpokes[1]);
+        var midLeft = curves != 0 ? crossPt(origin, midSpokes[0], midSpokes[1]) : 0;
         var firstInside;
         if (useIntersect) {
             var sect1 = intersect[0].length > 1;