[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 854af0f2d19399d087c958c1b44bc27ad01b5b26
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 00:26:05 2010 +0000

    2010-11-03  Adrienne Walker  <enne at google.com>
    
            Reviewed by Kenneth Russell.
    
            Properly return empty strings instead of null when using invalid
            objects for some WebGL calls.  This fixes issues caused by r71274.
            https://bugs.webkit.org/show_bug.cgi?id=48962
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::getProgramInfoLog):
            (WebCore::WebGLRenderingContext::getShaderInfoLog):
            (WebCore::WebGLRenderingContext::getShaderSource):
    2010-11-03  Adrienne Walker  <enne at google.com>
    
            Reviewed by Kenneth Russell.
    
            WebGL spec doesn't specify whether the return from getAttachedShaders
            can be undefined or null.  Tolerate both.
            https://bugs.webkit.org/show_bug.cgi?id=48962
    
            * 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@71289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 40de942..7fe94da 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-03  Adrienne Walker  <enne at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        WebGL spec doesn't specify whether the return from getAttachedShaders
+        can be undefined or null.  Tolerate both.
+        https://bugs.webkit.org/show_bug.cgi?id=48962
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
+        * fast/canvas/webgl/gl-object-get-calls.html:
+
 2010-10-29  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
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 2e2fcc5..bab5eff 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) is undefined.
+PASS gl.getAttachedShaders(null) == undefined is true
 PASS getError was expected value: INVALID_VALUE : 
 PASS gl.getAttachedShaders(standardVert) threw exception TypeError: Type error.
 PASS getError was expected value: NO_ERROR : 
@@ -90,4 +90,3 @@ PASS getError was expected value: NO_ERROR :
 PASS successfullyParsed is true
 
 TEST COMPLETE
-
diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
index 8a6db34..56439db 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);
-shouldBeUndefined('gl.getAttachedShaders(null)');
+shouldBeTrue('gl.getAttachedShaders(null) == undefined');
 glErrorShouldBe(gl, gl.INVALID_VALUE);
 shouldThrow('gl.getAttachedShaders(standardVert)');
 glErrorShouldBe(gl, gl.NO_ERROR);
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2d9df14..4f85e64 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-03  Adrienne Walker  <enne at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Properly return empty strings instead of null when using invalid
+        objects for some WebGL calls.  This fixes issues caused by r71274.
+        https://bugs.webkit.org/show_bug.cgi?id=48962
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getProgramInfoLog):
+        (WebCore::WebGLRenderingContext::getShaderInfoLog):
+        (WebCore::WebGLRenderingContext::getShaderSource):
+
 2010-11-01  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 4270728..8417d35 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -1630,8 +1630,10 @@ WebGLGetInfo WebGLRenderingContext::getProgramParameter(WebGLProgram* program, u
 String WebGLRenderingContext::getProgramInfoLog(WebGLProgram* program, ExceptionCode& ec)
 {
     UNUSED_PARAM(ec);
-    if (isContextLost() || !validateWebGLObject(program))
+    if (isContextLost())
         return String();
+    if (!validateWebGLObject(program))
+        return "";
     WebGLStateRestorer(this, false);
     return m_context->getProgramInfoLog(objectOrZero(program));
 }
@@ -1699,8 +1701,10 @@ WebGLGetInfo WebGLRenderingContext::getShaderParameter(WebGLShader* shader, unsi
 String WebGLRenderingContext::getShaderInfoLog(WebGLShader* shader, ExceptionCode& ec)
 {
     UNUSED_PARAM(ec);
-    if (isContextLost() || !validateWebGLObject(shader))
+    if (isContextLost())
         return String();
+    if (!validateWebGLObject(shader))
+        return "";
     WebGLStateRestorer(this, false);
     return m_context->getShaderInfoLog(objectOrZero(shader));
 }
@@ -1708,8 +1712,10 @@ String WebGLRenderingContext::getShaderInfoLog(WebGLShader* shader, ExceptionCod
 String WebGLRenderingContext::getShaderSource(WebGLShader* shader, ExceptionCode& ec)
 {
     UNUSED_PARAM(ec);
-    if (isContextLost() || !validateWebGLObject(shader))
+    if (isContextLost())
         return String();
+    if (!validateWebGLObject(shader))
+        return "";
     WebGLStateRestorer(this, false);
     return m_context->getShaderSource(objectOrZero(shader));
 }

-- 
WebKit Debian packaging