Move GrTMultiMap to src/core and rename it

R=bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/401343002

diff --git a/src/gpu/GrTMultiMap.h b/src/core/SkTMultiMap.h
similarity index 95%
rename from src/gpu/GrTMultiMap.h
rename to src/core/SkTMultiMap.h
index 0007a04..c0b59ba 100644 (file)
--- a/src/gpu/GrTMultiMap.h
+++ b/src/core/SkTMultiMap.h
@@ -6,8 +6,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrTMultiMap_DEFINED
-#define GrTMultiMap_DEFINED
+#ifndef SkTMultiMap_DEFINED
+#define SkTMultiMap_DEFINED
 
 #include "GrTypes.h"
 #include "SkTDynamicHash.h"
@@ -18,7 +18,7 @@
 template <typename T,
           typename Key,
           typename HashTraits=T>
-class GrTMultiMap {
+class SkTMultiMap {
     struct ValueList {
         explicit ValueList(T* value) : fValue(value), fNext(NULL) {}
 
@@ -28,9 +28,9 @@ class GrTMultiMap {
         ValueList* fNext;
     };
 public:
-    GrTMultiMap() : fCount(0) {}
+    SkTMultiMap() : fCount(0) {}
 
-    ~GrTMultiMap() {
+    ~SkTMultiMap() {
         SkASSERT(fCount == 0);
         SkASSERT(fHash.count() == 0);
     }

diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h
index 1a81fe6..ccfe7fa 100644 (file)
--- a/src/gpu/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
@@ -13,7 +13,7 @@
 
 #include "GrConfig.h"
 #include "GrTypes.h"
-#include "GrTMultiMap.h"
+#include "SkTMultiMap.h"
 #include "GrBinHashKey.h"
 #include "SkMessageBus.h"
 #include "SkTInternalLList.h"
@@ -334,7 +334,7 @@ private:
 
     void removeInvalidResource(GrResourceCacheEntry* entry);
 
-    GrTMultiMap<GrResourceCacheEntry, GrResourceKey> fCache;
+    SkTMultiMap<GrResourceCacheEntry, GrResourceKey> fCache;
 
     // We're an internal doubly linked list
     typedef SkTInternalLList<GrResourceCacheEntry> EntryList;