[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zmo at google.com
zmo at google.com
Wed Dec 22 12:22:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ab3d30b1b9c6e086230cc16dea94c1a30de9444f
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 20 17:24:31 2010 +0000
2010-08-19 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Fix failing WebGL tests in Chromium in-process-webgl port
https://bugs.webkit.org/show_bug.cgi?id=44305
* src/WebGraphicsContext3DDefaultImpl.cpp:
(WebKit::WebGraphicsContext3DDefaultImpl::getVertexAttribOffset): Add implementation.
2010-08-19 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Fix failing WebGL tests in Chromium in-process-webgl port
https://bugs.webkit.org/show_bug.cgi?id=44305
* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: Add "#ifdef GLES" around precision keywords.
* fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt: Re-enable the failing tests.
* fast/canvas/webgl/gl-bind-attrib-location-test.html: Add "#ifdef GLES" around precision keywords.
* fast/canvas/webgl/read-pixels-pack-alignment-expected.txt: Ditto.
* fast/canvas/webgl/read-pixels-pack-alignment.html: Ditto.
* fast/canvas/webgl/resources/fragmentShader.frag: Ditto.
* fast/canvas/webgl/texImage2DImageDataTest.html: Ditto.
* fast/canvas/webgl/texture-active-bind.html: Ditto.
* fast/canvas/webgl/texture-complete.html: Ditto.
* fast/canvas/webgl/texture-transparent-pixels-initialized.html: Ditto.
* platform/chromium/test_expectations.txt: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65740 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b065c61..a80302b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-19 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Fix failing WebGL tests in Chromium in-process-webgl port
+ https://bugs.webkit.org/show_bug.cgi?id=44305
+
+ * fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: Add "#ifdef GLES" around precision keywords.
+ * fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt: Re-enable the failing tests.
+ * fast/canvas/webgl/gl-bind-attrib-location-test.html: Add "#ifdef GLES" around precision keywords.
+ * fast/canvas/webgl/read-pixels-pack-alignment-expected.txt: Ditto.
+ * fast/canvas/webgl/read-pixels-pack-alignment.html: Ditto.
+ * fast/canvas/webgl/resources/fragmentShader.frag: Ditto.
+ * fast/canvas/webgl/texImage2DImageDataTest.html: Ditto.
+ * fast/canvas/webgl/texture-active-bind.html: Ditto.
+ * fast/canvas/webgl/texture-complete.html: Ditto.
+ * fast/canvas/webgl/texture-transparent-pixels-initialized.html: Ditto.
+ * platform/chromium/test_expectations.txt: Ditto.
+
2010-08-20 Martin Robinson <mrobinson at igalia.com>
[GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
diff --git a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
index 3b7c354..d75de36 100644
--- a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
+++ b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
@@ -16,7 +16,10 @@ void main()
</script>
<script id="fshader" type="x-shader/x-fragment">
-varying highp vec4 color;
+#ifdef GL_ES
+precision highp float;
+#endif
+varying vec4 color;
void main()
{
diff --git a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt
index 74b7f23..514c673 100644
--- a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt
@@ -7,8 +7,8 @@ Canvas.getContext
PASS [object WebGLRenderingContext] is non-null.
Checking gl.bindAttribLocation.
-PASS bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'
-PASS bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'
+PASS getError was expected value: INVALID_OPERATION : bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'
+PASS getError was expected value: INVALID_OPERATION : bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'
PASS program linked successfully
vPosition:3
vColor :2
@@ -21,7 +21,7 @@ vColor :0
PASS location of vPositon should be 3
PASS location of vColor should be 0
PASS drawing is correct
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
index d76a81f..ca3e3c7 100644
--- a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
+++ b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
@@ -23,7 +23,10 @@ void main()
}
</script>
<script id="fshader" type="text/something-not-javascript">
-varying highp vec4 color;
+#ifdef GL_ES
+precision highp float;
+#endif
+varying vec4 color;
void main()
{
gl_FragColor = color;
@@ -84,11 +87,11 @@ debug("Checking gl.bindAttribLocation.");
var program = gl.createProgram();
gl.bindAttribLocation(program, 0, "gl_foo");
-assertMsg(gl.getError() == gl.INVALID_OPERATION,
- "bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'");
+glErrorShouldBe(gl, gl.INVALID_OPERATION,
+ "bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'");
gl.bindAttribLocation(program, 0, "gl_TexCoord0");
-assertMsg(gl.getError() == gl.INVALID_OPERATION,
- "bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'");
+glErrorShouldBe(gl, gl.INVALID_OPERATION,
+ "bindAttribLocation should return INVALID_OPERATION if name starts with 'gl_'");
var vs = loadShader(gl.VERTEX_SHADER, "vshader");
var fs = loadShader(gl.FRAGMENT_SHADER, "fshader");
@@ -183,7 +186,7 @@ gl.disableVertexAttribArray(0);
gl.vertexAttrib4f(0, 1, 0, 0, 1);
checkDraw(0, 3, 255, 0, 0, 255);
-shouldBe("gl.getError()", "gl.NO_ERROR");
+glErrorShouldBe(gl, gl.NO_ERROR);
debug("");
successfullyParsed = true;
diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
index 0fb094d..45b0b9a 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
@@ -4,219 +4,219 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS gl = initWebGL('example', 'vshader', 'fshader', [ 'pos', 'colorIn' ], [ 0, 0, 0, 1 ], 1) is non-null.
Check supported pixel format/type besides RGBA/UNSIGNED_BYTE
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS pixelFormat == gl.RGBA && pixelType == gl.UNSIGNED_BYTE is false
Testing format = RGBA and type = UNSIGNED_BYTE
Testing PACK_ALIGNMENT = 1, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 2, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 2, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 2, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 3, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 3, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 4, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 4, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 5, height = 1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 5, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 5, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 6, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 7, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 8, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,255 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 1, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 2, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 4, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 8, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 1, width = -1, height = 1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 2, width = 1, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 4, width = 0, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 8, width = -1, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing the other supported format/type combination
Testing PACK_ALIGNMENT = 1, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 2, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 1, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 2, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 2, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 3, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 3, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 4, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 4, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 5, height = 1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 4, width = 5, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 5, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 6, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 7, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 8, width = 8, height = 2
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
PASS 255,102,0,0 is non-null.
PASS pixel is expectedColor
Testing PACK_ALIGNMENT = 1, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 2, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 4, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 8, width = 0, height = 0
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.NO_ERROR
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: NO_ERROR :
Testing PACK_ALIGNMENT = 1, width = -1, height = 1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 2, width = 1, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 4, width = 0, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 8, width = -1, height = -1
-PASS gl.getError() is gl.NO_ERROR
-PASS gl.getError() is gl.INVALID_VALUE
+PASS getError was expected value: NO_ERROR :
+PASS getError was expected value: INVALID_VALUE :
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
index f8bd2fa..fd29b1c 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
@@ -16,7 +16,10 @@ void main()
</script>
<script id="fshader" type="x-shader/x-fragment">
-varying highp vec4 color;
+#ifdef GL_ES
+precision mediump float;
+#endif
+varying vec4 color;
void main()
{
@@ -156,7 +159,7 @@ function runTestIteration(format, type, packAlignment, width, height)
gl.clearColor(1, 0.4, 0, 1);
gl.clear(gl.COLOR_BUFFER_BIT);
gl.pixelStorei(gl.PACK_ALIGNMENT, packAlignment);
- shouldBe("gl.getError()", "gl.NO_ERROR");
+ glErrorShouldBe(gl, gl.NO_ERROR);
var bytesPerPixel = calculatePixelBytes(format, type);
var padding = calculatePaddingBytes(bytesPerPixel, packAlignment, width);
var size = bytesPerPixel * width * height + padding * (height - 1);
@@ -177,10 +180,10 @@ function runTestIteration(format, type, packAlignment, width, height)
array = new Uint16Array(size);
gl.readPixels(0, 0, width, height, format, type, array);
if (width < 0 || height < 0) {
- shouldBe("gl.getError()", "gl.INVALID_VALUE");
+ glErrorShouldBe(gl, gl.INVALID_VALUE);
return;
} else {
- shouldBe("gl.getError()", "gl.NO_ERROR");
+ glErrorShouldBe(gl, gl.NO_ERROR);
if (!array.length)
return;
}
@@ -204,10 +207,10 @@ function runTestIteration(format, type, packAlignment, width, height)
function checkSupportedPixelFormatAndType()
{
debug("Check supported pixel format/type besides RGBA/UNSIGNED_BYTE");
- shouldBe("gl.getError()", "gl.NO_ERROR");
+ glErrorShouldBe(gl, gl.NO_ERROR);
pixelFormat = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_FORMAT);
pixelType = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_TYPE);
- shouldBe("gl.getError()", "gl.NO_ERROR");
+ glErrorShouldBe(gl, gl.NO_ERROR);
shouldBeFalse("pixelFormat == gl.RGBA && pixelType == gl.UNSIGNED_BYTE");
}
diff --git a/LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag b/LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag
index c62e381..e863def 100644
--- a/LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag
+++ b/LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag
@@ -1,4 +1,7 @@
-varying highp vec3 v_normal;
+#ifdef GL_ES
+precision highp float;
+#endif
+varying vec3 v_normal;
void main()
{
diff --git a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
index e9173c7..0c5bc2b 100644
--- a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
+++ b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
@@ -15,8 +15,11 @@
</script>
<script id="fshader" type="x-shader/x-fragment">
+ #ifdef GL_ES
+ precision highp float;
+ #endif
uniform sampler2D tex;
- varying highp vec2 texCoord;
+ varying vec2 texCoord;
void main()
{
gl_FragColor = texture2D(tex, texCoord);
diff --git a/LayoutTests/fast/canvas/webgl/texture-active-bind.html b/LayoutTests/fast/canvas/webgl/texture-active-bind.html
index 8391b3c..2520004 100644
--- a/LayoutTests/fast/canvas/webgl/texture-active-bind.html
+++ b/LayoutTests/fast/canvas/webgl/texture-active-bind.html
@@ -25,8 +25,11 @@ void main()
</script>
<script id="fshader" type="x-shader/x-fragment">
+#ifdef GL_ES
+precision highp float;
+#endif
uniform sampler2D tex;
-varying highp vec2 texCoord;
+varying vec2 texCoord;
void main()
{
gl_FragColor = texture2D(tex, texCoord);
diff --git a/LayoutTests/fast/canvas/webgl/texture-complete.html b/LayoutTests/fast/canvas/webgl/texture-complete.html
index c3b15f7..d0bbda5 100644
--- a/LayoutTests/fast/canvas/webgl/texture-complete.html
+++ b/LayoutTests/fast/canvas/webgl/texture-complete.html
@@ -13,9 +13,12 @@
<div id="description"></div>
<div id="console"></div>
<script id="vshader" type="x-shader/x-vertex">
+#ifdef GL_ES
+precision highp float;
+#endif
attribute vec4 vPosition;
attribute vec2 texCoord0;
-varying highp vec2 texCoord;
+varying vec2 texCoord;
void main()
{
gl_Position = vPosition;
@@ -24,8 +27,11 @@ void main()
</script>
<script id="fshader" type="x-shader/x-fragment">
+#ifdef GL_ES
+precision highp float;
+#endif
uniform sampler2D tex;
-varying highp vec2 texCoord;
+varying vec2 texCoord;
void main()
{
gl_FragColor = texture2D(tex, texCoord);
diff --git a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html b/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html
index 9c9d117..91c3456 100644
--- a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html
+++ b/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html
@@ -17,8 +17,11 @@ void main()
</script>
<script id="fshader" type="x-shader/x-fragment">
+#ifdef GL_ES
+precision highp float;
+#endif
uniform sampler2D tex;
-varying highp vec2 texCoord;
+varying vec2 texCoord;
void main()
{
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 375b3d6..64e2c71 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3194,25 +3194,6 @@ BUGYUTAK WIN LINUX : svg/W3C-SVG-1.1/animate-elem-80-t.svg = TEXT
// This test causes the next one to run to ASSERT
BUGWK44079 DEBUG SKIP : fast/events/popup-allowed-from-gesture-initiated-form-submit.html = PASS
-// Probably due to r65449 or r65455.
-BUGWK44087 MAC : fast/canvas/webgl/draw-arrays-out-of-bounds.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/error-reporting.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/get-active-test.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/gl-bind-attrib-location-test.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/gl-object-get-calls.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/incorrect-context-object-behaviour.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/index-validation-copies-indices.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/index-validation-verifies-too-many-indices.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/index-validation.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/null-uniform-location.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/read-pixels-pack-alignment.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/texImage2DImageDataTest.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/texture-active-bind.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/texture-complete.html = TEXT
-BUGWK44087 MAC : fast/canvas/webgl/draw-elements-out-of-bounds.html = CRASH
-BUGWK44087 MAC : fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html = TIMEOUT
-BUGWK44087 MAC : fast/canvas/webgl/texture-transparent-pixels-initialized.html = TIMEOUT
-
// Due to http://trac.webkit.org/changeset/65511
BUGWK44118 : fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html = TEXT
BUGWK44118 : fast/dom/Geolocation/delayed-permission-denied-for-multiple-requests.html = TIMEOUT
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index aa07c45..15f8c70 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Fix failing WebGL tests in Chromium in-process-webgl port
+ https://bugs.webkit.org/show_bug.cgi?id=44305
+
+ * src/WebGraphicsContext3DDefaultImpl.cpp:
+ (WebKit::WebGraphicsContext3DDefaultImpl::getVertexAttribOffset): Add implementation.
+
2010-08-19 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index a863862..0153ba3 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -922,9 +922,10 @@ DELEGATE_TO_GL_3(getVertexAttribiv, GetVertexAttribiv, unsigned long, unsigned l
long WebGraphicsContext3DDefaultImpl::getVertexAttribOffset(unsigned long index, unsigned long pname)
{
- // FIXME: implement.
- notImplemented();
- return 0;
+ makeContextCurrent();
+ void* pointer;
+ glGetVertexAttribPointerv(index, pname, &pointer);
+ return reinterpret_cast<long>(pointer);
}
DELEGATE_TO_GL_2(hint, Hint, unsigned long, unsigned long)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list