Stopped skipping tests in dm of SkPatch

gm/patch.cpp

Index: gm/patch.cpp
diff --git a/gm/patch.cpp b/gm/patch.cpp
index 5658ef6a889d9d65788a708a7cff44e57259b9d6..2a1d2937ed9fd94837da14b1d076627d7fe80ca0 100644
--- a/gm/patch.cpp
+++ b/gm/patch.cpp
@@ -19,13 +19,13 @@
 static void draw_control_points(SkCanvas* canvas, SkPatch& patch, SkPaint& paint) {
     //draw control points
     SkPaint copy(paint);

[robertphillips, 2014/08/05 12:44:45]

This is a bit odd. I would expect this to be kNumPtsCubic rather then
kNumColors.

[dandov, 2014/08/05 14:27:11]

Done.

-    SkPoint bottom[4];
+    SkPoint bottom[SkPatch::kNumColors];
     patch.getBottomPoints(bottom);
-    SkPoint top[4];
+    SkPoint top[SkPatch::kNumColors];
     patch.getTopPoints(top);
-    SkPoint left[4];
+    SkPoint left[SkPatch::kNumColors];
     patch.getLeftPoints(left);
-    SkPoint right[4];
+    SkPoint right[SkPatch::kNumColors];
     patch.getRightPoints(right);
 
     copy.setColor(SK_ColorBLACK);
@@ -59,10 +59,11 @@ static void draw_control_points(SkCanvas* canvas, SkPatch& patch, SkPaint& paint
     canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, right+1, copy);
 }
 

[robertphillips, 2014/08/05 12:44:45]

// Randomly alter 5 of the control points of the provided set and then draw the
result ?
Make points, colors and paint all const parameters ?

[dandov, 2014/08/05 14:27:11]

Made them all constant and removed function draw_random_patch.

-static void draw_random_patch(SkPoint points[12], SkColor colors[4], SkCanvas* canvas,
-                              SkPaint& paint, SkRandom* rnd) {
-    SkPoint ptsCpy[12];
-    memcpy(ptsCpy, points, 12 * sizeof(SkPoint));
+static void draw_random_patch(SkPoint points[SkPatch::kNumCtrlPts],
+                              SkColor colors[SkPatch::kNumColors], SkCanvas* canvas, SkPaint& paint,
+                              SkRandom* rnd) {
+    SkPoint ptsCpy[SkPatch::kNumCtrlPts];
+    memcpy(ptsCpy, points, SkPatch::kNumCtrlPts * sizeof(SkPoint));
     for (int i = 0; i < 5; i++) {
         int index = rnd->nextRangeU(0, 11);

[robertphillips, 2014/08/05 12:44:44]

Move dy to its own line ?

[dandov, 2014/08/05 14:27:11]

Done.

         SkScalar dx = rnd->nextRangeScalar(-50, 50), dy = rnd->nextRangeScalar(-50, 50);
@@ -94,16 +95,16 @@ protected:
     }
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag | kSkipPipe_Flag | kSkipPicture_Flag;
+        return kSkipTiled_Flag;
     }
     
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         
         SkPaint paint;
-        SkColor colors[4] = {
+        SkColor colors[SkPatch::kNumColors] = {
             SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorCYAN
         };

[robertphillips, 2014/08/05 12:44:45]

// Order is clockwise starting at the UL corner

[dandov, 2014/08/05 14:27:10]

Done.

-        SkPoint points[12] = {
+        SkPoint points[SkPatch::kNumCtrlPts] = {

[robertphillips, 2014/08/05 12:44:45]

Label this with "// top" on RHS ?

[dandov, 2014/08/05 14:27:11]

Done.

             {50,50},{75,20},{125,80}, {150,50},
             {120,75},{180,125},{150,150},

[robertphillips, 2014/08/05 12:44:45]

Move the "{150,150}" down to the next line and label with "// bottom" ?

[dandov, 2014/08/05 14:27:11]

Done.

             {125,120},{75,180},{50,150},

[robertphillips, 2014/08/05 12:44:45]

Label this with "// left" on RHS ?

[dandov, 2014/08/05 14:27:11]

Done.