Commit e3de6fea authored by Juanmi Huertas's avatar Juanmi Huertas Committed by Commit Bot

Disable canvas acceleration after getting the image inside getImageData

This CL ensures that if the user is going to call more than once
getImageData, all the subsequent calls will be done in a non-accelerated
canvas.


Bug: 1001845, 983642, 1008179
Change-Id: Icbac19b2c3c070e56725b92eda0350b5b6bab499
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845511Reviewed-by: default avatarFernando Serboncini <fserb@chromium.org>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704173}
parent 647b83d2
......@@ -351,7 +351,7 @@ CrElementsFingerprintProgressArcTest.prototype = {
]),
};
TEST_F('CrElementsFingerprintProgressArcTest', 'All', function() {
TEST_F('CrElementsFingerprintProgressArcTest', 'DISABLED_All', function() {
mocha.run();
});
......
......@@ -1602,6 +1602,10 @@ ImageData* BaseRenderingContext2D::getImageData(
FinalizeFrame();
scoped_refptr<StaticBitmapImage> snapshot = GetImage(kPreferNoAcceleration);
// GetImagedata is faster in Unaccelerated canvases
if (IsAccelerated())
DisableAcceleration();
if (!StaticBitmapImage::ConvertToArrayBufferContents(
snapshot, contents, image_data_rect, color_params, IsAccelerated())) {
exception_state.ThrowRangeError("Out of memory at ImageData creation");
......
......@@ -199,6 +199,10 @@ crbug.com/774873 [ Win ] virtual/exotic-color-space/images/color-profile-border-
crbug.com/974652 [ Debug ] virtual/gpu/fast/canvas/OffscreenCanvas-copyImage.html [ Pass Failure ]
crbug.com/974652 [ Debug ] fast/canvas/OffscreenCanvas-copyImage.html [ Pass Failure ]
crbug.com/1011060 virtual/gpu/fast/canvas/canvas-getImageData-smooth.html [ Pass Failure ]
crbug.com/1011060 virtual/gpu/fast/canvas/bug382588.html [ Pass Failure ]
crbug.com/1011060 virtual/gpu/fast/canvas/canvas-lost-gpu-context.html [ Pass Failure ]
crbug.com/974666 [ Mac10.13 ] http/tests/misc/object-embedding-svg-delayed-size-negotiation-2.htm [ Pass Failure ]
crbug.com/974720 [ Mac10.13 ] fast/text/firstline/capitalize-transform-2.html [ Pass Crash ]
crbug.com/974720 [ Mac10.13 ] fast/text/firstline/capitalize-transform.html [ Pass Crash ]
......
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