SkCpu w/o static initializer

src/core/SkCpu.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#define SkCpu_IMPL
 #include "SkCpu.h"
-#include "SkOncePtr.h"
+#include "SkOnce.h"
 
 #if defined(SK_CPU_X86)
     #if defined(SK_BUILD_FOR_WIN32)
         #include <intrin.h>
         static void cpuid (uint32_t abcd[4]) { __cpuid  ((int*)abcd, 1);    }
         static void cpuid7(uint32_t abcd[4]) { __cpuidex((int*)abcd, 7, 0); }
         static uint64_t xgetbv(uint32_t xcr) { return _xgetbv(xcr); }
     #else
         #include <cpuid.h>
         #if !defined(__cpuid_count)  // Old Mac Clang doesn't have this defined.
@@ skipping 51 matching lines @@
         return features;
     }
 
 #else
     static uint32_t read_cpu_features() {
         return 0;
     }
 
 #endif
 
-#if defined(__GNUC__) || defined(__clang__)
-    SK_DECLARE_STATIC_ONCE_PTR(uint32_t, gCachedCpuFeatures);
-    uint32_t SkCpu::RuntimeCpuFeatures() {
-        return *gCachedCpuFeatures.get([]{ return new uint32_t{read_cpu_features()}; });
+#if defined(_MSC_VER)
+    const uint32_t SkCpu::gCachedFeatures = read_cpu_features();
+
+    void SkCpu::CacheRuntimeFeatures() {}
+
+#else
+    uint32_t SkCpu::gCachedFeatures = 0;
+
+    void SkCpu::CacheRuntimeFeatures() {
+        static SkOnce once;
+        once([] { gCachedFeatures = read_cpu_features(); });
     }
 
-#else
-    const uint32_t SkCpu::gCachedCpuFeatures = read_cpu_features();
-
 #endif