Refactor to put SkXfermode_opts inside SK_OPTS_NS.

src/core/SkNx.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkNx_DEFINED
 #define SkNx_DEFINED
 
 
 #define SKNX_NO_SIMDx  // Remove the x to disable SIMD for all SkNx types.
 
 
 #include "SkScalar.h"
 #include "SkTypes.h"
 #include <math.h>
 #define REQUIRE(x) static_assert(x, #x)
 
-// This file may be included multiple times by .cpp files with different flags, leading
-// to different definitions.  Usually that doesn't matter because it's all inlined, but
-// in Debug modes the compilers may not inline everything.  So wrap everything in an
-// anonymous namespace to give each includer their own silo of this code (or the linker
-// will probably pick one randomly for us, which is rarely correct).
-namespace {
-
 // The default implementations just fall back on a pair of size N/2.
 
 template <int N, typename T>
 class SkNi {
 public:
     SkNi() {}
     SkNi(const SkNi<N/2, T>& lo, const SkNi<N/2, T>& hi) : fLo(lo), fHi(hi) {}
     explicit SkNi(T val) : fLo(val), fHi(val) {}
     static SkNi Load(const T vals[N]) {
         return SkNi(SkNi<N/2,T>::Load(vals), SkNi<N/2,T>::Load(vals+N/2));
@@ skipping 208 matching lines @@
     static double Sqrt(double val) { return     ::sqrt (       val); }
 
     I pun() const {
         union { T f; I i; } pun = { fVal };
         return pun.i;
     }
 
     T fVal;
 };
 
-}  // namespace
-
 // Include platform specific specializations if available.
 #ifndef SKNX_NO_SIMD
     #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
         #include "../opts/SkNx_sse.h"
     #elif defined(SK_ARM_HAS_NEON)
         #include "../opts/SkNx_neon.h"
     #endif
 #endif
 
 #undef REQUIRE
 
 typedef SkNf<2,    float> Sk2f;
 typedef SkNf<2,   double> Sk2d;
 typedef SkNf<2, SkScalar> Sk2s;
 
 typedef SkNf<4,    float> Sk4f;
 typedef SkNf<4,   double> Sk4d;
 typedef SkNf<4, SkScalar> Sk4s;
 
 typedef SkNi<4,  uint16_t> Sk4h;
 typedef SkNi<8,  uint16_t> Sk8h;
 typedef SkNi<16, uint16_t> Sk16h;
 
 typedef SkNi<16, uint8_t> Sk16b;
 
 typedef SkNi<4,  int32_t> Sk4i;
 typedef SkNi<4, uint32_t> Sk4u;
 
 #endif//SkNx_DEFINED