Commit 5fd81121 authored by James Darpinian's avatar James Darpinian Committed by Commit Bot

Increase maximum width/height of canvas.

Fixes WebGL conformance test:
conformance2/textures/misc/tex-subimage3d-canvas-bug.html

The test expects to be able to create a canvas larger than 32767 in
height. Skia seems to support this, and there have been user requests
for it.

Bug: 859400, 339725, skia:2122
Change-Id: Ibba89e98178bd73817c7b4cbdf569e89ee5764b1
Reviewed-on: https://chromium-review.googlesource.com/c/1356555Reviewed-by: default avatarFernando Serboncini <fserb@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: James Darpinian <jdarpinian@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613225}
parent 6ec9a91f
......@@ -56,12 +56,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
'conformance2/glsl3/const-struct-from-array-as-function-parameter.html',
['win', 'nvidia', 'opengl'], bug=874620)
# Failing new test added in https://github.com/KhronosGroup/WebGL/pull/2665
self.Fail('conformance2/textures/misc/tex-subimage3d-canvas-bug.html',
['linux'], bug=859400)
self.Fail('conformance2/textures/misc/tex-subimage3d-canvas-bug.html',
['win', 'opengl', 'passthrough'], bug=859400)
# Too slow (take about one hour to run)
self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
......
......@@ -56,8 +56,8 @@ enum {
// maximum dimensions, in exchange for a smaller maximum canvas size.
kMaxCanvasArea = 32768 * 8192, // Maximum canvas area in CSS pixels
// In Skia, we will also limit width/height to 32767.
kMaxSkiaDim = 32767 // Maximum width/height in CSS pixels.
// In Skia, we will also limit width/height to 65535.
kMaxSkiaDim = 65535 // Maximum width/height in CSS pixels.
};
bool PLATFORM_EXPORT IsValidImageSize(const IntSize&);
......
......@@ -15,12 +15,7 @@ test(function(t) {
dstContext.fillStyle = pattern;
dstContext.fillRect(0, 0, dstCanvas.width, dstCanvas.height);
// This test does not currently succeed because skia does not handle
// canvases more than 32k pixels wide. For now, this test serves the
// purpose of verifying that this use case does not crash the browser.
// Crasher bug: crbug.com/281504.
// The result, if Skia handled large canvases, would be [0, 255, 0, 255]
assert_array_equals(dstContext.getImageData(0, 0, 1, 1).data, [0, 0, 0, 0]);
assert_array_equals(dstContext.getImageData(0, 0, 1, 1).data, [0, 255, 0, 255]);
assert_array_equals(dstContext.getImageData(1, 0, 1, 1).data, [0, 0, 0, 0]);
assert_array_equals(dstContext.getImageData(0, 1, 1, 1).data, [0, 0, 0, 0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment