fix end-point and conic bugs in cornerpatheffect

src/effects/SkCornerPathEffect.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCornerPathEffect.h"
@@ skipping 76 matching lines @@
             case SkPath::kQuad_Verb:
                 // TBD - just replicate the curve for now
                 if (!prevIsValid) {
                     dst->moveTo(pts[0]);
                     prevIsValid = true;
                 }
                 dst->quadTo(pts[1], pts[2]);
                 lastCorner = pts[2];
                 firstStep.set(0, 0);
                 break;
+            case SkPath::kConic_Verb:
+                // TBD - just replicate the curve for now
+                if (!prevIsValid) {
+                    dst->moveTo(pts[0]);
+                    prevIsValid = true;
+                }
+                dst->conicTo(pts[1], pts[2], iter.conicWeight());
+                lastCorner = pts[2];
+                firstStep.set(0, 0);
+                break;
             case SkPath::kCubic_Verb:
                 if (!prevIsValid) {
                     dst->moveTo(pts[0]);
                     prevIsValid = true;
                 }
                 // TBD - just replicate the curve for now
                 dst->cubicTo(pts[1], pts[2], pts[3]);
                 lastCorner = pts[3];
                 firstStep.set(0, 0);
                 break;
             case SkPath::kClose_Verb:
                 if (firstStep.fX || firstStep.fY) {
                     dst->quadTo(lastCorner.fX, lastCorner.fY,
                                 lastCorner.fX + firstStep.fX,
                                 lastCorner.fY + firstStep.fY);
                     }
                 dst->close();
-                break;
-            case SkPath::kConic_Verb:
-                SkASSERT(0);
+                prevIsValid = false;
                 break;
             case SkPath::kDone_Verb:
+                if (prevIsValid) {
+                    dst->lineTo(lastCorner);
+                }
                 goto DONE;
         }
 
         if (SkPath::kMove_Verb == prevVerb) {
             firstStep = step;
         }
         prevVerb = verb;
     }
 DONE:
     return true;
 }
 
 SkFlattenable* SkCornerPathEffect::CreateProc(SkReadBuffer& buffer) {
     return SkCornerPathEffect::Create(buffer.readScalar());
 }
 
 void SkCornerPathEffect::flatten(SkWriteBuffer& buffer) const {
     buffer.writeScalar(fRadius);
 }