Revert of enable conics gm

src/pdf/SkPDFUtils.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 "SkData.h"
@@ skipping 77 matching lines @@
         SkPDFScalar::Append(ctl2Y, content);
         content->writeText(" ");
     }
     SkPDFScalar::Append(dstX, content);
     content->writeText(" ");
     SkPDFScalar::Append(dstY, content);
     content->writeText(" ");
     content->writeText(cmd.c_str());
 }
 
-static void append_quad(const SkPoint quad[], SkWStream* content) {
-    SkPoint cubic[4];
-    SkConvertQuadToCubic(quad, cubic);
-    SkPDFUtils::AppendCubic(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
-                            cubic[3].fX, cubic[3].fY, content);
-}
-
 // static
 void SkPDFUtils::AppendRectangle(const SkRect& rect, SkWStream* content) {
     // Skia has 0,0 at top left, pdf at bottom left.  Do the right thing.
     SkScalar bottom = SkMinScalar(rect.fBottom, rect.fTop);
 
     SkPDFScalar::Append(rect.fLeft, content);
     content->writeText(" ");
     SkPDFScalar::Append(bottom, content);
     content->writeText(" ");
     SkPDFScalar::Append(rect.width(), content);
@@ skipping 15 matching lines @@
         kNonSingleLine_SkipFillState = 2,
     };
     SkipFillState fillState = kEmpty_SkipFillState;
     if (paintStyle != SkPaint::kFill_Style) {
         fillState = kNonSingleLine_SkipFillState;
     }
     SkPoint lastMovePt = SkPoint::Make(0,0);
     SkDynamicMemoryWStream currentSegment;
     SkPoint args[4];
     SkPath::Iter iter(path, false);
-    for (SkPath::Verb verb = iter.next(args); verb != SkPath::kDone_Verb; verb = iter.next(args)) {
+    for (SkPath::Verb verb = iter.next(args);
+         verb != SkPath::kDone_Verb;
+         verb = iter.next(args)) {
         // args gets all the points, even the implicit first point.
         switch (verb) {
             case SkPath::kMove_Verb:
                 MoveTo(args[0].fX, args[0].fY, &currentSegment);
                 lastMovePt = args[0];
                 fillState = kEmpty_SkipFillState;
                 break;
             case SkPath::kLine_Verb:
                 AppendLine(args[1].fX, args[1].fY, &currentSegment);
                 if (fillState == kEmpty_SkipFillState) {
                    if (args[0] != lastMovePt) {
                        fillState = kSingleLine_SkipFillState;
                    }
                 } else if (fillState == kSingleLine_SkipFillState) {
                     fillState = kNonSingleLine_SkipFillState;
                 }
                 break;
-            case SkPath::kQuad_Verb:
-                append_quad(args, &currentSegment);
+            case SkPath::kQuad_Verb: {
+                SkPoint cubic[4];
+                SkConvertQuadToCubic(args, cubic);
+                AppendCubic(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
+                            cubic[3].fX, cubic[3].fY, &currentSegment);
                 fillState = kNonSingleLine_SkipFillState;
                 break;
-            case SkPath::kConic_Verb: {
-                const SkScalar tol = SK_Scalar1 / 4;
-                SkAutoConicToQuads converter;
-                const SkPoint* quads = converter.computeQuads(args, iter.conicWeight(), tol);
-                for (int i = 0; i < converter.countQuads(); ++i) {
-                    append_quad(&quads[i * 2], &currentSegment);
-                }
-            } break;
+            }
             case SkPath::kCubic_Verb:
                 AppendCubic(args[1].fX, args[1].fY, args[2].fX, args[2].fY,
                             args[3].fX, args[3].fY, &currentSegment);
                 fillState = kNonSingleLine_SkipFillState;
                 break;
             case SkPath::kClose_Verb:
                 if (fillState != kSingleLine_SkipFillState) {
                     ClosePath(&currentSegment);
                     SkData* data = currentSegment.copyToData();
                     content->write(data->data(), data->size());
@@ skipping 69 matching lines @@
     // color (SCN, scn)
     SkString resourceName = SkPDFResourceDict::getResourceName(
             SkPDFResourceDict::kPattern_ResourceType,
             objectIndex);
     content->writeText("/Pattern CS/Pattern cs/");
     content->writeText(resourceName.c_str());
     content->writeText(" SCN/");
     content->writeText(resourceName.c_str());
     content->writeText(" scn\n");
 }