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

Unified Diff: src/gpu/effects/GrTextureStripAtlas.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/GrTemplates.h ('k') | src/gpu/gl/GrGLBufferImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrTextureStripAtlas.h
diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h
index 0148665a4c4b9ffeacac009fa5eeeefffcb99d51..d8850f946a97c091acbe95c0050ee3a266394bb7 100644
--- a/src/gpu/effects/GrTextureStripAtlas.h
+++ b/src/gpu/effects/GrTextureStripAtlas.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2012 Google Inc.
*
@@ -9,11 +8,12 @@
#ifndef GrTextureStripAtlas_DEFINED
#define GrTextureStripAtlas_DEFINED
-#include "SkBitmap.h"
+#include "GrBinHashKey.h"
#include "GrTHashCache.h"
+#include "SkBitmap.h"
#include "SkGr.h"
#include "SkTDArray.h"
-#include "GrBinHashKey.h"
+#include "SkTypes.h"
/**
* Maintains a single large texture whose rows store many textures of a small fixed height,
@@ -79,7 +79,7 @@ private:
* The state of a single row in our cache, next/prev pointers allow these to be chained
* together to represent LRU status
*/
- struct AtlasRow : public GrNoncopyable {
+ struct AtlasRow : public SkNoncopyable {
AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(NULL), fPrev(NULL) { }
// GenerationID of the bitmap that is represented by this row, 0xffffffff means "empty"
uint32_t fKey;
@@ -137,7 +137,7 @@ private:
// Hash table entry for atlases
class AtlasEntry;
typedef GrTBinHashKey<AtlasEntry, sizeof(GrTextureStripAtlas::Desc)> AtlasHashKey;
- class AtlasEntry : public ::GrNoncopyable {
+ class AtlasEntry : public ::SkNoncopyable {
public:
AtlasEntry() : fAtlas(NULL) {}
~AtlasEntry() { SkDELETE(fAtlas); }
« no previous file with comments | « src/gpu/GrTemplates.h ('k') | src/gpu/gl/GrGLBufferImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698