Replace uses of GrNoncopyable by SkNoncopyable.

src/gpu/effects/GrTextureStripAtlas.h

-
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTextureStripAtlas_DEFINED
 #define GrTextureStripAtlas_DEFINED
 
+#include "GrBinHashKey.h"
+#include "GrTHashCache.h"
 #include "SkBitmap.h"
-#include "GrTHashCache.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,
  * stored in rows across the x-axis such that we can safely wrap/repeat them horizontally.
  */
 class GrTextureStripAtlas {
 public:
     /**
      * Descriptor struct which we'll use as a hash table key
      **/
@@ skipping 45 matching lines @@
 
 private:
 
     // Key to indicate an atlas row without any meaningful data stored in it
     const static uint32_t kEmptyAtlasRowKey = 0xffffffff;
 
     /**
      * 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;
         // How many times this has been locked (0 == unlocked)
         int32_t fLocks;
         // We maintain an LRU linked list between unlocked nodes with these pointers
         AtlasRow* fNext;
         AtlasRow* fPrev;
     };
 
@@ skipping 37 matching lines @@
 
     /**
      * Clean up callback registered with GrContext. Allows this class to
      * free up any allocated AtlasEntry and GrTextureStripAtlas objects
      */
     static void CleanUp(const GrContext* context, void* info);
 
     // 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); }
         int compare(const AtlasHashKey& key) const { return fKey.compare(key); }
         AtlasHashKey fKey;
         GrTextureStripAtlas* fAtlas;
     };
 
     static GrTHashTable<AtlasEntry, AtlasHashKey, 8>* gAtlasCache;
 
@@ skipping 21 matching lines @@
     // Head and tail for linked list of least-recently-used rows (front = least recently used).
     // Note that when a texture is locked, it gets removed from this list until it is unlocked.
     AtlasRow* fLRUFront;
     AtlasRow* fLRUBack;
 
     // A list of pointers to AtlasRows that currently contain cached images, sorted by key
     SkTDArray<AtlasRow*> fKeyTable;
 };
 
 #endif