Commit cc213072 authored by Xida Chen's avatar Xida Chen Committed by Commit Bot

Make getPutImageDataPairTest.html pass

There are two reasons for this CL:
1. This layout test times out on virtual/gpu/ test suite.
2. The layout test is uses testharness, but it has an expected file.

The reason for #1 is that when the test creates a canvas, it uses the
canvas's default width and height which is 300*150, and call getImageData
and putImageData on the entire canvas with the same color. We really don't
need that, this CL sets the width and height to be 5 and should test the
same thing.

The reason for #2 is that this layout test has several small tests, the
name for each small tests are the same, and testharness apparently
doesn't like that.

This CL removes a line in the expectation file, and some -expected.txt

Bug: 709009
Change-Id: I14935f4bf84a8cabb5a9aa56dc502b5d02768b77
Reviewed-on: https://chromium-review.googlesource.com/568079Reviewed-by: default avatarMohammad Reza Zakerinasab <zakerinasab@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486002}
parent de99afb4
...@@ -92,9 +92,6 @@ crbug.com/671048 virtual/color_space/fast/canvas/color-space/display_linear-rgb. ...@@ -92,9 +92,6 @@ crbug.com/671048 virtual/color_space/fast/canvas/color-space/display_linear-rgb.
crbug.com/693568 virtual/gpu/fast/canvas/canvas-imageSmoothingQuality.html [ Failure ] crbug.com/693568 virtual/gpu/fast/canvas/canvas-imageSmoothingQuality.html [ Failure ]
# Can be broken into smaller tests, probably.
crbug.com/709009 virtual/gpu/fast/canvas/getPutImageDataPairTest.html [ Timeout Pass ]
# Looks like a filuare to get a paint on time. Test could be changed to use runAfterLayoutAndPaint # Looks like a filuare to get a paint on time. Test could be changed to use runAfterLayoutAndPaint
# instead of a timeout, which may fix things. # instead of a timeout, which may fix things.
crbug.com/713049 images/color-profile-reflection.html [ Failure Pass ] crbug.com/713049 images/color-profile-reflection.html [ Failure Pass ]
......
This is a testharness.js-based test.
Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "GetPutImageDataTestCase "
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
Harness: the test ran to completion.
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
<script> <script>
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.width = 5;
canvas.height = 5;
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
function getPutImageData(numIters, ctx, rgba) { function getPutImageData(numIters, ctx, rgba) {
...@@ -39,15 +41,15 @@ function getPutImageData(numIters, ctx, rgba) { ...@@ -39,15 +41,15 @@ function getPutImageData(numIters, ctx, rgba) {
} }
var testScenarios = [ var testScenarios = [
['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 0.0'], ['GetPutImageDataTestCase0 ', 50, ctx, '0, 0, 0, 0.0'],
['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 0.5'], ['GetPutImageDataTestCase1 ', 50, ctx, '0, 0, 0, 0.5'],
['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 1.0'], ['GetPutImageDataTestCase2 ', 50, ctx, '0, 0, 0, 1.0'],
['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.49'], ['GetPutImageDataTestCase3 ', 50, ctx, '127, 128, 129, 0.49'],
['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.51'], ['GetPutImageDataTestCase4 ', 50, ctx, '127, 128, 129, 0.51'],
['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.5'], ['GetPutImageDataTestCase5 ', 50, ctx, '127, 128, 129, 0.5'],
['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 0.0'], ['GetPutImageDataTestCase6 ', 50, ctx, '128, 128, 128, 0.0'],
['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 0.5'], ['GetPutImageDataTestCase7 ', 50, ctx, '128, 128, 128, 0.5'],
['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 1.0'], ['GetPutImageDataTestCase8 ', 50, ctx, '128, 128, 128, 1.0'],
]; ];
generate_tests(getPutImageData, testScenarios); generate_tests(getPutImageData, testScenarios);
......
This is a testharness.js-based test.
Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "GetPutImageDataTestCase "
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
Harness: the test ran to completion.
This is a testharness.js-based test.
Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "GetPutImageDataTestCase "
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
Harness: the test ran to completion.
This is a testharness.js-based test.
Harness Error. harness_status.status = 1 , harness_status.message = 1 duplicate test name: "GetPutImageDataTestCase "
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
PASS GetPutImageDataTestCase
Harness: the test ran to completion.
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