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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 373411592e1049156766f163434b01f6ca408ad4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 08:58:40 2010 +0000

    2010-11-09  Adrienne Walker  <enne at google.com>
    
            Reviewed by Andreas Kling.
    
            getAttachedShaders should only return NULL in the case of error.
            https://bugs.webkit.org/show_bug.cgi?id=49231
    
            * 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@71615 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4049459..a7e47ac 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09  Adrienne Walker  <enne at google.com>
+
+        Reviewed by Andreas Kling.
+
+        getAttachedShaders should only return NULL in the case of error.
+        https://bugs.webkit.org/show_bug.cgi?id=49231
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
+        * fast/canvas/webgl/gl-object-get-calls.html:
+
 2010-11-09  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed Chromium rebaselines for r71566.
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 fe32b5a..49a4c76 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
@@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS shaders.length is 2
 PASS shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag is true
 PASS getError was expected value: NO_ERROR : 
-PASS gl.getAttachedShaders(null) == undefined is true
+PASS gl.getAttachedShaders(null) is null
 PASS getError was expected value: INVALID_VALUE : 
 PASS gl.getAttachedShaders(standardVert) threw exception TypeError: Type error.
 PASS getError was expected value: NO_ERROR : 
diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
index 56439db..cdddefe 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
@@ -40,7 +40,7 @@ var shaders = gl.getAttachedShaders(standardProgram);
 shouldBe('shaders.length', '2');
 shouldBeTrue('shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag');
 glErrorShouldBe(gl, gl.NO_ERROR);
-shouldBeTrue('gl.getAttachedShaders(null) == undefined');
+shouldBeNull('gl.getAttachedShaders(null)');
 glErrorShouldBe(gl, gl.INVALID_VALUE);
 shouldThrow('gl.getAttachedShaders(standardVert)');
 glErrorShouldBe(gl, gl.NO_ERROR);

-- 
WebKit Debian packaging