Fix gyp files to allow ninja to build 64 bit on Mac.

bench/DashBench.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 "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 305 matching lines @@
 class GiantDashBench : public SkBenchmark {
     SkString fName;
     SkScalar fStrokeWidth;
     SkPoint  fPts[2];
     SkAutoTUnref<SkPathEffect> fPathEffect;
 
 public:
     enum LineType {
         kHori_LineType,
         kVert_LineType,
-        kDiag_LineType
+        kDiag_LineType,
+        kLineTypeCount
     };
 
     static const char* LineTypeName(LineType lt) {
         static const char* gNames[] = { "hori", "vert", "diag" };
-        SkASSERT((size_t)lt <= SK_ARRAY_COUNT(gNames));
+        SK_COMPILE_ASSERT(kLineTypeCount == SK_ARRAY_COUNT(gNames), names_wrong_size);
         return gNames[lt];
     }
 
     GiantDashBench(void* param, LineType lt, SkScalar width) : INHERITED(param) {
         fName.printf("giantdashline_%s_%g", LineTypeName(lt), width);
         fStrokeWidth = width;
 
         // deliberately pick intervals that won't be caught by asPoints(), so
         // we can test the filterPath code-path.
         const SkScalar intervals[] = { 2, 1, 1, 1 };
         fPathEffect.reset(new SkDashPathEffect(intervals,
                                                SK_ARRAY_COUNT(intervals), 0));
 
         SkScalar cx = 640 / 2;  // center X
         SkScalar cy = 480 / 2;  // center Y
         SkMatrix matrix;
 
         switch (lt) {
             case kHori_LineType:
                 matrix.setIdentity();
                 break;
             case kVert_LineType:
                 matrix.setRotate(90, cx, cy);
                 break;
             case kDiag_LineType:
                 matrix.setRotate(45, cx, cy);
                 break;
+            case kLineTypeCount:
+                // Not a real enum value.
+                break;
         }
 
         const SkScalar overshoot = 100*1000;
         const SkPoint pts[2] = {
             { -overshoot, cy }, { 640 + overshoot, cy }
         };
         matrix.mapPoints(fPts, pts, 2);
     }
 
 protected:
@@ skipping 46 matching lines @@
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kHori_LineType, 0); )
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kVert_LineType, 0); )
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kDiag_LineType, 0); )
 
 // pass 2 to explicitly avoid any 1-is-the-same-as-hairline special casing
 
 // hori_2 is just too slow to enable at the moment
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kHori_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kVert_LineType, 2); )
 DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kDiag_LineType, 2); )