system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Fix CRC2D.getImageData() when width != height

Browse source 
We were mistakenly using the width as both width and height when getting
ImageData from a 2D canvas.
This commit is contained in:
Andreas Kling 2024-04-15 09:36:57 +02:00
parent e487f70bbf
commit 134c4b6335
3 changed files with 14 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-getImageData-oblong.txt Normal file
View file

@ -0,0 +1,2 @@
[object ImageData]
PASS: Didn't crash

11
Tests/LibWeb/Text/input/HTML/canvas-getImageData-oblong.html Normal file
View file

@ -0,0 +1,11 @@
<script src="../include.js"></script>
<body><canvas id=c width=1 height=2></div>
<script>
test(() => {
let x = c.getContext("2d");
x.clearRect(0, 0, 1, 1);
let d = x.getImageData(0, 0, 1, 2);
println(d);
println("PASS: Didn't crash");
});
</script>

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

@ -29,7 +29,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<ImageData>> ImageData::create(JS::Realm& re
// 2. Initialize this given sw, sh, and settings set to settings.
// 3. Initialize the image data of this to transparent black.
auto data = TRY(JS::Uint8ClampedArray::create(realm, sw * sh * 4));
auto bitmap = TRY_OR_THROW_OOM(vm, Gfx::Bitmap::create_wrapper(Gfx::BitmapFormat::RGBA8888, Gfx::IntSize(sw, sw), 1, sw * sizeof(u32), data->data().data()));
auto bitmap = TRY_OR_THROW_OOM(vm, Gfx::Bitmap::create_wrapper(Gfx::BitmapFormat::RGBA8888, Gfx::IntSize(sw, sh), 1, sw * sizeof(u32), data->data().data()));
return realm.heap().allocate<ImageData>(realm, realm, bitmap, data);
}