[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zmo at google.com]

The following commit has been merged in the debian/experimental branch:
commit f4db65bd245eedf24f784939677abad4ddc291cb
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 21:01:45 2010 +0000

    2010-10-28  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
            https://bugs.webkit.org/show_bug.cgi?id=47568
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::getUniform):
    2010-10-28  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
            https://bugs.webkit.org/show_bug.cgi?id=47568
    
            * fast/canvas/webgl/gl-object-get-calls-expected.txt:
            * fast/canvas/webgl/gl-object-get-calls.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6bfe1b5..1748035 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
+        https://bugs.webkit.org/show_bug.cgi?id=47568
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
+        * fast/canvas/webgl/gl-object-get-calls.html:
+
 2010-11-02  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt b/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
index f83b2c8..2e2fcc5 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
@@ -52,9 +52,9 @@ PASS gl.getTexParameter(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T) is gl.CLAMP_TO_EDGE
 PASS gl.getProgramParameter(boolProgram, gl.LINK_STATUS) is true
 PASS getError was expected value: NO_ERROR : 
 PASS gl.getUniform(boolProgram, bvalLoc) is true
-PASS gl.getUniform(boolProgram, bval2Loc) is [1, 0]
-PASS gl.getUniform(boolProgram, bval3Loc) is [1, 0, 1]
-PASS gl.getUniform(boolProgram, bval4Loc) is [1, 0, 1, 0]
+PASS gl.getUniform(boolProgram, bval2Loc) is [true, false]
+PASS gl.getUniform(boolProgram, bval3Loc) is [true, false, true]
+PASS gl.getUniform(boolProgram, bval4Loc) is [true, false, true, false]
 PASS gl.getProgramParameter(intProgram, gl.LINK_STATUS) is true
 PASS getError was expected value: NO_ERROR : 
 PASS gl.getUniform(intProgram, ivalLoc) is 1
diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
index 9832a69..8a6db34 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
@@ -150,9 +150,9 @@ gl.uniform3i(bval3Loc, 1, 0, 1);
 gl.uniform4i(bval4Loc, 1, 0, 1, 0);
 glErrorShouldBe(gl, gl.NO_ERROR);
 shouldBe('gl.getUniform(boolProgram, bvalLoc)', 'true');
-shouldBe('gl.getUniform(boolProgram, bval2Loc)', '[1, 0]');
-shouldBe('gl.getUniform(boolProgram, bval3Loc)', '[1, 0, 1]');
-shouldBe('gl.getUniform(boolProgram, bval4Loc)', '[1, 0, 1, 0]');
+shouldBe('gl.getUniform(boolProgram, bval2Loc)', '[true, false]');
+shouldBe('gl.getUniform(boolProgram, bval3Loc)', '[true, false, true]');
+shouldBe('gl.getUniform(boolProgram, bval4Loc)', '[true, false, true, false]');
 // Integer uniform variables
 var intProgram = loadProgram(gl, "resources/intUniformShader.vert", "resources/noopUniformShader.frag");
 shouldBe('gl.getProgramParameter(intProgram, gl.LINK_STATUS)', 'true');
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf7321d..1ec2c30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
+        https://bugs.webkit.org/show_bug.cgi?id=47568
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getUniform):
+
 2010-11-02  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 6b0b5fa..fd76d5a 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -1755,20 +1755,20 @@ WebGLGetInfo WebGLRenderingContext::getUniform(WebGLProgram* program, const WebG
                     return WebGLGetInfo(Float32Array::create(value, length));
                 }
                 case GraphicsContext3D::INT: {
-                    int value[16] = {0};
+                    int value[4] = {0};
                     m_context->getUniformiv(objectOrZero(program), location, value);
                     if (length == 1)
                         return WebGLGetInfo(static_cast<long>(value[0]));
                     return WebGLGetInfo(Int32Array::create(value, length));
                 }
                 case GraphicsContext3D::BOOL: {
-                    int value[16] = {0};
+                    int value[4] = {0};
                     m_context->getUniformiv(objectOrZero(program), location, value);
                     if (length > 1) {
-                        unsigned char boolValue[16] = {0};
+                        bool boolValue[16] = {0};
                         for (unsigned j = 0; j < length; j++)
                             boolValue[j] = static_cast<bool>(value[j]);
-                        return WebGLGetInfo(Uint8Array::create(boolValue, length));
+                        return WebGLGetInfo(boolValue, length);
                     }
                     return WebGLGetInfo(static_cast<bool>(value[0]));
                 }

-- 
WebKit Debian packaging