Move SkNoncopyable to include/private.

Change-Id: I62f60ea52faeebddecacf03d9429ac3f7c516b8e
Reviewed-on: https://skia-review.googlesource.com/141823
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

23 files changed, 28 insertions, 5 deletions

diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h
index 9c6dad959e..4e6be68094 100644
--- a/src/core/SkAutoMalloc.h
+++ b/src/core/SkAutoMalloc.h
@@ -10,6 +10,7 @@
 
 #include "SkMacros.h"
 #include "SkMalloc.h"
+#include "SkNoncopyable.h"
 #include "SkTypes.h"
 
 #include <memory>
diff --git a/src/core/SkBigPicture.h b/src/core/SkBigPicture.h
index cbe492cc22..dbb7d5300c 100644
--- a/src/core/SkBigPicture.h
+++ b/src/core/SkBigPicture.h
@@ -8,6 +8,7 @@
 #ifndef SkBigPicture_DEFINED
 #define SkBigPicture_DEFINED
 
+#include "SkNoncopyable.h"
 #include "SkOnce.h"
 #include "SkPicture.h"
 #include "SkRect.h"
diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h
index 0338e7601e..a9ac955e37 100644
--- a/src/core/SkBuffer.h
+++ b/src/core/SkBuffer.h
@@ -8,12 +8,13 @@
 #ifndef SkBuffer_DEFINED
 #define SkBuffer_DEFINED
 
-#include <limits>
-
+#include "SkNoncopyable.h"
 #include "SkSafeMath.h"
 #include "SkScalar.h"
 #include "SkTypes.h"
 
+#include <limits>
+
 /** \class SkRBuffer
 
     Light weight class for reading data from a memory block.
diff --git a/src/core/SkCachedData.h b/src/core/SkCachedData.h
index 739be72182..932fbc298f 100644
--- a/src/core/SkCachedData.h
+++ b/src/core/SkCachedData.h
@@ -9,6 +9,7 @@
 #define SkCachedData_DEFINED
 
 #include "SkMutex.h"
+#include "SkNoncopyable.h"
 #include "SkTypes.h"
 
 class SkDiscardableMemory;
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index 7f1939dcc2..c0aff735d7 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -9,6 +9,7 @@
 #define SkDescriptor_DEFINED
 
 #include "SkMacros.h"
+#include "SkNoncopyable.h"
 #include "SkOpts.h"
 #include "SkTo.h"
 #include "SkTypes.h"
diff --git a/src/core/SkMaskFilterBase.h b/src/core/SkMaskFilterBase.h
index 16f96451aa..3e9a9a3cfb 100644
--- a/src/core/SkMaskFilterBase.h
+++ b/src/core/SkMaskFilterBase.h
@@ -12,6 +12,7 @@
 #include "SkFlattenable.h"
 #include "SkMask.h"
 #include "SkMaskFilter.h"
+#include "SkNoncopyable.h"
 #include "SkPaint.h"
 #include "SkStrokeRec.h"
 
diff --git a/src/core/SkMaskGamma.h b/src/core/SkMaskGamma.h
index 89e062e7cc..4bd95b5e5c 100644
--- a/src/core/SkMaskGamma.h
+++ b/src/core/SkMaskGamma.h
@@ -8,10 +8,11 @@
 #ifndef SkMaskGamma_DEFINED
 #define SkMaskGamma_DEFINED
 
-#include "SkTypes.h"
 #include "SkColor.h"
 #include "SkColorData.h"
+#include "SkNoncopyable.h"
 #include "SkRefCnt.h"
+#include "SkTypes.h"
 
 /**
  * SkColorSpaceLuminance is used to convert luminances to and from linear and
diff --git a/src/core/SkTaskGroup.h b/src/core/SkTaskGroup.h
index d33f1458cb..fcf882063a 100644
--- a/src/core/SkTaskGroup.h
+++ b/src/core/SkTaskGroup.h
@@ -9,6 +9,7 @@
 #define SkTaskGroup_DEFINED
 
 #include "SkExecutor.h"
+#include "SkNoncopyable.h"
 #include "SkTypes.h"
 #include <atomic>
 #include <functional>
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h
index b879b846d2..72df8b6df1 100644
--- a/src/gpu/GrAllocator.h
+++ b/src/gpu/GrAllocator.h
@@ -10,6 +10,7 @@
 
 #include "GrConfig.h"
 #include "GrTypes.h"
+#include "SkNoncopyable.h"
 #include "SkTArray.h"
 #include "SkTypes.h"
 #include <new>
diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h
index 8c7d9d4ab3..f6a10e5b7d 100644
--- a/src/gpu/GrAutoLocaleSetter.h
+++ b/src/gpu/GrAutoLocaleSetter.h
@@ -9,6 +9,7 @@
 #define GrAutoLocaleSetter_DEFINED
 
 #include "GrTypes.h"
+#include "SkNoncopyable.h"
 
 #if defined(SK_BUILD_FOR_WIN)
 #include "SkString.h"
diff --git a/src/gpu/GrBufferAllocPool.h b/src/gpu/GrBufferAllocPool.h
index 1b58ef45e4..23759caff8 100644
--- a/src/gpu/GrBufferAllocPool.h
+++ b/src/gpu/GrBufferAllocPool.h
@@ -8,10 +8,11 @@
 #ifndef GrBufferAllocPool_DEFINED
 #define GrBufferAllocPool_DEFINED
 
+#include "GrTypesPriv.h"
+#include "SkNoncopyable.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkTypes.h"
-#include "GrTypesPriv.h"
 
 class GrBuffer;
 class GrGpu;
diff --git a/src/gpu/GrGpuResourceRef.h b/src/gpu/GrGpuResourceRef.h
index 410513944f..672865329b 100644
--- a/src/gpu/GrGpuResourceRef.h
+++ b/src/gpu/GrGpuResourceRef.h
@@ -9,6 +9,7 @@
 #define GrGpuResourceRef_DEFINED
 
 #include "GrGpuResource.h"
+#include "SkNoncopyable.h"
 #include "SkRefCnt.h"
 
 /**
diff --git a/src/gpu/GrNonAtomicRef.h b/src/gpu/GrNonAtomicRef.h
index c23637f467..5a4e8d1dbb 100644
--- a/src/gpu/GrNonAtomicRef.h
+++ b/src/gpu/GrNonAtomicRef.h
@@ -8,6 +8,7 @@
 #ifndef GrNonAtomicRef_DEFINED
 #define GrNonAtomicRef_DEFINED
 
+#include "SkNoncopyable.h"
 #include "SkRefCnt.h"
 #include "SkTArray.h"
 
diff --git a/src/gpu/GrPathRendererChain.h b/src/gpu/GrPathRendererChain.h
index de17e53d81..14200cecce 100644
--- a/src/gpu/GrPathRendererChain.h
+++ b/src/gpu/GrPathRendererChain.h
@@ -11,6 +11,7 @@
 #include "GrPathRenderer.h"
 
 #include "GrTypesPriv.h"
+#include "SkNoncopyable.h"
 #include "SkTypes.h"
 #include "SkTArray.h"
 
diff --git a/src/gpu/GrTextureProducer.h b/src/gpu/GrTextureProducer.h
index 176247b67e..b42bbcfc9a 100644
--- a/src/gpu/GrTextureProducer.h
+++ b/src/gpu/GrTextureProducer.h
@@ -11,6 +11,7 @@
 #include "GrResourceKey.h"
 #include "GrSamplerState.h"
 #include "SkImageInfo.h"
+#include "SkNoncopyable.h"
 
 class GrContext;
 class GrFragmentProcessor;
diff --git a/src/gpu/glsl/GrGLSLProgramDataManager.h b/src/gpu/glsl/GrGLSLProgramDataManager.h
index 8d58fc8b9d..6492c0a0dc 100644
--- a/src/gpu/glsl/GrGLSLProgramDataManager.h
+++ b/src/gpu/glsl/GrGLSLProgramDataManager.h
@@ -9,6 +9,7 @@
 #define GrGLSLProgramDataManager_DEFINED
 
 #include "GrResourceHandle.h"
+#include "SkNoncopyable.h"
 #include "SkTypes.h"
 
 class SkMatrix;
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index f76b0bced4..03647142e9 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -10,6 +10,7 @@
 
 #include "SkLeanWindows.h"
 #include "SkMalloc.h"
+#include "SkNoncopyable.h"
 #include "SkOSFile.h"
 #include "SkStringUtils.h"
 #include "SkTFitsIn.h"
diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 9cfca4c6ba..c92beecf4f 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h
@@ -12,6 +12,7 @@
 #include "SkFlattenablePriv.h"
 #include "SkMask.h"
 #include "SkMatrix.h"
+#include "SkNoncopyable.h"
 #include "SkShader.h"
 #include "SkTLazy.h"
 
diff --git a/src/shaders/gradients/SkGradientBitmapCache.h b/src/shaders/gradients/SkGradientBitmapCache.h
index 0dcd32272e..22ab31ff27 100644
--- a/src/shaders/gradients/SkGradientBitmapCache.h
+++ b/src/shaders/gradients/SkGradientBitmapCache.h
@@ -10,6 +10,7 @@
 #define SkGradientBitmapCache_DEFINED
 
 #include "SkBitmap.h"
+#include "SkNoncopyable.h"
 
 class SkGradientBitmapCache : SkNoncopyable {
 public:
diff --git a/src/utils/SkJSON.h b/src/utils/SkJSON.h
index 8baf9fb8fc..762c17219f 100644
--- a/src/utils/SkJSON.h
+++ b/src/utils/SkJSON.h
@@ -9,6 +9,7 @@
 #define SkJSON_DEFINED
 
 #include "SkArenaAlloc.h"
+#include "SkNoncopyable.h"
 #include "SkTo.h"
 #include "SkTypes.h"
 
diff --git a/src/utils/SkJSONWriter.h b/src/utils/SkJSONWriter.h
index 6e579a5f69..09db543c86 100644
--- a/src/utils/SkJSONWriter.h
+++ b/src/utils/SkJSONWriter.h
@@ -8,6 +8,7 @@
 #ifndef SkJSONWriter_DEFINED
 #define SkJSONWriter_DEFINED
 
+#include "SkNoncopyable.h"
 #include "SkStream.h"
 #include "SkTArray.h"
 
diff --git a/src/utils/win/SkAutoCoInitialize.h b/src/utils/win/SkAutoCoInitialize.h
index f11cf856c5..17fb1f5361 100644
--- a/src/utils/win/SkAutoCoInitialize.h
+++ b/src/utils/win/SkAutoCoInitialize.h
@@ -13,6 +13,7 @@
 #ifdef SK_BUILD_FOR_WIN
 
 #include "SkLeanWindows.h"
+#include "SkNoncopyable.h"
 
 /**
  * An instance of this class initializes COM on creation
diff --git a/src/xml/SkDOM.h b/src/xml/SkDOM.h
index c3862a3ada..d3b7b95133 100644
--- a/src/xml/SkDOM.h
+++ b/src/xml/SkDOM.h
@@ -8,9 +8,10 @@
 #ifndef SkDOM_DEFINED
 #define SkDOM_DEFINED
 
-#include "../private/SkTemplates.h"
 #include "SkArenaAlloc.h"
+#include "SkNoncopyable.h"
 #include "SkScalar.h"
+#include "SkTemplates.h"
 #include "SkTypes.h"
 
 struct SkDOMNode;