Move SkAtomics.h to private.

There are no API changes.

TBR=reed@google.com

BUG=skia:

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

31 files changed, 30 insertions, 30 deletions

diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp
index 313e9a484b..1168055e5b 100644
--- a/bench/RefCntBench.cpp
+++ b/bench/RefCntBench.cpp
@@ -6,7 +6,7 @@
  */
 #include <memory>
 #include "Benchmark.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkRefCnt.h"
 #include "SkWeakRefCnt.h"
 
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
 
diff --git a/include/core/SkAtomics.h b/include/private/SkAtomics.h
index e947d1a9a4..e947d1a9a4 100644
--- a/include/core/SkAtomics.h
+++ b/include/private/SkAtomics.h
diff --git a/include/private/SkOncePtr.h b/include/private/SkOncePtr.h
index a1c028c4af..261f9a7ef4 100644
--- a/include/private/SkOncePtr.h
+++ b/include/private/SkOncePtr.h
@@ -8,7 +8,7 @@
 #ifndef SkOncePtr_DEFINED
 #define SkOncePtr_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkUniquePtr.h"
 
 template <typename T> class SkBaseOncePtr;
diff --git a/include/private/SkSemaphore.h b/include/private/SkSemaphore.h
index b5b5ea5957..cb2f58da4a 100644
--- a/include/private/SkSemaphore.h
+++ b/include/private/SkSemaphore.h
@@ -9,7 +9,7 @@
 #define SkSemaphore_DEFINED
 
 #include "SkTypes.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "../private/SkOncePtr.h"
 
 struct SkBaseSemaphore {
diff --git a/include/private/SkWeakRefCnt.h b/include/private/SkWeakRefCnt.h
index a550951970..1a78ba5092 100644
--- a/include/private/SkWeakRefCnt.h
+++ b/include/private/SkWeakRefCnt.h
@@ -9,7 +9,7 @@
 #define SkWeakRefCnt_DEFINED
 
 #include "SkRefCnt.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 
 /** \class SkWeakRefCnt
 
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index bbd1f555f0..a54f0ffa5c 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "SkAAClip.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkBlitter.h"
 #include "SkColorPriv.h"
 #include "SkPath.h"
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 6fd97dc241..a935e882bc 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h
index 22c31a0b0b..d273a299a4 100644
--- a/src/core/SkBitmapHeap.h
+++ b/src/core/SkBitmapHeap.h
@@ -8,7 +8,7 @@
 #ifndef SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp
index f54d57fd0b..1fd621b9d2 100644
--- a/src/core/SkClipStack.cpp
+++ b/src/core/SkClipStack.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkPath.h"
diff --git a/src/core/SkDrawable.cpp b/src/core/SkDrawable.cpp
index 8fea38be34..c998d0270f 100644
--- a/src/core/SkDrawable.cpp
+++ b/src/core/SkDrawable.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 8247336d49..0fe3ae495d 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkMessageBus.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 3a542c6169..aeebec4c32 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkRegionPriv.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index 160c55d555..bde8e28901 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -11,7 +11,7 @@
 #define SkRegionPriv_DEFINED
 
 #include "SkRegion.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 
 #define assert_sentinel(value, isSentinel) \
     SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 6aadb4301a..84ce8b69b6 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkBitmapProcShader.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
diff --git a/src/core/SkSharedMutex.cpp b/src/core/SkSharedMutex.cpp
index 203a775190..0db6101ddf 100644
--- a/src/core/SkSharedMutex.cpp
+++ b/src/core/SkSharedMutex.cpp
@@ -7,7 +7,7 @@
 
 #include "SkSharedMutex.h"
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkTypes.h"
 #include "../private/SkSemaphore.h"
 
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 9660adf0eb..737735f4df 100644
--- a/src/core/SkSharedMutex.h
+++ b/src/core/SkSharedMutex.h
@@ -8,7 +8,7 @@
 #ifndef SkSharedLock_DEFINED
 #define SkSharedLock_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkSemaphore.h"
 #include "SkTypes.h"
 
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index d93f662da3..af5fa7a58c 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkFixed.h"
 #include "SkString.h"
 #include "SkUtils.h"
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp
index a47dc14b5a..c7304ed38e 100755
--- a/src/core/SkTLS.cpp
+++ b/src/core/SkTLS.cpp
@@ -12,7 +12,7 @@
 
 
 #ifdef SK_TRACE_TLS_LIFETIME
-    #include "SkAtomics.h"
+    #include "../private/SkAtomics.h"
     static int32_t gTLSRecCount;
 #endif
 
diff --git a/src/core/SkTaskGroup.h b/src/core/SkTaskGroup.h
index 3af64d7753..c23087bddb 100644
--- a/src/core/SkTaskGroup.h
+++ b/src/core/SkTaskGroup.h
@@ -9,7 +9,7 @@
 #define SkTaskGroup_DEFINED
 
 #include "SkTypes.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkTemplates.h"
 
 struct SkRunnable;
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index 05dc340fa2..c76e046457 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -10,7 +10,7 @@
 #ifndef SkTraceEvent_DEFINED
 #define SkTraceEvent_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkTraceEventCommon.h"
 
diff --git a/src/core/SkTypefaceCache.cpp b/src/core/SkTypefaceCache.cpp
index 5fe080d05d..3f8799dad1 100644
--- a/src/core/SkTypefaceCache.cpp
+++ b/src/core/SkTypefaceCache.cpp
@@ -9,7 +9,7 @@
 
 
 #include "SkTypefaceCache.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkMutex.h"
 
 #define TYPEFACE_CACHE_LIMIT    1024
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index bbcf182ab8..195a96c2e1 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -8,7 +8,7 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkImage.h"
 #include "SkSurface.h"
 
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index 5e847dd381..b8b7496023 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -8,7 +8,7 @@
 #ifndef SkImage_Gpu_DEFINED
 #define SkImage_Gpu_DEFINED
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "GrTexture.h"
 #include "GrGpuResourcePriv.h"
 #include "SkBitmap.h"
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp
index 32a0207c23..65fc24f622 100644
--- a/src/utils/SkEventTracer.cpp
+++ b/src/utils/SkEventTracer.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkOncePtr.h"
 
diff --git a/src/views/SkOSMenu.cpp b/src/views/SkOSMenu.cpp
index ec92a7b4a5..b120d96a78 100644
--- a/src/views/SkOSMenu.cpp
+++ b/src/views/SkOSMenu.cpp
@@ -4,7 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkOSMenu.h"
 #include <stdarg.h>
 
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index e9db3f093d..aad0969f9a 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
 #include "Test.h"
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index dc5ae97c3f..42309355e2 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -8,7 +8,7 @@
 #include "CrashHandler.h"
 #include "OverwriteLine.h"
 #include "Resources.h"
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
 #include "SkCommonFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"