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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 268655164cb3e1a0ca67e0f297a5c2126ed06515
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 16:21:00 2009 +0000

    2009-11-27  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Eric Seidel.
    
            REGRESSION(51418): fast/canvas/webgl/gl-object-get-calls.html is failing on the Leopard commit bot
            https://bugs.webkit.org/show_bug.cgi?id=31919
    
            Temporarily disabled portion of test which is failing on some
            machines but not others. Root cause will be investigated under
            https://bugs.webkit.org/show_bug.cgi?id=31843 .
    
            * fast/canvas/webgl/gl-object-get-calls-expected.txt:
            * fast/canvas/webgl/script-tests/gl-object-get-calls.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 97e5b3f..2339402 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-27  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION(51418): fast/canvas/webgl/gl-object-get-calls.html is failing on the Leopard commit bot
+        https://bugs.webkit.org/show_bug.cgi?id=31919
+
+        Temporarily disabled portion of test which is failing on some
+        machines but not others. Root cause will be investigated under
+        https://bugs.webkit.org/show_bug.cgi?id=31843 .
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
+        * fast/canvas/webgl/script-tests/gl-object-get-calls.js:
+
 2009-11-26  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Unreviewed red bot fix.
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 573bc72..4367541 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
@@ -7,7 +7,6 @@ PASS gl.getBufferParameter(gl.ARRAY_BUFFER, gl.BUFFER_USAGE) is gl.DYNAMIC_DRAW
 PASS gl.getError() is 0
 PASS gl.getError() is 0
 PASS gl.getError() is 0
-PASS gl.checkFramebufferStatus(gl.FRAMEBUFFER) is gl.FRAMEBUFFER_COMPLETE
 PASS gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) is gl.TEXTURE
 PASS gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) is non-null.
 PASS gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL) is 0
diff --git a/LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js b/LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js
index 2860076..340744d 100644
--- a/LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js
+++ b/LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js
@@ -36,7 +36,12 @@ shouldBe('gl.getError()', '0');
 gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT, 2, 2);
 shouldBe('gl.getError()', '0');
 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, renderbuffer);
-shouldBe('gl.checkFramebufferStatus(gl.FRAMEBUFFER)', 'gl.FRAMEBUFFER_COMPLETE');
+// FIXME: on some machines (in particular the WebKit commit bots) the
+// framebuffer status is FRAMEBUFFER_UNSUPPORTED; more investigation
+// is needed why this is the case, because the FBO allocated
+// internally by the WebKit implementation has almost identical
+// parameters to this one. See https://bugs.webkit.org/show_bug.cgi?id=31843.
+//shouldBe('gl.checkFramebufferStatus(gl.FRAMEBUFFER)', 'gl.FRAMEBUFFER_COMPLETE');
 shouldBe('gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE)', 'gl.TEXTURE');
 shouldBeNonNull('gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME)');
 shouldBe('gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL)', '0');

-- 
WebKit Debian packaging