| Index: include/gpu/GrTextureAccess.h
|
| diff --git a/include/gpu/GrTextureAccess.h b/include/gpu/GrTextureAccess.h
|
| index f8bb554326171281cc1473251fe3e49a44a3e347..059800f05b3d72d279fe493c18e78501abeefb30 100644
|
| --- a/include/gpu/GrTextureAccess.h
|
| +++ b/include/gpu/GrTextureAccess.h
|
| @@ -8,9 +8,9 @@
|
| #ifndef GrTextureAccess_DEFINED
|
| #define GrTextureAccess_DEFINED
|
|
|
| -#include "GrNoncopyable.h"
|
| #include "SkRefCnt.h"
|
| #include "SkShader.h"
|
| +#include "SkTypes.h"
|
|
|
| class GrTexture;
|
|
|
| @@ -112,7 +112,7 @@ private:
|
| * key. However, if a GrEffect uses different swizzles based on its input then it must
|
| * consider that variation in its key-generation.
|
| */
|
| -class GrTextureAccess : GrNoncopyable {
|
| +class GrTextureAccess : public SkNoncopyable {
|
| public:
|
| /**
|
| * A default GrTextureAccess must have reset() called on it in a GrEffect subclass's
|
| @@ -182,7 +182,7 @@ private:
|
| uint32_t fSwizzleMask;
|
| char fSwizzle[5];
|
|
|
| - typedef GrNoncopyable INHERITED;
|
| + typedef SkNoncopyable INHERITED;
|
| };
|
|
|
| #endif
|
|
|