LibWeb: Make ImageData GC-allocated

1 files changed, 19 insertions, 11 deletions

diff --git a/Userland/Libraries/LibWeb/HTML/ImageData.cpp b/Userland/Libraries/LibWeb/HTML/ImageData.cpp
index 7bdadd7aee..e70c40b18a 100644
--- a/Userland/Libraries/LibWeb/HTML/ImageData.cpp
+++ b/Userland/Libraries/LibWeb/HTML/ImageData.cpp
@@ -1,18 +1,20 @@
 /*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2020-2022, Andreas Kling <kling@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <LibGfx/Bitmap.h>
 #include <LibJS/Runtime/TypedArray.h>
+#include <LibWeb/Bindings/ImageDataPrototype.h>
 #include <LibWeb/HTML/ImageData.h>
+#include <LibWeb/HTML/Window.h>
 
 namespace Web::HTML {
 
-RefPtr<ImageData> ImageData::create_with_size(JS::VM& vm, int width, int height)
+JS::GCPtr<ImageData> ImageData::create_with_size(HTML::Window& window, int width, int height)
 {
-    auto& realm = *vm.current_realm();
+    auto& realm = window.realm();
 
     if (width <= 0 || height <= 0)
         return nullptr;
@@ -23,24 +25,30 @@ RefPtr<ImageData> ImageData::create_with_size(JS::VM& vm, int width, int height)
     auto data_or_error = JS::Uint8ClampedArray::create(realm, width * height * 4);
     if (data_or_error.is_error())
         return nullptr;
-    auto* data = data_or_error.release_value();
-
-    auto data_handle = JS::make_handle(data);
+    auto data = JS::NonnullGCPtr<JS::Uint8ClampedArray>(*data_or_error.release_value());
 
     auto bitmap_or_error = Gfx::Bitmap::try_create_wrapper(Gfx::BitmapFormat::RGBA8888, Gfx::IntSize(width, height), 1, width * sizeof(u32), data->data().data());
     if (bitmap_or_error.is_error())
         return nullptr;
-    return adopt_ref(*new ImageData(bitmap_or_error.release_value(), move(data_handle)));
+    return realm.heap().allocate<ImageData>(realm, window, bitmap_or_error.release_value(), move(data));
 }
 
-ImageData::ImageData(NonnullRefPtr<Gfx::Bitmap> bitmap, JS::Handle<JS::Uint8ClampedArray> data)
-    : m_bitmap(move(bitmap))
+ImageData::ImageData(HTML::Window& window, NonnullRefPtr<Gfx::Bitmap> bitmap, JS::NonnullGCPtr<JS::Uint8ClampedArray> data)
+    : PlatformObject(window.realm())
+    , m_bitmap(move(bitmap))
     , m_data(move(data))
 {
+    set_prototype(&window.ensure_web_prototype<Bindings::ImageDataPrototype>("ImageData"));
 }
 
 ImageData::~ImageData() = default;
 
+void ImageData::visit_edges(Cell::Visitor& visitor)
+{
+    Base::visit_edges(visitor);
+    visitor.visit(m_data.ptr());
+}
+
 unsigned ImageData::width() const
 {
     return m_bitmap->width();
@@ -53,12 +61,12 @@ unsigned ImageData::height() const
 
 JS::Uint8ClampedArray* ImageData::data()
 {
-    return m_data.cell();
+    return m_data;
 }
 
 const JS::Uint8ClampedArray* ImageData::data() const
 {
-    return m_data.cell();
+    return m_data;
 }
 
 }