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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit aa097f7410ff3147a3136ffe303da683b6d23a77
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 21:05:27 2010 +0000

    2010-07-15  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Nate Chapin.
    
            Query of NUM_COMPRESSED_TEXTURE_FORMATS must be handled by WebGL
            https://bugs.webkit.org/show_bug.cgi?id=42401
    
            No new tests; covered by gl-get-calls.html.
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::getParameter):
             - Return 0 for getParameter(NUM_COMPRESSED_TEXTURE_FORMATS).
    2010-07-15  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Nate Chapin.
    
            Query of NUM_COMPRESSED_TEXTURE_FORMATS must be handled by WebGL
            https://bugs.webkit.org/show_bug.cgi?id=42401
    
            * fast/canvas/webgl/gl-get-calls-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eb41c14..8127d99 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-15  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Nate Chapin.
+
+        Query of NUM_COMPRESSED_TEXTURE_FORMATS must be handled by WebGL
+        https://bugs.webkit.org/show_bug.cgi?id=42401
+
+        * fast/canvas/webgl/gl-get-calls-expected.txt:
+
 2010-07-15  Simon Fraser  <simon.fraser at apple.com>
 
         Fix results of two tests that are affected by r63452.
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
index 92cc038..f13c1a4 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
@@ -70,7 +70,7 @@ PASS context.getParameter(context.VIEWPORT) is [0, 0, 2, 2]
 PASS context.getParameter(context.MAX_FRAGMENT_UNIFORM_VECTORS) >= 16 is true
 PASS context.getParameter(context.MAX_VERTEX_UNIFORM_VECTORS) >= 128 is true
 PASS context.getParameter(context.MAX_VARYING_VECTORS) >= 8 is true
-FAIL context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS) should be 0. Was 4.
+PASS context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS) is 0
 FAIL context.getParameter(context.SHADER_COMPILER) should be true (of type boolean). Was null (of type object).
 
 PASS successfullyParsed is true
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f34d77d..114b3a2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-15  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Nate Chapin.
+
+        Query of NUM_COMPRESSED_TEXTURE_FORMATS must be handled by WebGL
+        https://bugs.webkit.org/show_bug.cgi?id=42401
+
+        No new tests; covered by gl-get-calls.html.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getParameter):
+         - Return 0 for getParameter(NUM_COMPRESSED_TEXTURE_FORMATS).
+
 2010-07-07  John Gregg  <johnnyg at google.com>
 
         Reviewed by Jian Li.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index a09e3ae..2bbcad1 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -1390,7 +1390,8 @@ WebGLGetInfo WebGLRenderingContext::getParameter(unsigned long pname, ExceptionC
     case GraphicsContext3D::MAX_VIEWPORT_DIMS:
         return getWebGLIntArrayParameter(pname);
     case GraphicsContext3D::NUM_COMPRESSED_TEXTURE_FORMATS:
-        return getLongParameter(pname);
+        // WebGL 1.0 specifies that there are no compressed texture formats.
+        return WebGLGetInfo(static_cast<long>(0));
     case GraphicsContext3D::NUM_SHADER_BINARY_FORMATS:
         // FIXME: should we always return 0 for this?
         return getLongParameter(pname);

-- 
WebKit Debian packaging