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>
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h
index 9c6dad9..4e6be68 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 cbe492c..dbb7d53 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 0338e76..a9ac955 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 739be72..932fbc2 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 7f1939d..c0aff73 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 16f9645..3e9a9a3 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 89e062e..4bd95b5 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 d33f145..fcf8820 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 b879b84..72df8b6 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 8c7d9d4..f6a10e5 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 1b58ef4..23759ca 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 4105139..6728653 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 c23637f..5a4e8d1 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 de17e53..14200ce 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 176247b..b42bbcf 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 8d58fc8..6492c0a 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 f76b0bc..0364714 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 9cfca4c..c92beec 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 0dcd322..22ab31f 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 8baf9fb..762c172 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 6e579a5..09db543 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 f11cf85..17fb1f5 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 c3862a3..d3b7b95 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;