0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Make new ImageData() use unpremultiplied color data

Browse source 
This was already the case for `context.createImageData()`, but I forgot
to do the same for `new ImageData()`. Add a regression test for both
cases.
This commit is contained in:
Jelle Raaijmakers 2024-08-20 13:23:20 +02:00 • committed by Andreas Kling
parent bd55e85027
commit e926b4cbfb
Notes: github-actions[bot] 2024-08-20 18:39:59 +00:00
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/Text/expected/HTML/canvas-putImageData-unpremultiplied.txt Normal file
View file

@ -0,0 +1,2 @@
PASS
PASS

29
Tests/LibWeb/Text/input/HTML/canvas-putImageData-unpremultiplied.html Normal file
View file

@ -0,0 +1,29 @@
<script src="../include.js"></script>
<body><canvas id=c width=1 height=2></div>
<script>
test(() => {
// Test createImageData + putImageData
let ctx1 = c.getContext('2d');
let img1 = ctx1.createImageData(1, 1);
img1.data[0] = 50;
img1.data[1] = 100;
img1.data[2] = 200;
img1.data[3] = 0;
ctx1.putImageData(img1, 0, 0);
let buf1 = ctx1.getImageData(0, 0, 1, 1);
if (buf1.data[0] === 0 && buf1.data[1] === 0 && buf1.data[2] === 0 && buf1.data[3] === 0)
println("PASS");
else
println("FAIL");
// Test new ImageData + putImageData
let ctx2 = c.getContext('2d');
let img2 = new ImageData(new Uint8ClampedArray([50, 100, 200, 0]), 1, 1);
ctx2.putImageData(img2, 0, 0);
let buf2 = ctx2.getImageData(0, 0, 1, 1);
if (buf2.data[0] === 0 && buf2.data[1] === 0 && buf2.data[2] === 0 && buf2.data[3] === 0)
println("PASS");
else
println("FAIL");
});
</script>

2
Userland/Libraries/LibWeb/HTML/ImageData.cpp
View file

@ -74,7 +74,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<ImageData>> ImageData::create(JS::Realm& re
return WebIDL::IndexSizeError::create(realm, "Source height must be equal to the calculated height of the data."_fly_string);
// 7. Initialize this given sw, sh, settings set to settings, and source set to data.
auto bitmap = TRY_OR_THROW_OOM(vm, Gfx::Bitmap::create_wrapper(Gfx::BitmapFormat::RGBA8888, Gfx::AlphaType::Premultiplied, Gfx::IntSize(sw, height), sw * sizeof(u32), uint8_clamped_array_data.data().data()));
auto bitmap = TRY_OR_THROW_OOM(vm, Gfx::Bitmap::create_wrapper(Gfx::BitmapFormat::RGBA8888, Gfx::AlphaType::Unpremultiplied, Gfx::IntSize(sw, height), sw * sizeof(u32), uint8_clamped_array_data.data().data()));
return realm.heap().allocate<ImageData>(realm, realm, bitmap, uint8_clamped_array_data);
}