SkNonCopyable should be used with private inheritance.
This is mostly s/public SkNoncopyable/SkNoncopyable/g.
Two classes (SkDrawLooper::Context and SkPicture::OperationList) don't actually work with SkNoncopyable because they introduce a virtual destructor. I added SkNoncopyableVirtual to make them work as intended. Sort of questionable whether they really need to be noncopyable in the first place, but I guess it doesn't hurt to keep the behavior the same.
BUG=skia:
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/226183018
git-svn-id: http://skia.googlecode.com/svn/trunk@14081 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h
index d115a54..0fc981c 100644
--- a/include/gpu/GrBackendEffectFactory.h
+++ b/include/gpu/GrBackendEffectFactory.h
@@ -28,7 +28,7 @@
class GrGLCaps;
class GrDrawEffect;
-class GrBackendEffectFactory : public SkNoncopyable {
+class GrBackendEffectFactory : SkNoncopyable {
public:
typedef uint32_t EffectKey;
enum {
diff --git a/include/gpu/GrClipData.h b/include/gpu/GrClipData.h
index b06dc06..1dc4b0d 100644
--- a/include/gpu/GrClipData.h
+++ b/include/gpu/GrClipData.h
@@ -20,7 +20,7 @@
* device coordinates (i.e., they have been translated by -fOrigin w.r.t.
* the canvas' device coordinates).
*/
-class GrClipData : public SkNoncopyable {
+class GrClipData : SkNoncopyable {
public:
const SkClipStack* fClipStack;
SkIPoint fOrigin;
diff --git a/include/gpu/GrContextFactory.h b/include/gpu/GrContextFactory.h
index 333afd2..916d5df 100644
--- a/include/gpu/GrContextFactory.h
+++ b/include/gpu/GrContextFactory.h
@@ -28,7 +28,7 @@
* factory is destroyed (though the caller can always grab a ref on the returned
* Gr and GL contexts to make them outlive the factory).
*/
-class GrContextFactory : public SkNoncopyable {
+class GrContextFactory : SkNoncopyable {
public:
/**
* Types of GL contexts supported. For historical and testing reasons the native GrContext will
diff --git a/include/gpu/GrCoordTransform.h b/include/gpu/GrCoordTransform.h
index 14e2620..f266577 100644
--- a/include/gpu/GrCoordTransform.h
+++ b/include/gpu/GrCoordTransform.h
@@ -39,7 +39,7 @@
* position). GrEffects just define these transformations, and the framework does the rest of the
* work to make the transformed coordinates available in their fragment shader.
*/
-class GrCoordTransform : public SkNoncopyable {
+class GrCoordTransform : SkNoncopyable {
public:
GrCoordTransform() { SkDEBUGCODE(fInEffect = false); }
diff --git a/include/gpu/GrEffectUnitTest.h b/include/gpu/GrEffectUnitTest.h
index 850db9b..f71ab54 100644
--- a/include/gpu/GrEffectUnitTest.h
+++ b/include/gpu/GrEffectUnitTest.h
@@ -35,7 +35,7 @@
class GrEffectRef;
class GrTexture;
-class GrEffectTestFactory : public SkNoncopyable {
+class GrEffectTestFactory : SkNoncopyable {
public:
typedef GrEffectRef* (*CreateProc)(SkRandom*,
diff --git a/include/gpu/GrTextureAccess.h b/include/gpu/GrTextureAccess.h
index 87b8d82..9f56171 100644
--- a/include/gpu/GrTextureAccess.h
+++ b/include/gpu/GrTextureAccess.h
@@ -112,7 +112,7 @@
* key. However, if a GrEffect uses different swizzles based on its input then it must
* consider that variation in its key-generation.
*/
-class GrTextureAccess : public SkNoncopyable {
+class GrTextureAccess : SkNoncopyable {
public:
/**
* A default GrTextureAccess must have reset() called on it in a GrEffect subclass's