diff options
| author | xlai <xlai@chromium.org> | 2016-01-27 08:59:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 17:00:18 +0000 |
| commit | 477b16c4b0051e183d22d3705faeebcb2cc0cc42 (patch) | |
| tree | 065a59bf394b51a4c2c492054cf589d1885c050f /third_party/WebKit/LayoutTests/fast/canvas | |
| parent | 5194bd776b592c1914715035749e2c94f5fd7411 (diff) | |
| download | chromium_src-477b16c4b0051e183d22d3705faeebcb2cc0cc42.zip chromium_src-477b16c4b0051e183d22d3705faeebcb2cc0cc42.tar.gz chromium_src-477b16c4b0051e183d22d3705faeebcb2cc0cc42.tar.bz2 | |
Change to idle-task implementations in toBlob
This is a combined revert of
https://codereview.chromium.org/1491653002
and https://codereview.chromium.org/1614173002. One more
additional edit is the addition of
"testRunner.dumpAsText();" in canvas-toBlob-defaultpng.html
and canvas-toBlob-toDataURL-race.js.
Reason for this revert is that we found out idle-task
performs much better (has less negative impacts on other
activities) than threaded implementation on majority of
machines.
BUG=581574
Review URL: https://codereview.chromium.org/1637163002
Cr-Commit-Position: refs/heads/master@{#371806}
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/canvas')
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng-expected.txt) | 0 | ||||
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng.html (renamed from third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng.html) | 2 | ||||
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt (renamed from third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt) | 0 | ||||
| -rw-r--r-- | third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png.html (renamed from third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png.html) | 4 |
4 files changed, 3 insertions, 3 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng-expected.txt b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng-expected.txt index fed3498..fed3498 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng-expected.txt diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng.html b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng.html index 14cab66..c68d3ea 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-defaultpng.html +++ b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-defaultpng.html @@ -1,4 +1,4 @@ -<script src = "../../resources/js-test.js"></script> +<script src = "../../../resources/js-test.js"></script> <script type = 'text/javascript'> jsTestIsAsync = true; description("Test that verifies whether the image data survives the toBlob process after async image encoding"); diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt index ac789eb..ac789eb 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png-expected.txt diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png.html b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png.html index 3bbcaa7..806cc27 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png.html +++ b/third_party/WebKit/LayoutTests/fast/canvas/toBlob/canvas-toBlob-toDataURL-race-imageEncoder-png.html @@ -1,5 +1,5 @@ -<script src = "../../resources/js-test.js"></script> -<script src = "script-tests/canvas-toBlob-toDataURL-race.js"></script> +<script src = "../../../resources/js-test.js"></script> +<script src = "../script-tests/canvas-toBlob-toDataURL-race.js"></script> <script type = 'text/javascript'> description("Verifies if synchronous PNG image encoding (toDataURL) conflicts with asynchronous image encoding (toBlob)"); |