Refactor Sk2x<T> + Sk4x<T> into SkNf<N,T> and SkNi<N,T>

src/core/SkGeometry.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 "SkGeometry.h"
 #include "SkMatrix.h"
-#include "Sk2x.h"
+#include "SkNx.h"
 
 static Sk2s from_point(const SkPoint& point) {
     return Sk2s::Load(&point.fX);
 }
 
 static SkPoint to_point(const Sk2s& x) {
     SkPoint point;
     x.store(&point.fX);
     return point;
 }
@@ skipping 162 matching lines @@
     return v0 + (v1 - v0) * t;
 }
 
 void SkChopQuadAt(const SkPoint src[3], SkPoint dst[5], SkScalar t) {
     SkASSERT(t > 0 && t < SK_Scalar1);
 
     Sk2s p0 = from_point(src[0]);
     Sk2s p1 = from_point(src[1]);
     Sk2s p2 = from_point(src[2]);
     Sk2s tt(t);
-    
+
     Sk2s p01 = interp(p0, p1, tt);
     Sk2s p12 = interp(p1, p2, tt);
 
     dst[0] = to_point(p0);
     dst[1] = to_point(p01);
     dst[2] = to_point(interp(p01, p12, tt));
     dst[3] = to_point(p12);
     dst[4] = to_point(p2);
 }
 
@@ skipping 231 matching lines @@
     Sk2s    p2 = from_point(src[2]);
     Sk2s    p3 = from_point(src[3]);
     Sk2s    tt(t);
 
     Sk2s    ab = interp(p0, p1, tt);
     Sk2s    bc = interp(p1, p2, tt);
     Sk2s    cd = interp(p2, p3, tt);
     Sk2s    abc = interp(ab, bc, tt);
     Sk2s    bcd = interp(bc, cd, tt);
     Sk2s    abcd = interp(abc, bcd, tt);
-    
+
     dst[0] = src[0];
     dst[1] = to_point(ab);
     dst[2] = to_point(abc);
     dst[3] = to_point(abcd);
     dst[4] = to_point(bcd);
     dst[5] = to_point(cd);
     dst[6] = src[3];
 }
 
 /*  http://code.google.com/p/skia/issues/detail?id=32
@@ skipping 1078 matching lines @@
         matrix.preScale(SK_Scalar1, -SK_Scalar1);
     }
     if (userMatrix) {
         matrix.postConcat(*userMatrix);
     }
     for (int i = 0; i < conicCount; ++i) {
         matrix.mapPoints(dst[i].fPts, 3);
     }
     return conicCount;
 }