diff options
Diffstat (limited to 'webkit')
5 files changed, 143 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt new file mode 100644 index 0000000..8cadd2d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt @@ -0,0 +1,70 @@ +This test ensures basic functionality of the underlying graphics library + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +Canvas.getContext +PASS context exists + +Context is correct type +PASS context is correct type + +Context contains getError +PASS context contains getError + +Check default values +PASS context.getParameter(context.ACTIVE_TEXTURE) is context.TEXTURE0 +PASS (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[0] == 1) || (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[1] == 1) is true +PASS (context.getParameter(context.ALIASED_POINT_SIZE_RANGE)[0] == 1) || (context.getParameter(context.ALIASED_POINT_SIZE_RANGE)[1] == 1) is true +PASS context.getParameter(context.ARRAY_BUFFER_BINDING) is null +PASS context.getParameter(context.BLEND) is false +PASS context.getParameter(context.BLEND_COLOR) is [0, 0, 0, 0] +PASS context.getParameter(context.BLEND_DST_ALPHA) is 0 +PASS context.getParameter(context.BLEND_DST_RGB) is 0 +PASS context.getParameter(context.BLEND_EQUATION_ALPHA) is context.FUNC_ADD +PASS context.getParameter(context.BLEND_EQUATION_RGB) is context.FUNC_ADD +PASS context.getParameter(context.BLEND_SRC_ALPHA) is 1 +PASS context.getParameter(context.BLEND_SRC_RGB) is 1 +PASS context.getParameter(context.COLOR_CLEAR_VALUE) is [0, 0, 0, 0] +PASS context.getParameter(context.COLOR_WRITEMASK) is [1, 1, 1, 1] +PASS context.getParameter(context.CULL_FACE) is false +PASS context.getParameter(context.CULL_FACE_MODE) is context.BACK +PASS context.getParameter(context.CURRENT_PROGRAM) is null +PASS context.getParameter(context.DEPTH_FUNC) is context.LESS +PASS context.getParameter(context.DEPTH_RANGE) is [0, 1] +PASS context.getParameter(context.DEPTH_TEST) is false +PASS context.getParameter(context.DEPTH_WRITEMASK) is true +PASS context.getParameter(context.DITHER) is true +PASS context.getParameter(context.ELEMENT_ARRAY_BUFFER_BINDING) is null +PASS context.getParameter(context.FRONT_FACE) is context.CCW +PASS context.getParameter(context.GENERATE_MIPMAP_HINT) is context.DONT_CARE +PASS context.getParameter(context.LINE_WIDTH) is 1 +PASS context.getParameter(context.POLYGON_OFFSET_FACTOR) is 0 +PASS context.getParameter(context.POLYGON_OFFSET_FILL) is false +PASS context.getParameter(context.POLYGON_OFFSET_UNITS) is 0 +PASS context.getParameter(context.RENDERBUFFER_BINDING) is null +PASS context.getParameter(context.SAMPLE_COVERAGE_INVERT) is false +PASS context.getParameter(context.SAMPLE_COVERAGE_VALUE) is 1 +PASS context.getParameter(context.SCISSOR_BOX)[0] is 0 +PASS context.getParameter(context.SCISSOR_BOX)[1] is 0 +PASS context.getParameter(context.SCISSOR_TEST) is false +PASS context.getParameter(context.STENCIL_BACK_FAIL) is context.KEEP +PASS context.getParameter(context.STENCIL_BACK_FUNC) is context.ALWAYS +PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_FAIL) is context.KEEP +PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS) is context.KEEP +PASS context.getParameter(context.STENCIL_BACK_REF) is 0 +PASS context.getParameter(context.STENCIL_BITS) is 0 +PASS context.getParameter(context.STENCIL_CLEAR_VALUE) is 0 +PASS context.getParameter(context.STENCIL_FAIL) is context.KEEP +PASS context.getParameter(context.STENCIL_FUNC) is context.ALWAYS +PASS context.getParameter(context.STENCIL_PASS_DEPTH_FAIL) is context.KEEP +PASS context.getParameter(context.STENCIL_PASS_DEPTH_PASS) is context.KEEP +PASS context.getParameter(context.STENCIL_REF) is 0 +PASS context.getParameter(context.STENCIL_TEST) is false +PASS context.getParameter(context.TEXTURE_BINDING_2D) is null +PASS context.getParameter(context.TEXTURE_BINDING_CUBE_MAP) is null +FAIL context.getParameter(context.VIEWPORT) should be 0,0,0,0. Was [object WebGLIntArray]. + +PASS successfullyParsed is true + +TEST COMPLETE diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/null-object-behaviour-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/null-object-behaviour-expected.txt new file mode 100644 index 0000000..4d13edb --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/null-object-behaviour-expected.txt @@ -0,0 +1,30 @@ +Tests calling WebGL APIs without providing the necessary objects + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + +PASS context.compileShader() threw exception GL error 1282 in compileShader. +PASS context.linkProgram() threw exception GL error 1282 in linkProgram. +PASS context.attachShader() threw exception GL error 1281 in attachShader. +PASS context.attachShader(program, undefined) threw exception GL error 1281 in attachShader. +PASS context.attachShader(undefined, shader) threw exception GL error 1281 in attachShader. +PASS context.detachShader(program, undefined) threw exception GL error 1282 in detachShader. +PASS context.detachShader(undefined, shader) threw exception GL error 1282 in detachShader. +PASS context.shaderSource() threw exception GL error 1282 in shaderSource. +PASS context.shaderSource(undefined, 'foo') threw exception GL error 1282 in shaderSource. +PASS context.bindAttribLocation(undefined, 0, 'foo') threw exception GL error 1282 in bindAttribLocation. +PASS context.bindBuffer(context.ARRAY_BUFFER, 0) is undefined. +PASS context.bindFramebuffer(context.FRAMEBUFFER, 0) is undefined. +PASS context.bindRenderbuffer(context.RENDERBUFFER, 0) is undefined. +PASS context.bindTexture(context.TEXTURE_2D, 0) is undefined. +PASS context.framebufferRenderbuffer(context.FRAMEBUFFER, context.DEPTH_ATTACHMENT, context.RENDERBUFFER, 0) threw exception GL error 1282 in framebufferRenderbuffer. +PASS context.framebufferTexture2D(context.FRAMEBUFFER, context.COLOR_ATTACHMENT0, context.TEXTURE_2D, 0, 0) threw exception GL error 1282 in framebufferTexture2D. +PASS context.getProgramParameter(undefined, 0) threw exception GL error 1282 in getProgramParameter. +PASS context.getProgramInfoLog(undefined, 0) threw exception GL error 1282 in getProgramInfoLog. +PASS context.getShaderParameter(undefined, 0) threw exception GL error 1282 in getShaderParameter. +PASS context.getShaderInfoLog(undefined, 0) threw exception GL error 1282 in getShaderInfoLog. +PASS context.getShaderSource(undefined) threw exception GL error 1282 in getShaderSource. +PASS context.getUniform(undefined, 0) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS context.getUniformLocation(undefined, 'foo') threw exception GL error 1282 in getUniformLocation. +PASS successfullyParsed is true + +TEST COMPLETE diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt new file mode 100644 index 0000000..060696b0 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt @@ -0,0 +1,22 @@ +Test of texImage2d and texSubImage2d + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + +PASS context.texImage2D(context.TEXTURE_2D) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 64, 64, 0, context.RGBA, context.UNSIGNED_BYTE, null) is undefined. +PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 0, context.RGBA, context.UNSIGNED_BYTE, 0) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, 2, 2, 0, context.RGBA, context.UNSIGNED_BYTE, array) is undefined. +PASS context.texImage2D(context.TEXTURE_2D, 0, imageData, true) is undefined. +PASS context.texImage2D(context.TEXTURE_2D, 0, image) is undefined. +PASS context.texImage2D(context.TEXTURE_2D, 0, canvas2d, false) is undefined. +PASS context.texImage2D(context.TEXTURE_2D, 0, video, true, false) is undefined. +PASS context.texSubImage2D(context.TEXTURE_2D) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0) is undefined. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, context.UNSIGNED_BYTE, 0) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, imageData, false) is undefined. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, image) is undefined. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, canvas2d, true) is undefined. +PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, video, false, true) is undefined. +PASS successfullyParsed is true + +TEST COMPLETE diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/uniform-location-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/uniform-location-expected.txt new file mode 100644 index 0000000..dc5d30f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/canvas/webgl/uniform-location-expected.txt @@ -0,0 +1,20 @@ +Tests calling WebGL APIs with objects from other contexts + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + +PASS contextA.useProgram(programA2) is undefined. +PASS contextA.uniformMatrix4fv(locationA, false, mat) threw exception GL error 1282 in uniformMatrix4fv. +PASS contextA.useProgram(programA1) is undefined. +PASS contextA.uniformMatrix4fv(locationA, false, mat) is undefined. +PASS contextA.uniformMatrix4fv(0, false, mat) threw exception Error: SYNTAX_ERR: DOM Exception 12. +PASS contextA.useProgram(programS) is undefined. +PASS contextA.uniform1i(locationSx, 3) is undefined. +PASS contextA.uniform1f(locationArray0, 4.0) is undefined. +PASS contextA.getUniform(programS, locationSx) is 3 +PASS contextA.getUniform(programS, locationArray0) is 4.0 +PASS contextA.useProgram(programV) is undefined. +PASS contextA.uniform4fv(locationVec4, vec) is undefined. +PASS contextA.getUniform(programV, locationVec4) is vec +PASS successfullyParsed is true + +TEST COMPLETE diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 47b5ff1..3b26e98 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2853,12 +2853,7 @@ BUG33099 : media/video-timeupdate-reverse-play.html = TIMEOUT BUG33343 LINUX MAC : storage/database-lock-after-reload.html = CRASH TEXT PASS BUG33343 DEBUG : storage/multiple-databases-garbage-collection.html = CRASH PASS -// Rebaseline! -BUG21852 MAC : fast/canvas/webgl/null-object-behaviour.html = TEXT -BUG21852 MAC : fast/canvas/webgl/texImageTest.html = TEXT -BUG21852 MAC : fast/canvas/webgl/uniform-location.html = TEXT -BUG21852 MAC : fast/canvas/webgl/gl-get-calls.html = TEXT -BUG21852 SKIP LINUX WIN : fast/canvas/webgl = CRASH +BUG21852 DEFER SKIP LINUX WIN : fast/canvas/webgl = CRASH // Disabled until we get history.{back,forward,go} changed to always be // asynchronously again. |