commit 4c2af7407818f6f2d4e4b57da6bbca16524e04b9
author mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 21:04:06 2013 +0000
committer mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 21:04:06 2013 +0000
tree 4c9f04137d3a94e872d5248fe1dca6c240561b37
parent 5ee18dd20192d020884a95c7991c63ce33af3137

GrTHashCache -> GrTHashTable

The class is Table, but the file's Cache.  That's confusing.

BUG=
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@11898 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/gpu.gypi

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 6069120..16f5369 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -124,7 +124,7 @@
       '<(skia_src_path)/gpu/GrTextStrike_impl.h',
       '<(skia_src_path)/gpu/GrTexture.cpp',
       '<(skia_src_path)/gpu/GrTextureAccess.cpp',
-      '<(skia_src_path)/gpu/GrTHashCache.h',
+      '<(skia_src_path)/gpu/GrTHashTable.h',
       '<(skia_src_path)/gpu/GrVertexBuffer.h',
       '<(skia_src_path)/gpu/gr_unittests.cpp',
 

src/gpu/GrResourceCache.h

diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h
index 5df17de..a9adf91 100644
--- a/src/gpu/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
@@ -13,7 +13,7 @@
 
 #include "GrConfig.h"
 #include "GrTypes.h"
-#include "GrTHashCache.h"
+#include "GrTHashTable.h"
 #include "GrBinHashKey.h"
 #include "SkTInternalLList.h"
 
@@ -186,8 +186,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "GrTHashCache.h"
-
 /**
  *  Cache of GrResource objects.
  *

src/gpu/GrTHashTable.h

diff --git a/src/gpu/GrTHashCache.h b/src/gpu/GrTHashTable.h
similarity index 98%
rename from src/gpu/GrTHashCache.h
rename to src/gpu/GrTHashTable.h
index a9b4918..803a680 100644
--- a/src/gpu/GrTHashCache.h
+++ b/src/gpu/GrTHashTable.h
@@ -8,8 +8,8 @@
 
 
 
-#ifndef GrTHashCache_DEFINED
-#define GrTHashCache_DEFINED
+#ifndef GrTHashTable_DEFINED
+#define GrTHashTable_DEFINED
 
 #include "GrTypes.h"
 #include "SkTDArray.h"

src/gpu/GrTextStrike.h

diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h
index 3d5bfdc..3917d37 100644
--- a/src/gpu/GrTextStrike.h
+++ b/src/gpu/GrTextStrike.h
@@ -13,7 +13,7 @@
 
 #include "GrAllocPool.h"
 #include "GrFontScaler.h"
-#include "GrTHashCache.h"
+#include "GrTHashTable.h"
 #include "GrPoint.h"
 #include "GrGlyph.h"
 #include "GrDrawTarget.h"

src/gpu/effects/GrTextureStripAtlas.h

diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h
index d8850f9..e56e736 100644
--- a/src/gpu/effects/GrTextureStripAtlas.h
+++ b/src/gpu/effects/GrTextureStripAtlas.h
@@ -9,7 +9,7 @@
 #define GrTextureStripAtlas_DEFINED
 
 #include "GrBinHashKey.h"
-#include "GrTHashCache.h"
+#include "GrTHashTable.h"
 #include "SkBitmap.h"
 #include "SkGr.h"
 #include "SkTDArray.h"

src/gpu/gl/GrGpuGL.h

diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 5ff34ae..2a0587b 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -19,8 +19,8 @@
 #include "GrGLVertexArray.h"
 #include "GrGLVertexBuffer.h"
 #include "GrGpu.h"
+#include "GrTHashTable.h"
 #include "SkTypes.h"
-#include "../GrTHashCache.h"
 
 #ifdef SK_DEVELOPER
 #define PROGRAM_CACHE_STATS

tests/HashCacheTest.cpp

diff --git a/tests/HashCacheTest.cpp b/tests/HashCacheTest.cpp
index 2733447..ae26f3b 100644
--- a/tests/HashCacheTest.cpp
+++ b/tests/HashCacheTest.cpp
@@ -10,7 +10,7 @@
 
 // This is a GR test
 #if SK_SUPPORT_GPU
-#include "GrTHashCache.h"
+#include "GrTHashTable.h"
 
 struct HashElement {
     int     fKey;