Move Mutexy things to private.

There is no API change.

TBR=reed@google.com

BUG=skia:

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

14 files changed, 19 insertions, 11 deletions

diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp
index 1168055e5b..313e9a484b 100644
--- a/bench/RefCntBench.cpp
+++ b/bench/RefCntBench.cpp
@@ -6,7 +6,7 @@
  */
 #include <memory>
 #include "Benchmark.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkRefCnt.h"
 #include "SkWeakRefCnt.h"
 
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 9e9727c66d..d8008dccec 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -300,7 +300,6 @@
         '<(skia_include_path)/core/SkMatrix.h',
         '<(skia_include_path)/core/SkMetaData.h',
         '<(skia_include_path)/core/SkMultiPictureDraw.h',
-        '<(skia_include_path)/core/SkOnce.h',
         '<(skia_include_path)/core/SkOSFile.h',
         '<(skia_include_path)/core/SkPackBits.h',
         '<(skia_include_path)/core/SkPaint.h',
@@ -341,6 +340,14 @@
         '<(skia_include_path)/core/SkUtils.h',
         '<(skia_include_path)/core/SkWriter32.h',
         '<(skia_include_path)/core/SkXfermode.h',
+
+        # private
+        '<(skia_include_path)/private/SkAtomics.h',
+        '<(skia_include_path)/private/SkMutex.h',
+        '<(skia_include_path)/private/SkOnce.h',
+        '<(skia_include_path)/private/SkOncePtr.h',
+        '<(skia_include_path)/private/SkSemaphore.h',
+        '<(skia_include_path)/private/SkSpinlock.h',
         '<(skia_include_path)/private/SkTemplates.h',
 
         # Path ops
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index edcb5dbb1f..52d7e45273 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -118,6 +118,7 @@
         '../tools/sk_tool_utils_font.cpp',
       ],
       'include_dirs': [
+        '../include/private',
         '../src/fonts',
         '../src/core',
       ],
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 3fc156b805..4591ed82bf 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -12,7 +12,7 @@
 #include "SkBitmap.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
-#include "SkMutex.h"
+#include "../private/SkMutex.h"
 #include "SkPixmap.h"
 #include "SkRefCnt.h"
 #include "SkSize.h"
diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h
index f63e0abfe9..eab308e0cf 100644
--- a/include/effects/SkColorCubeFilter.h
+++ b/include/effects/SkColorCubeFilter.h
@@ -10,7 +10,7 @@
 
 #include "SkColorFilter.h"
 #include "SkData.h"
-#include "SkMutex.h"
+#include "../private/SkMutex.h"
 
 class SK_API SkColorCubeFilter : public SkColorFilter {
 public:
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 1775166419..5c02d371d2 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -15,7 +15,7 @@
 #include "GrRenderTarget.h"
 #include "GrTextureProvider.h"
 #include "SkMatrix.h"
-#include "SkMutex.h"
+#include "../private/SkMutex.h"
 #include "SkPathEffect.h"
 #include "SkTypes.h"
 
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h
index 96e998849e..6cfa90fd8a 100644
--- a/include/gpu/GrResourceKey.h
+++ b/include/gpu/GrResourceKey.h
@@ -12,7 +12,7 @@
 #include "../private/SkTemplates.h"
 #include "GrTypes.h"
 #include "SkData.h"
-#include "SkOnce.h"
+#include "../private/SkOnce.h"
 
 uint32_t GrResourceKeyHash(const uint32_t* data, size_t size);
 
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
index 2e28640a16..81cd7739a9 100644
--- a/include/ports/SkFontMgr_indirect.h
+++ b/include/ports/SkFontMgr_indirect.h
@@ -10,7 +10,7 @@
 
 #include "SkDataTable.h"
 #include "SkFontMgr.h"
-#include "SkMutex.h"
+#include "../private/SkMutex.h"
 #include "SkRefCnt.h"
 #include "SkRemotableFontMgr.h"
 #include "SkTArray.h"
diff --git a/include/core/SkMutex.h b/include/private/SkMutex.h
index 77a00f0235..77a00f0235 100644
--- a/include/core/SkMutex.h
+++ b/include/private/SkMutex.h
diff --git a/include/core/SkOnce.h b/include/private/SkOnce.h
index 43e7353d4d..a3ef4d6713 100644
--- a/include/core/SkOnce.h
+++ b/include/private/SkOnce.h
@@ -28,7 +28,7 @@
 // OnceTest.cpp also should serve as a few other simple examples.
 
 #include "../private/SkAtomics.h"
-#include "SkSpinlock.h"
+#include "../private/SkSpinlock.h"
 
 // This must be used in a global scope, not in function scope or as a class member.
 #define SK_DECLARE_STATIC_ONCE(name) namespace {} static SkOnceFlag name
diff --git a/include/core/SkSpinlock.h b/include/private/SkSpinlock.h
index ef52ab013a..ef52ab013a 100644
--- a/include/core/SkSpinlock.h
+++ b/include/private/SkSpinlock.h
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 9660adf0eb..ea948d3f6c 100644
--- a/src/core/SkSharedMutex.h
+++ b/src/core/SkSharedMutex.h
@@ -14,7 +14,7 @@
 
 #ifdef SK_DEBUG
     #include "SkMutex.h"
-    #include "../private/SkUniquePtr.h"
+    #include "SkUniquePtr.h"
 #endif  // SK_DEBUG
 
 // There are two shared lock implementations one debug the other is high performance. They implement
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index aad0969f9a..e9db3f093d 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
 #include "Test.h"
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 42309355e2..dc5ae97c3f 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 "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkCommonFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"