Revert of Spin off just SkLazyFnPtr from 305513002.

src/core/SkUtils.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 "SkUtils.h"
-#include "SkLazyFnPtr.h"
+#include "SkOnce.h"
 
 #if 0
 #define assign_16_longs(dst, value)             \
     do {                                        \
         (dst)[0] = value;   (dst)[1] = value;   \
         (dst)[2] = value;   (dst)[3] = value;   \
         (dst)[4] = value;   (dst)[5] = value;   \
         (dst)[6] = value;   (dst)[7] = value;   \
         (dst)[8] = value;   (dst)[9] = value;   \
         (dst)[10] = value;  (dst)[11] = value;  \
@@ skipping 84 matching lines @@
         do {
             *dst++ = value;
         } while (--count != 0);
     }
 }
 
 static void sk_memcpy32_portable(uint32_t dst[], const uint32_t src[], int count) {
     memcpy(dst, src, count * sizeof(uint32_t));
 }
 
-static SkMemset16Proc choose_memset16() {
-    SkMemset16Proc proc = SkMemset16GetPlatformProc();
-    return proc ? proc : sk_memset16_portable;
+static void choose_memset16(SkMemset16Proc* proc) {
+    *proc = SkMemset16GetPlatformProc();
+    if (NULL == *proc) {
+        *proc = &sk_memset16_portable;
+    }
 }
 
 void sk_memset16(uint16_t dst[], uint16_t value, int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemset16Proc, choice);
-    return choice.get(choose_memset16)(dst, value, count);
+    SK_DECLARE_STATIC_ONCE(once);
+    static SkMemset16Proc proc = NULL;
+    SkOnce(&once, choose_memset16, &proc);
+    SkASSERT(proc != NULL);
+
+    return proc(dst, value, count);
 }
 
-static SkMemset32Proc choose_memset32() {
-    SkMemset32Proc proc = SkMemset32GetPlatformProc();
-    return proc ? proc : sk_memset32_portable;
+static void choose_memset32(SkMemset32Proc* proc) {
+    *proc = SkMemset32GetPlatformProc();
+    if (NULL == *proc) {
+        *proc = &sk_memset32_portable;
+    }
 }
 
 void sk_memset32(uint32_t dst[], uint32_t value, int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemset32Proc, choice);
-    return choice.get(choose_memset32)(dst, value, count);
+    SK_DECLARE_STATIC_ONCE(once);
+    static SkMemset32Proc proc = NULL;
+    SkOnce(&once, choose_memset32, &proc);
+    SkASSERT(proc != NULL);
+
+    return proc(dst, value, count);
 }
 
-static SkMemcpy32Proc choose_memcpy32() {
-    SkMemcpy32Proc proc = SkMemcpy32GetPlatformProc();
-    return proc ? proc : sk_memcpy32_portable;
+static void choose_memcpy32(SkMemcpy32Proc* proc) {
+    *proc = SkMemcpy32GetPlatformProc();
+    if (NULL == *proc) {
+        *proc = &sk_memcpy32_portable;
+    }
 }
 
 void sk_memcpy32(uint32_t dst[], const uint32_t src[], int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemcpy32Proc, choice);
-    return choice.get(choose_memcpy32)(dst, src, count);
+    SK_DECLARE_STATIC_ONCE(once);
+    static SkMemcpy32Proc proc = NULL;
+    SkOnce(&once, choose_memcpy32, &proc);
+    SkASSERT(proc != NULL);
+
+    return proc(dst, src, count);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /*  0xxxxxxx    1 total
     10xxxxxx    // never a leading byte
     110xxxxx    2 total
     1110xxxx    3 total
     11110xxx    4 total
 
@@ skipping 253 matching lines @@
         }
     } else {
         char* start = utf8;
         while (utf16 < stop) {
             utf8 += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), utf8);
         }
         size = utf8 - start;
     }
     return size;
 }