Remove overly-promiscuous SkNx syntax sugar.

src/core/SkScan_Hairline.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 "SkScan.h"
 #include "SkBlitter.h"
 #include "SkRasterClip.h"
@@ skipping 215 matching lines @@
     Sk2s dt(SK_Scalar1 / lines);
 
     SkPoint tmp[(1 << kMaxQuadSubdivideLevel) + 1];
     SkASSERT((unsigned)lines < SK_ARRAY_COUNT(tmp));
 
     tmp[0] = pts[0];
     Sk2s A = Sk2s::Load(&coeff[0].fX);
     Sk2s B = Sk2s::Load(&coeff[1].fX);
     Sk2s C = Sk2s::Load(&coeff[2].fX);
     for (int i = 1; i < lines; ++i) {
-        t += dt;
+        t = t + dt;
         ((A * t + B) * t + C).store(&tmp[i].fX);
     }
     tmp[lines] = pts[2];
     lineproc(tmp, lines + 1, clip, blitter);
 }
 
 static inline Sk2s abs(const Sk2s& value) {
-    return Sk2s::Max(value, -value);
+    return Sk2s::Max(value, Sk2s(0)-value);
 }
 
 static inline SkScalar max_component(const Sk2s& value) {
     SkScalar components[2];
     value.store(components);
     return SkTMax(components[0], components[1]);
 }
 
 static inline int compute_cubic_segs(const SkPoint pts[4]) {
     Sk2s p0 = from_point(pts[0]);
@@ skipping 36 matching lines @@
     const int lines = compute_cubic_segs(pts);
     SkASSERT(lines > 0);
     if (1 == lines) {
         SkPoint tmp[2] = { pts[0], pts[3] };
         lineproc(tmp, 2, clip, blitter);
         return;
     }
 
     SkPoint coeff[4];
     SkCubicToCoeff(pts, coeff);
-    
+
     const Sk2s dt(SK_Scalar1 / lines);
     Sk2s t(0);
 
     SkPoint tmp[(1 << kMaxCubicSubdivideLevel) + 1];
     SkASSERT((unsigned)lines < SK_ARRAY_COUNT(tmp));
 
     tmp[0] = pts[0];
     Sk2s A = Sk2s::Load(&coeff[0].fX);
     Sk2s B = Sk2s::Load(&coeff[1].fX);
     Sk2s C = Sk2s::Load(&coeff[2].fX);
     Sk2s D = Sk2s::Load(&coeff[3].fX);
     for (int i = 1; i < lines; ++i) {
-        t += dt;
+        t = t + dt;
         (((A * t + B) * t + C) * t + D).store(&tmp[i].fX);
     }
     tmp[lines] = pts[3];
     lineproc(tmp, lines + 1, clip, blitter);
 }
 
 static inline void haircubic(const SkPoint pts[4], const SkRegion* clip,
                       SkBlitter* blitter, int level, SkScan::HairRgnProc lineproc) {
     if (quick_cubic_niceness_check(pts)) {
         hair_cubic(pts, clip, blitter, lineproc);
@@ skipping 165 matching lines @@
 
         SkAAClipBlitterWrapper wrap;
         if (!clip.quickContains(r.roundOut().makeOutset(1, 1))) {
             wrap.init(clip, blitter);
             blitter = wrap.getBlitter();
             clipRgn = &wrap.getRgn();
         }
         AntiHairLineRgn(pts, count, clipRgn, blitter);
     }
 }