From a0b40280a49a8a43af7929ead3b3489951c58501 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 18 Sep 2013 13:00:55 +0000 Subject: Replace uses of GrNoncopyable by SkNoncopyable. BUG=None TEST=None, no functional changes. R=bsalomon@google.com, robertphillips@google.com Author: tfarina@chromium.org Review URL: https://chromiumcodereview.appspot.com/23483042 git-svn-id: http://skia.googlecode.com/svn/trunk@11341 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/GrTextureAccess.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/gpu/GrTextureAccess.h') diff --git a/include/gpu/GrTextureAccess.h b/include/gpu/GrTextureAccess.h index f8bb554326..059800f05b 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 -- cgit v1.2.3