diff options
author | herb <herb@google.com> | 2015-09-29 11:47:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-29 11:47:45 -0700 |
commit | 62a69c26b3a34c259918d6c97b4dea76b6285b67 (patch) | |
tree | 833cdd358618557089590ffc3beb15209d7fa3db /include | |
parent | 05302f8f24cf0254e1fa713fbfc766387505e511 (diff) |
Move Mutexy things to private.
There is no API change.
TBR=reed@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1368333004
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkPixelRef.h | 2 | ||||
-rw-r--r-- | include/effects/SkColorCubeFilter.h | 2 | ||||
-rw-r--r-- | include/gpu/GrContext.h | 2 | ||||
-rw-r--r-- | include/gpu/GrResourceKey.h | 2 | ||||
-rw-r--r-- | include/ports/SkFontMgr_indirect.h | 2 | ||||
-rw-r--r-- | include/private/SkMutex.h (renamed from include/core/SkMutex.h) | 0 | ||||
-rw-r--r-- | include/private/SkOnce.h (renamed from include/core/SkOnce.h) | 2 | ||||
-rw-r--r-- | include/private/SkSpinlock.h (renamed from include/core/SkSpinlock.h) | 0 |
8 files changed, 6 insertions, 6 deletions
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 |