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

Unified Diff: src/gpu/GrAllocator.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 | « src/gpu/GrAllocPool.cpp ('k') | src/gpu/GrBufferAllocPool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrAllocator.h
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h
index c37b119700797983888f19155042e7e7570b0ae5..57ca03cd329cf520d178920778da6953e7acedbd 100755
--- a/src/gpu/GrAllocator.h
+++ b/src/gpu/GrAllocator.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2010 Google Inc.
*
@@ -6,16 +5,15 @@
* found in the LICENSE file.
*/
-
-
#ifndef GrAllocator_DEFINED
#define GrAllocator_DEFINED
-#include "GrNoncopyable.h"
#include "GrConfig.h"
+#include "GrTypes.h"
#include "SkTArray.h"
+#include "SkTypes.h"
-class GrAllocator : GrNoncopyable {
+class GrAllocator : public SkNoncopyable {
public:
~GrAllocator() {
reset();
@@ -135,12 +133,11 @@ private:
bool fOwnFirstBlock;
int fCount;
- typedef GrNoncopyable INHERITED;
+ typedef SkNoncopyable INHERITED;
};
template <typename T>
-class GrTAllocator : GrNoncopyable {
-
+class GrTAllocator : public SkNoncopyable {
public:
virtual ~GrTAllocator() { this->reset(); };
@@ -232,7 +229,7 @@ protected:
private:
GrAllocator fAllocator;
- typedef GrNoncopyable INHERITED;
+ typedef SkNoncopyable INHERITED;
};
template <int N, typename T> class GrSTAllocator : public GrTAllocator<T> {
« no previous file with comments | « src/gpu/GrAllocPool.cpp ('k') | src/gpu/GrBufferAllocPool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698