Move SkAtomics.h to private.

There are no API changes.

TBR=reed@google.com

BUG=skia:

Review URL: https://codereview.chromium.org/1369333004

5 files changed, 4 insertions, 140 deletions

diff --git a/include/core/SkAtomics.h b/include/core/SkAtomics.h
deleted file mode 100644
index e947d1a9a4..0000000000
--- a/include/core/SkAtomics.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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 SkAtomics_DEFINED
-#define SkAtomics_DEFINED
-
-// This file is not part of the public Skia API.
-#include "SkTypes.h"
-
-enum sk_memory_order {
-    sk_memory_order_relaxed,
-    sk_memory_order_consume,
-    sk_memory_order_acquire,
-    sk_memory_order_release,
-    sk_memory_order_acq_rel,
-    sk_memory_order_seq_cst,
-};
-
-template <typename T>
-T sk_atomic_load(const T*, sk_memory_order = sk_memory_order_seq_cst);
-
-template <typename T>
-void sk_atomic_store(T*, T, sk_memory_order = sk_memory_order_seq_cst);
-
-template <typename T>
-T sk_atomic_fetch_add(T*, T, sk_memory_order = sk_memory_order_seq_cst);
-
-template <typename T>
-T sk_atomic_fetch_sub(T*, T, sk_memory_order = sk_memory_order_seq_cst);
-
-template <typename T>
-bool sk_atomic_compare_exchange(T*, T* expected, T desired,
-                                sk_memory_order success = sk_memory_order_seq_cst,
-                                sk_memory_order failure = sk_memory_order_seq_cst);
-
-template <typename T>
-T sk_atomic_exchange(T*, T, sk_memory_order = sk_memory_order_seq_cst);
-
-// A little wrapper class for small T (think, builtins: int, float, void*) to
-// ensure they're always used atomically.  This is our stand-in for std::atomic<T>.
-template <typename T>
-class SkAtomic : SkNoncopyable {
-public:
-    SkAtomic() {}
-    explicit SkAtomic(const T& val) : fVal(val) {}
-
-    // It is essential we return by value rather than by const&.  fVal may change at any time.
-    T load(sk_memory_order mo = sk_memory_order_seq_cst) const {
-        return sk_atomic_load(&fVal, mo);
-    }
-
-    void store(const T& val, sk_memory_order mo = sk_memory_order_seq_cst) {
-        sk_atomic_store(&fVal, val, mo);
-    }
-
-    // Alias for .load(sk_memory_order_seq_cst).
-    operator T() const {
-        return this->load();
-    }
-
-    // Alias for .store(v, sk_memory_order_seq_cst).
-    T operator=(const T& v) {
-        this->store(v);
-        return v;
-    }
-
-    T fetch_add(const T& val, sk_memory_order mo = sk_memory_order_seq_cst) {
-        return sk_atomic_fetch_add(&fVal, val, mo);
-    }
-
-    T fetch_sub(const T& val, sk_memory_order mo = sk_memory_order_seq_cst) {
-        return sk_atomic_fetch_sub(&fVal, val, mo);
-    }
-
-    bool compare_exchange(T* expected, const T& desired,
-                          sk_memory_order success = sk_memory_order_seq_cst,
-                          sk_memory_order failure = sk_memory_order_seq_cst) {
-        return sk_atomic_compare_exchange(&fVal, expected, desired, success, failure);
-    }
-private:
-    T fVal;
-};
-
-// IWYU pragma: begin_exports
-#if defined(_MSC_VER)
-    #include "../ports/SkAtomics_std.h"
-#elif !defined(SK_BUILD_FOR_IOS) && defined(__ATOMIC_RELAXED)
-    #include "../ports/SkAtomics_atomic.h"
-#else
-    #include "../ports/SkAtomics_sync.h"
-#endif
-// IWYU pragma: end_exports
-
-// From here down we have shims for our old atomics API, to be weaned off of.
-// We use the default sequentially-consistent memory order to make things simple
-// and to match the practical reality of our old _sync and _win implementations.
-
-inline int32_t sk_atomic_inc(int32_t* ptr)            { return sk_atomic_fetch_add(ptr, +1); }
-inline int32_t sk_atomic_dec(int32_t* ptr)            { return sk_atomic_fetch_add(ptr, -1); }
-inline int32_t sk_atomic_add(int32_t* ptr, int32_t v) { return sk_atomic_fetch_add(ptr,  v); }
-
-inline int64_t sk_atomic_inc(int64_t* ptr) { return sk_atomic_fetch_add<int64_t>(ptr, +1); }
-
-inline bool sk_atomic_cas(int32_t* ptr, int32_t expected, int32_t desired) {
-    return sk_atomic_compare_exchange(ptr, &expected, desired);
-}
-
-inline void* sk_atomic_cas(void** ptr, void* expected, void* desired) {
-    (void)sk_atomic_compare_exchange(ptr, &expected, desired);
-    return expected;
-}
-
-inline int32_t sk_atomic_conditional_inc(int32_t* ptr) {
-    int32_t prev = sk_atomic_load(ptr);
-    do {
-        if (0 == prev) {
-            break;
-        }
-    } while(!sk_atomic_compare_exchange(ptr, &prev, prev+1));
-    return prev;
-}
-
-template <typename T>
-T sk_acquire_load(T* ptr) { return sk_atomic_load(ptr, sk_memory_order_acquire); }
-
-template <typename T>
-void sk_release_store(T* ptr, T val) { sk_atomic_store(ptr, val, sk_memory_order_release); }
-
-inline void sk_membar_acquire__after_atomic_dec() {}
-inline void sk_membar_acquire__after_atomic_conditional_inc() {}
-
-#endif//SkAtomics_DEFINED
diff --git a/include/core/SkOnce.h b/include/core/SkOnce.h
index c7a87f77a0..43e7353d4d 100644
--- a/include/core/SkOnce.h
+++ b/include/core/SkOnce.h
@@ -27,7 +27,7 @@
 // No matter how many times you call EnsureRegistered(), register_my_stuff will be called just once.
 // OnceTest.cpp also should serve as a few other simple examples.
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkSpinlock.h"
 
 // This must be used in a global scope, not in function scope or as a class member.
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 0d9182aae1..3fc156b805 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -8,7 +8,7 @@
 #ifndef SkPixelRef_DEFINED
 #define SkPixelRef_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 5b83d0bcae..1ba59b33c0 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -8,7 +8,7 @@
 #ifndef SkRefCnt_DEFINED
 #define SkRefCnt_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkTypes.h"
 
 /** \class SkRefCntBase
diff --git a/include/core/SkSpinlock.h b/include/core/SkSpinlock.h
index 82a2841db6..ef52ab013a 100644
--- a/include/core/SkSpinlock.h
+++ b/include/core/SkSpinlock.h
@@ -10,7 +10,7 @@
 #ifndef SkSpinlock_DEFINED
 #define SkSpinlock_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 
 #define SK_DECLARE_STATIC_SPINLOCK(name) namespace {} static SkPODSpinlock name