Remove uses of wtf/HashSet in cc

Remove uses of wtf/HashSet in cc


BUG=154451
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161271

[ccameron, 2012-10-08 22:53:44]

lgtm

Do explain the comparator thing though.

https://codereview.chromium.org/11098005/diff/1/cc/CCPrioritizedTextureManager.h
File cc/CCPrioritizedTextureManager.h (right):

https://codereview.chromium.org/11098005/diff/1/cc/CCPrioritizedTextureManage...
cc/CCPrioritizedTextureManager.h:28: #endif // COMPILER
What happens if we don't have this?  I thought there existed a default pointer
comparator.

[jamesr, 2012-10-08 22:59:56]

On 2012/10/08 22:53:44, ccameron1 wrote:
> lgtm
> 
> Do explain the comparator thing though.
> 
>
https://codereview.chromium.org/11098005/diff/1/cc/CCPrioritizedTextureManager.h
> File cc/CCPrioritizedTextureManager.h (right):
> 
>
https://codereview.chromium.org/11098005/diff/1/cc/CCPrioritizedTextureManage...
> cc/CCPrioritizedTextureManager.h:28: #endif // COMPILER
> What happens if we don't have this?  I thought there existed a default pointer
> comparator.

From base/hash_tables.h:

// NOTE: It is an explicit non-goal of this class to provide a generic hash
// function for pointers.  If you want to hash a pointers to a particular class,
// please define the template specialization elsewhere (for example, in its
// header file) and keep it specific to just pointers to that class.  This is
// because identity hashes are not desirable for all types that might show up
// in containers as pointers.



Presumably, some hash_(map|set)s of pointers have non-uniform address
distribution or something like that.  I don't think we have any specialized
needs for this container.

[commit-bot: I haz the power, 2012-10-09 20:16:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11098005/1

[commit-bot: I haz the power, 2012-10-09 20:48:16]

Sorry for I got bad news for ya.
Compile failed with a clobber build.
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-10 17:21:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11098005/2011

[commit-bot: I haz the power, 2012-10-10 17:21:30]

Failed to apply patch for cc/CCPrioritizedTextureManager.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/CCPrioritizedTextureManager.h
  Hunk #1 FAILED at 6.
  Hunk #2 succeeded at 126 (offset 1 line).
  1 out of 2 hunks FAILED -- saving rejects to file
cc/CCPrioritizedTextureManager.h.rej

Patch:       cc/CCPrioritizedTextureManager.h
Index: cc/CCPrioritizedTextureManager.h
diff --git a/cc/CCPrioritizedTextureManager.h b/cc/CCPrioritizedTextureManager.h
index
88a4f45fcfb176186078e1ce0db5b425e4daf285..e788ffb8c9fa457d7d7a10479b4333563061b868
100644
--- a/cc/CCPrioritizedTextureManager.h
+++ b/cc/CCPrioritizedTextureManager.h
@@ -6,19 +6,29 @@
 #define CCPrioritizedTextureManager_h
 
 #include "base/basictypes.h"
+#include "base/hash_tables.h"
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
 #include "CCTexture.h"
 #include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
-#include <wtf/HashSet.h>
 #include <wtf/ListHashSet.h>
 #include <wtf/Vector.h>
 
+#if defined(COMPILER_GCC)
+namespace BASE_HASH_NAMESPACE {
+template<>
+struct hash<cc::CCPrioritizedTexture*> {
+  size_t operator()(cc::CCPrioritizedTexture* ptr) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(ptr));
+  }
+};
+} // namespace BASE_HASH_NAMESPACE
+#endif // COMPILER
+
 namespace cc {
 
-class CCPrioritizedTexture;
 class CCPriorityCalculator;
 
 class CCPrioritizedTextureManager {
@@ -125,7 +135,7 @@ private:
     size_t m_memoryAvailableBytes;
     int m_pool;
 
-    typedef HashSet<CCPrioritizedTexture*> TextureSet;
+    typedef base::hash_set<CCPrioritizedTexture*> TextureSet;
     typedef ListHashSet<CCPrioritizedTexture::Backing*> BackingSet;
     typedef Vector<CCPrioritizedTexture*> TextureVector;

[commit-bot: I haz the power, 2012-10-11 01:10:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11098005/2012

[commit-bot: I haz the power, 2012-10-11 02:35:48]

Change committed as 161271