use new faster/vector impl for chopping conics

bench/PathBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 788 matching lines @@
     bool                fParity;
     SkTDArray<SkRect>   fQueryRects;
 
     typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkGeometry.h"
 
-class ConicBench_Chop5 : public Benchmark {
-    SkConic fRQ;
+class ConicBench_Chop : public Benchmark {
+protected:
+    SkConic fRQ, fDst[2];
+    SkString fName;
 public:
-    ConicBench_Chop5()  {
+    ConicBench_Chop() : fName("conic-chop") {
         fRQ.fPts[0].set(0, 0);
         fRQ.fPts[1].set(100, 0);
         fRQ.fPts[2].set(100, 100);
         fRQ.fW = SkScalarCos(SK_ScalarPI/4);
     }
 
-private:
-    const char* onGetName() override {
-        return "ratquad-chop-0.5";
-    }
-
-    void onDraw(const int loops, SkCanvas*) override {
-        SkConic dst[2];
-        for (int i = 0; i < loops; ++i) {
-            fRQ.chopAt(0.5f, dst);
-        }
-    }
-
-    typedef Benchmark INHERITED;
-};
-
-class ConicBench_ChopHalf : public Benchmark {
-protected:
-    SkConic fRQ, fDst[2];
-    SkString fName;
-    const bool fUseV2;
-public:
-    ConicBench_ChopHalf(bool useV2) : fUseV2(useV2) {
-        fRQ.fPts[0].set(0, 0);
-        fRQ.fPts[1].set(100, 0);
-        fRQ.fPts[2].set(100, 100);
-        fRQ.fW = SkScalarCos(SK_ScalarPI/4);
-
-        fName.printf("conic-chop-half%d", useV2);
-    }
-
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
 private:
     const char* onGetName() override { return fName.c_str(); }
 
     void onDraw(const int loops, SkCanvas*) override {
-        if (fUseV2) {
-            for (int i = 0; i < loops; ++i) {
-                fRQ.chop2(fDst);
-            }
-        } else {
-            for (int i = 0; i < loops; ++i) {
-                fRQ.chop(fDst);
-            }
+        for (int i = 0; i < loops; ++i) {
+            fRQ.chop(fDst);
         }
     }
 
     typedef Benchmark INHERITED;
 };
-DEF_BENCH( return new ConicBench_ChopHalf(false); )
-DEF_BENCH( return new ConicBench_ChopHalf(true); )
+DEF_BENCH( return new ConicBench_Chop; )
 
-class ConicBench_EvalPos : public ConicBench_ChopHalf {
+class ConicBench_EvalPos : public ConicBench_Chop {
+    const bool fUseV2;
 public:
-    ConicBench_EvalPos(bool useV2) : ConicBench_ChopHalf(useV2) {
+    ConicBench_EvalPos(bool useV2) : fUseV2(useV2) {
         fName.printf("conic-eval-pos%d", useV2);
     }
     void onDraw(const int loops, SkCanvas*) override {
         if (fUseV2) {
             for (int i = 0; i < loops; ++i) {
                 for (int j = 0; j < 1000; ++j) {
                     fDst[0].fPts[0] = fRQ.evalAt(0.4f);
                 }
             }
         } else {
             for (int i = 0; i < loops; ++i) {
                 for (int j = 0; j < 1000; ++j) {
                     fRQ.evalAt(0.4f, &fDst[0].fPts[0], NULL);
                 }
             }
         }
     }
 };
 DEF_BENCH( return new ConicBench_EvalPos(false); )
 DEF_BENCH( return new ConicBench_EvalPos(true); )
 
-class ConicBench_EvalTan : public ConicBench_ChopHalf {
+class ConicBench_EvalTan : public ConicBench_Chop {
+    const bool fUseV2;
 public:
-    ConicBench_EvalTan(bool useV2) : ConicBench_ChopHalf(useV2) {
+    ConicBench_EvalTan(bool useV2) : fUseV2(useV2) {
         fName.printf("conic-eval-tan%d", useV2);
     }
     void onDraw(const int loops, SkCanvas*) override {
         if (fUseV2) {
             for (int i = 0; i < loops; ++i) {
                 for (int j = 0; j < 1000; ++j) {
                     fDst[0].fPts[0] = fRQ.evalTangentAt(0.4f);
                 }
             }
         } else {
@@ skipping 165 matching lines @@
 DEF_BENCH( return new ConservativelyContainsBench(ConservativelyContainsBench::kOval_Type); )
 
 
 // These seem to be optimized away, which is troublesome for timing.
 /*
 DEF_BENCH( return new ConicBench_Chop5() )
 DEF_BENCH( return new ConicBench_ComputeError() )
 DEF_BENCH( return new ConicBench_asQuadTol() )
 DEF_BENCH( return new ConicBench_quadPow2() )
 */