Move Mutexy things to private.
There is no API change. TBR=reed@google.com BUG=skia: Review URL: https://codereview.chromium.org/1368333004
This commit is contained in:
parent
05302f8f24
commit
62a69c26b3
@ -6,7 +6,7 @@
|
||||
*/
|
||||
#include <memory>
|
||||
#include "Benchmark.h"
|
||||
#include "../private/SkAtomics.h"
|
||||
#include "SkAtomics.h"
|
||||
#include "SkRefCnt.h"
|
||||
#include "SkWeakRefCnt.h"
|
||||
|
||||
|
@ -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
|
||||
|
@ -118,6 +118,7 @@
|
||||
'../tools/sk_tool_utils_font.cpp',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../include/private',
|
||||
'../src/fonts',
|
||||
'../src/core',
|
||||
],
|
||||
|
@ -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"
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include "SkColorFilter.h"
|
||||
#include "SkData.h"
|
||||
#include "SkMutex.h"
|
||||
#include "../private/SkMutex.h"
|
||||
|
||||
class SK_API SkColorCubeFilter : public SkColorFilter {
|
||||
public:
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user