Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: include/gpu/GrTextureAccess.h

Issue 23483042: Replace uses of GrNoncopyable by SkNoncopyable. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm GrNoncopyable.h Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/GrNoncopyable.h ('k') | src/gpu/GrAllocPool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « include/gpu/GrNoncopyable.h ('k') | src/gpu/GrAllocPool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698