Stopped skipping tests in dm of SkPatch

gm/patch.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 43 matching lines @@
 
     copy.setColor(SK_ColorYELLOW);
     canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, left+1, copy);
 
     copy.setColor(SK_ColorGREEN);
     canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, right+1, copy);
 }
 
 static void draw_random_patch(SkPoint points[12], SkColor colors[4], SkCanvas* canvas,
                               SkPaint& paint, SkRandom* rnd) {
     SkPoint ptsCpy[12];

[mtklein, 2014/08/04 20:40:47]

Seems like we still have many 12's and 4's.  It's pretty hard to understand code
that says kNumCtrlPts some places and 12 others.

Personally I don't mind which way it ends up --- all 12's or all kNumCtrlPts ---
but let's make it consistent everywhere in the codebase.

[dandov, 2014/08/04 21:47:54]

I think I fixed all of the 12's and 4's that are related with the number of
points or colors in a patch. 

-    memcpy(ptsCpy, points, 12 * sizeof(SkPoint));
+    memcpy(ptsCpy, points, SkPatch::kNumCtrlPts * sizeof(SkPoint));
     for (int i = 0; i < 5; i++) {
         int index = rnd->nextRangeU(0, 11);
         SkScalar dx = rnd->nextRangeScalar(-50, 50), dy = rnd->nextRangeScalar(-50, 50);
         ptsCpy[index].offset(dx, dy);
     }
     SkPatch patch(ptsCpy, colors);
     canvas->drawPatch(patch, paint);
     draw_control_points(canvas, patch, paint);
 }
 
@@ skipping 11 matching lines @@
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("patch_primitive");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(800, 800);
     }
 
     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] = {
             SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorCYAN
         };
         SkPoint points[12] = {
             {50,50},{75,20},{125,80}, {150,50},
@@ skipping 27 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM(return SkNEW(SkPatchGM); )
 
 }
 
 #endif