Changeset 112356 in webkit

Timestamp:

Mar 27, 2012 7:29:21 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

webkit_unit_tests crashing on chromium lion in CCLayerTreeHostTestCompositeAndReadbackWhileInvisible
​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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/CCLayerTreeHostTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

@@ -210 +210 @@
 
     Vector<WebGLId> m_textures;
-    HashSet<WebGLId> m_usedTextures;
+    HashSet<WebGLId, DefaultHash<WebGLId>::Hash, UnsignedWithZeroKeyHashTraits<WebGLId> > m_usedTextures;
 };