[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:42:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e1e842ff242792fe1fdb9cdd3d851e7378d80b3e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 10 18:37:33 2010 +0000
2010-11-10 Adrienne Walker <enne at google.com>
Reviewed by Kenneth Russell.
Add a test for "is" tests on WebGL objects that have not been bound or
have been deleted. This currently does not work in the Chromium
command buffer or in Mesa, so is skipped there.
https://bugs.webkit.org/show_bug.cgi?id=48877
* fast/canvas/webgl/is-object-expected.txt: Added.
* fast/canvas/webgl/is-object.html: Added.
* platform/chromium-gpu/test_expectations.txt:
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 118ab5a..8ec10de 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-10 Adrienne Walker <enne at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Add a test for "is" tests on WebGL objects that have not been bound or
+ have been deleted. This currently does not work in the Chromium
+ command buffer or in Mesa, so is skipped there.
+ https://bugs.webkit.org/show_bug.cgi?id=48877
+
+ * fast/canvas/webgl/is-object-expected.txt: Added.
+ * fast/canvas/webgl/is-object.html: Added.
+ * platform/chromium-gpu/test_expectations.txt:
+ * platform/chromium/test_expectations.txt:
+
2010-11-10 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/LayoutTests/fast/canvas/webgl/is-object-expected.txt b/LayoutTests/fast/canvas/webgl/is-object-expected.txt
new file mode 100644
index 0000000..1f7e292
--- /dev/null
+++ b/LayoutTests/fast/canvas/webgl/is-object-expected.txt
@@ -0,0 +1,38 @@
+Tests 'is' calls against non-bound and deleted objects
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS buffer = gl.createBuffer() was expected value: NO_ERROR.
+PASS gl.isBuffer(buffer) is false
+PASS gl.bindBuffer(gl.ARRAY_BUFFER, buffer) was expected value: NO_ERROR.
+PASS gl.isBuffer(buffer) is true
+
+PASS framebuffer = gl.createFramebuffer() was expected value: NO_ERROR.
+PASS gl.isFramebuffer(framebuffer) is false
+PASS gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer) was expected value: NO_ERROR.
+PASS gl.isFramebuffer(framebuffer) is true
+
+PASS renderbuffer = gl.createRenderbuffer() was expected value: NO_ERROR.
+PASS gl.isRenderbuffer(renderbuffer) is false
+PASS gl.bindRenderbuffer(gl.RENDERBUFFER, renderbuffer) was expected value: NO_ERROR.
+PASS gl.isRenderbuffer(renderbuffer) is true
+
+PASS texture = gl.createTexture() was expected value: NO_ERROR.
+PASS gl.isTexture(texture) is false
+PASS gl.bindTexture(gl.TEXTURE_2D, texture) was expected value: NO_ERROR.
+PASS gl.isTexture(texture) is true
+
+PASS program = gl.createProgram() was expected value: NO_ERROR.
+PASS gl.isProgram(program) is true
+PASS gl.deleteProgram(program) was expected value: NO_ERROR.
+PASS gl.isProgram(program) is false
+
+PASS shader = gl.createShader(gl.VERTEX_SHADER) was expected value: NO_ERROR.
+PASS gl.isShader(shader) is true
+PASS gl.deleteShader(shader) was expected value: NO_ERROR.
+PASS gl.isShader(shader) is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/canvas/webgl/is-object.html b/LayoutTests/fast/canvas/webgl/is-object.html
new file mode 100644
index 0000000..ccfb9ae
--- /dev/null
+++ b/LayoutTests/fast/canvas/webgl/is-object.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
+<script src="../../js/resources/js-test-pre.js"></script>
+<script src="resources/webgl-test.js"></script>
+<script src="resources/webgl-test-utils.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<canvas id="canvas">
+<script>
+var wtu;
+var canvas;
+var gl;
+var shouldGenerateGLError;
+
+var buffer;
+var framebuffer;
+var program;
+var renderbuffer;
+var shader;
+var texture;
+
+description("Tests 'is' calls against non-bound and deleted objects");
+
+wtu = WebGLTestUtils;
+canvas = document.getElementById("canvas");
+gl = wtu.create3DContext(canvas);
+shouldGenerateGLError = wtu.shouldGenerateGLError;
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "buffer = gl.createBuffer()");
+shouldBeFalse("gl.isBuffer(buffer)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.bindBuffer(gl.ARRAY_BUFFER, buffer)");
+shouldBeTrue("gl.isBuffer(buffer)");
+debug("");
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "framebuffer = gl.createFramebuffer()");
+shouldBeFalse("gl.isFramebuffer(framebuffer)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer)");
+shouldBeTrue("gl.isFramebuffer(framebuffer)");
+debug("");
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "renderbuffer = gl.createRenderbuffer()");
+shouldBeFalse("gl.isRenderbuffer(renderbuffer)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.bindRenderbuffer(gl.RENDERBUFFER, renderbuffer)");
+shouldBeTrue("gl.isRenderbuffer(renderbuffer)");
+debug("");
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "texture = gl.createTexture()");
+shouldBeFalse("gl.isTexture(texture)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.bindTexture(gl.TEXTURE_2D, texture)");
+shouldBeTrue("gl.isTexture(texture)");
+debug("");
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "program = gl.createProgram()");
+shouldBeTrue("gl.isProgram(program)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.deleteProgram(program)");
+shouldBeFalse("gl.isProgram(program)");
+debug("");
+
+shouldGenerateGLError(gl, gl.NO_ERROR, "shader = gl.createShader(gl.VERTEX_SHADER)");
+shouldBeTrue("gl.isShader(shader)");
+shouldGenerateGLError(gl, gl.NO_ERROR, "gl.deleteShader(shader)");
+shouldBeFalse("gl.isShader(shader)");
+debug("");
+
+successfullyParsed = true;
+</script>
+<script src="../../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index 494b213..49d403c 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -194,6 +194,7 @@ BUGWEBGL : fast/canvas/webgl/css-webkit-canvas.html = IMAGE
BUGWEBGL WIN MAC : fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html = TEXT PASS
BUGWEBGL : fast/canvas/webgl/gl-uniform-arrays.html = TEXT
BUGWEBGL : fast/canvas/webgl/point-size.html = TEXT
+BUGWEBGL : fast/canvas/webgl/is-object.html = TEXT
BUG60651 : fast/canvas/webgl/gl-object-get-calls.html = TEXT PASS
BUG60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
// BUG60651 : fast/canvas/webgl/uniform-location.html = TIMEOUT FAIL
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index d2fd620..3c9339f 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2963,6 +2963,8 @@ BUGWEBGL WIN MAC : fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html
// These three failures are due to Mesa bugs
BUGWEBGL : fast/canvas/webgl/gl-uniform-arrays.html = TEXT
BUGWEBGL : fast/canvas/webgl/point-size.html = TEXT
+// http://bugs.freedesktop.org/show_bug.cgi?id=31514
+BUGWEBGL : fast/canvas/webgl/is-object.html = TEXT
// These were not fixed by the Mesa 7.9 upgrade. Need to investigate.
BUG60651 WIN DEBUG : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT PASS
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list