commit 4a3ca94322510351f7304af2092d6513442ab9d7
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 04 21:51:06 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 04 21:51:06 2013 +0000
tree d1c2a48a35d0994d4e2e63bf8976185881a71125
parent ecaa59d878942fc87b0daa5171dfcdcb133c84a8

Update debugger for addition of Conic path verb

R=reed@google.com, djsollen@google.com

Author: robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/16224008

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

debugger/SkObjectParser.cpp

diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp
index 2d1f140..7004bf0 100644
--- a/debugger/SkObjectParser.cpp
+++ b/debugger/SkObjectParser.cpp
@@ -138,11 +138,11 @@
     mPath->append("P): ");
 
     static const char* gVerbStrings[] = {
-        "Move", "Line", "Quad", "Cubic", "Close", "Done"
+        "Move", "Line", "Quad", "Conic", "Cubic", "Close", "Done"
     };
-    static const int gPtsPerVerb[] = { 1, 1, 2, 3, 0, 0 };
-    static const int gPtOffsetPerVerb[] = { 0, 1, 1, 1, 0, 0 };
-    SkASSERT(SkPath::kDone_Verb == 5);
+    static const int gPtsPerVerb[] = { 1, 1, 2, 2, 3, 0, 0 };
+    static const int gPtOffsetPerVerb[] = { 0, 1, 1, 1, 1, 0, 0 };
+    SkASSERT(SkPath::kDone_Verb == 6);
 
     SkPath::Iter iter(const_cast<SkPath&>(path), false);
     SkPath::Verb verb;
@@ -160,8 +160,16 @@
             mPath->appendScalar(points[gPtOffsetPerVerb[verb]+i].fX);
             mPath->append(", ");
             mPath->appendScalar(points[gPtOffsetPerVerb[verb]+i].fY);
-            mPath->append(") ");
+            mPath->append(")");
         }
+
+        if (SkPath::kConic_Verb == verb) {
+            mPath->append("(");
+            mPath->appendScalar(iter.conicWeight());
+            mPath->append(")");
+        }
+
+        mPath->append(" ");
     }
 
     SkString* boundStr = SkObjectParser::RectToString(path.getBounds(), "    Bound: ");