webkit_unit_tests crashing on chromium lion in CCLayerTreeHostTestCompositeAndReadbac...

https://bugs.webkit.org/show_bug.cgi?id=82382

Patch by James Robinson <jamesr@chromium.org> on 2012-03-27
Reviewed by Adrienne Walker.

Use UnsignedWithZeroKeyHashTraits trait for the HashSet<WebGLId> m_usedTextures in
CompositorFakeWebGraphicsContext3DWithTextureTracking. This set is used to track all textures that are bound in
a given context during a test. During ..CompositeAndReadback.. we bind texture id 0. By default, HashSet<T>
where T is an unsigned does not allow 0 as a value. WebGLId is typedef'd to unsigned.

* tests/CCLayerTreeHostTest.cpp:
(CompositorFakeWebGraphicsContext3DWithTextureTracking):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 739d475..47b6740 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,5 +1,20 @@
 2012-03-27  James Robinson  <jamesr@chromium.org>
 
+        webkit_unit_tests crashing on chromium lion in CCLayerTreeHostTestCompositeAndReadbackWhileInvisible
+        https://bugs.webkit.org/show_bug.cgi?id=82382
+
+        Reviewed by Adrienne Walker.
+
+        Use UnsignedWithZeroKeyHashTraits trait for the HashSet<WebGLId> m_usedTextures in
+        CompositorFakeWebGraphicsContext3DWithTextureTracking. This set is used to track all textures that are bound in
+        a given context during a test. During ..CompositeAndReadback.. we bind texture id 0. By default, HashSet<T>
+        where T is an unsigned does not allow 0 as a value. WebGLId is typedef'd to unsigned.
+
+        * tests/CCLayerTreeHostTest.cpp:
+        (CompositorFakeWebGraphicsContext3DWithTextureTracking):
+
+2012-03-27  James Robinson  <jamesr@chromium.org>
+
         webkit_unit_tests crashing on chromium lion in ScrollbarLayerChromiumTest.resolveScrollLayerPointer
         https://bugs.webkit.org/show_bug.cgi?id=82381
 

diff --git a/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp b/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp
index 28b38e3..a74e4ca 100644 (file)
--- a/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp
+++ b/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp
@@ -209,7 +209,7 @@ private:
     }
 
     Vector<WebGLId> m_textures;
-    HashSet<WebGLId> m_usedTextures;
+    HashSet<WebGLId, DefaultHash<WebGLId>::Hash, UnsignedWithZeroKeyHashTraits<WebGLId> > m_usedTextures;
 };
 
 // Implementation of CCLayerTreeHost callback interface.