From 51847bbebf2ada9310b4b81438260dc4e8c8e24a Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Sat, 23 Mar 2024 21:59:12 +0100 Subject: [PATCH] LibWeb: Remove ImageData's create_with_size() and use create() instead Removes ImageData::create_with_size() and redirects previous usage to ImageData::create(). --- .../LibWeb/HTML/Canvas/CanvasImageData.h | 2 +- .../LibWeb/HTML/CanvasRenderingContext2D.cpp | 6 +++--- .../LibWeb/HTML/CanvasRenderingContext2D.h | 2 +- Userland/Libraries/LibWeb/HTML/ImageData.cpp | 19 ------------------- Userland/Libraries/LibWeb/HTML/ImageData.h | 2 -- 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/Userland/Libraries/LibWeb/HTML/Canvas/CanvasImageData.h b/Userland/Libraries/LibWeb/HTML/Canvas/CanvasImageData.h index b918917363e..0615f5b1769 100644 --- a/Userland/Libraries/LibWeb/HTML/Canvas/CanvasImageData.h +++ b/Userland/Libraries/LibWeb/HTML/Canvas/CanvasImageData.h @@ -15,7 +15,7 @@ class CanvasImageData { public: virtual ~CanvasImageData() = default; - virtual JS::GCPtr create_image_data(int width, int height) const = 0; + virtual WebIDL::ExceptionOr> create_image_data(int width, int height) const = 0; virtual WebIDL::ExceptionOr> get_image_data(int x, int y, int width, int height) const = 0; virtual void put_image_data(ImageData const&, float x, float y) = 0; diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index b0d7b4820ab..6cc6ffefb2b 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp @@ -374,9 +374,9 @@ void CanvasRenderingContext2D::fill(Path2D& path, StringView fill_rule) return fill_internal(transformed_path, parse_fill_rule(fill_rule)); } -JS::GCPtr CanvasRenderingContext2D::create_image_data(int width, int height) const +WebIDL::ExceptionOr> CanvasRenderingContext2D::create_image_data(int width, int height) const { - return ImageData::create_with_size(realm(), width, height); + return ImageData::create(realm(), width, height); } // https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-getimagedata @@ -392,7 +392,7 @@ WebIDL::ExceptionOr> CanvasRenderingContext2D::get_image_da // 3. Let imageData be a new ImageData object. // 4. Initialize imageData given sw, sh, settings set to settings, and defaultColorSpace set to this's color space. - auto image_data = ImageData::create_with_size(realm(), width, height); + auto image_data = TRY(ImageData::create(realm(), width, height)); // NOTE: We don't attempt to create the underlying bitmap here; if it doesn't exist, it's like copying only transparent black pixels (which is a no-op). if (!canvas_element().bitmap()) diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h index 2707f17af04..b73116ec883 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h @@ -80,7 +80,7 @@ public: virtual void fill(StringView fill_rule) override; virtual void fill(Path2D& path, StringView fill_rule) override; - virtual JS::GCPtr create_image_data(int width, int height) const override; + virtual WebIDL::ExceptionOr> create_image_data(int width, int height) const override; virtual WebIDL::ExceptionOr> get_image_data(int x, int y, int width, int height) const override; virtual void put_image_data(ImageData const&, float x, float y) override; diff --git a/Userland/Libraries/LibWeb/HTML/ImageData.cpp b/Userland/Libraries/LibWeb/HTML/ImageData.cpp index 4284e15809e..884e1280707 100644 --- a/Userland/Libraries/LibWeb/HTML/ImageData.cpp +++ b/Userland/Libraries/LibWeb/HTML/ImageData.cpp @@ -37,25 +37,6 @@ WebIDL::ExceptionOr> ImageData::construct_impl(JS::R return ImageData::create(realm, sw, sh, settings); } -JS::GCPtr ImageData::create_with_size(JS::Realm& realm, int width, int height) -{ - if (width <= 0 || height <= 0) - return nullptr; - - if (width > 16384 || height > 16384) - return nullptr; - - auto data_or_error = JS::Uint8ClampedArray::create(realm, width * height * 4); - if (data_or_error.is_error()) - return nullptr; - auto data = JS::NonnullGCPtr(*data_or_error.release_value()); - - auto bitmap_or_error = Gfx::Bitmap::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 realm.heap().allocate(realm, realm, bitmap_or_error.release_value(), move(data)); -} - ImageData::ImageData(JS::Realm& realm, NonnullRefPtr bitmap, JS::NonnullGCPtr data) : PlatformObject(realm) , m_bitmap(move(bitmap)) diff --git a/Userland/Libraries/LibWeb/HTML/ImageData.h b/Userland/Libraries/LibWeb/HTML/ImageData.h index 95df82f88be..e507a0f8d77 100644 --- a/Userland/Libraries/LibWeb/HTML/ImageData.h +++ b/Userland/Libraries/LibWeb/HTML/ImageData.h @@ -25,8 +25,6 @@ public: [[nodiscard]] static WebIDL::ExceptionOr> create(JS::Realm&, u32 sw, u32 sh, Optional const& settings = {}); [[nodiscard]] static WebIDL::ExceptionOr> construct_impl(JS::Realm&, u32 sw, u32 sh, Optional const& settings = {}); - static JS::GCPtr create_with_size(JS::Realm&, int width, int height); - virtual ~ImageData() override; unsigned width() const;