[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4ca6fdfd5e29c90940fbc3e34b179ce5168aadee
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 23:51:00 2010 +0000

            Fixed a bug in testcase. Passing an empty array to texImage2D
            now must be done with 'null' not '0'.
    
            * fast/canvas/webgl/script-tests/texImageTest.js:
            * fast/canvas/webgl/texImageTest-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52835 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6fd41f4..d4201a8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-05  Chris Marrin  <cmarrin at apple.com>
+
+        Fixed a bug in testcase. Passing an empty array to texImage2D
+        now must be done with 'null' not '0'.
+
+        * fast/canvas/webgl/script-tests/texImageTest.js:
+        * fast/canvas/webgl/texImageTest-expected.txt:
+
 2010-01-05  Rachel Petterson  <rlp at google.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js b/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js
index 51bfd35..8fcaee4 100644
--- a/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js
+++ b/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js
@@ -9,7 +9,7 @@ var imageData = context2d.createImageData(64, 64);
 var array = new WebGLUnsignedByteArray([ 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 255 ]);
 
 shouldThrow("context.texImage2D(context.TEXTURE_2D)");
-shouldBeUndefined("context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 64, 64, 0, context.RGBA, context.UNSIGNED_BYTE, 0)");
+shouldBeUndefined("context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 64, 64, 0, context.RGBA, context.UNSIGNED_BYTE, null)");
 shouldThrow("context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 0, context.RGBA, context.UNSIGNED_BYTE, 0)");
 shouldBeUndefined("context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 2, 2, 0, context.RGBA, context.UNSIGNED_BYTE, array)");
 shouldBeUndefined("context.texImage2D(context.TEXTURE_2D, 0, imageData, true)");
diff --git a/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt b/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt
index 7761958..17bc77d 100644
--- a/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt
@@ -3,7 +3,7 @@ Test of texImage2d and texSubImage2d
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 PASS context.texImage2D(context.TEXTURE_2D) threw exception SyntaxError: Syntax error.
-PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 64, 64, 0, context.RGBA, context.UNSIGNED_BYTE, 0) is undefined.
+PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 64, 64, 0, context.RGBA, context.UNSIGNED_BYTE, null) is undefined.
 PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 0, context.RGBA, context.UNSIGNED_BYTE, 0) threw exception SyntaxError: Syntax error.
 PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 2, 2, 0, context.RGBA, context.UNSIGNED_BYTE, array) is undefined.
 PASS context.texImage2D(context.TEXTURE_2D, 0, imageData, true) is undefined.

-- 
WebKit Debian packaging