RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:08:11 +00:00
Code Issues Activity Actions

LibWeb: Make CanvasGradient GC-allocated

Browse source
This commit is contained in:
Andreas Kling 2022-09-02 23:17:45 +02:00
parent 369dd42d67
commit 0d2fee351a
5 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/Forward.h
View file

@ -449,7 +449,6 @@ class URLSearchParamsIterator;
namespace Web::Bindings { namespace Web::Bindings {
class BlobWrapper; class BlobWrapper;
class CanvasGradientWrapper;
class CryptoWrapper; class CryptoWrapper;
class DOMExceptionWrapper; class DOMExceptionWrapper;
class DOMPointWrapper; class DOMPointWrapper;

15
Userland/Libraries/LibWeb/HTML/Canvas/CanvasFillStrokeStyles.h
View file

@ -42,19 +42,22 @@ public:
return my_drawing_state().stroke_style.to_string(); return my_drawing_state().stroke_style.to_string();
} }
NonnullRefPtr<CanvasGradient> create_radial_gradient(double x0, double y0, double r0, double x1, double y1, double r1) JS::NonnullGCPtr<CanvasGradient> create_radial_gradient(double x0, double y0, double r0, double x1, double y1, double r1)
{ {
return CanvasGradient::create_radial(x0, y0, r0, x1, y1, r1); auto& window = static_cast<IncludingClass&>(*this).global_object();
return CanvasGradient::create_radial(window, x0, y0, r0, x1, y1, r1);
} }
NonnullRefPtr<CanvasGradient> create_linear_gradient(double x0, double y0, double x1, double y1) JS::NonnullGCPtr<CanvasGradient> create_linear_gradient(double x0, double y0, double x1, double y1)
{ {
return CanvasGradient::create_linear(x0, y0, x1, y1); auto& window = static_cast<IncludingClass&>(*this).global_object();
return CanvasGradient::create_linear(window, x0, y0, x1, y1);
} }
NonnullRefPtr<CanvasGradient> create_conic_gradient(double start_angle, double x, double y) JS::NonnullGCPtr<CanvasGradient> create_conic_gradient(double start_angle, double x, double y)
{ {
return CanvasGradient::create_conic(start_angle, x, y); auto& window = static_cast<IncludingClass&>(*this).global_object();
return CanvasGradient::create_conic(window, start_angle, x, y);
} }
protected: protected:

20
Userland/Libraries/LibWeb/HTML/CanvasGradient.cpp
View file

@ -5,12 +5,14 @@
*/ */
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibWeb/Bindings/CanvasGradientPrototype.h>
#include <LibWeb/DOM/ExceptionOr.h> #include <LibWeb/DOM/ExceptionOr.h>
#include <LibWeb/HTML/CanvasGradient.h> #include <LibWeb/HTML/CanvasGradient.h>
#include <LibWeb/HTML/Window.h>
namespace Web::HTML { namespace Web::HTML {
NonnullRefPtr<CanvasGradient> CanvasGradient::create_radial(double x0, double y0, double r0, double x1, double y1, double r1) JS::NonnullGCPtr<CanvasGradient> CanvasGradient::create_radial(HTML::Window& window, double x0, double y0, double r0, double x1, double y1, double r1)
{ {
(void)x0; (void)x0;
(void)y0; (void)y0;
@ -18,29 +20,31 @@ NonnullRefPtr<CanvasGradient> CanvasGradient::create_radial(double x0, double y0
(void)x1; (void)x1;
(void)y1; (void)y1;
(void)r1; (void)r1;
return adopt_ref(*new CanvasGradient(Type::Radial)); return *window.heap().allocate<CanvasGradient>(window.realm(), window, Type::Radial);
} }
NonnullRefPtr<CanvasGradient> CanvasGradient::create_linear(double x0, double y0, double x1, double y1) JS::NonnullGCPtr<CanvasGradient> CanvasGradient::create_linear(HTML::Window& window, double x0, double y0, double x1, double y1)
{ {
(void)x0; (void)x0;
(void)y0; (void)y0;
(void)x1; (void)x1;
(void)y1; (void)y1;
return adopt_ref(*new CanvasGradient(Type::Linear)); return *window.heap().allocate<CanvasGradient>(window.realm(), window, Type::Linear);
} }
NonnullRefPtr<CanvasGradient> CanvasGradient::create_conic(double start_angle, double x, double y) JS::NonnullGCPtr<CanvasGradient> CanvasGradient::create_conic(HTML::Window& window, double start_angle, double x, double y)
{ {
(void)start_angle; (void)start_angle;
(void)x; (void)x;
(void)y; (void)y;
return adopt_ref(*new CanvasGradient(Type::Conic)); return *window.heap().allocate<CanvasGradient>(window.realm(), window, Type::Conic);
} }
CanvasGradient::CanvasGradient(Type type) CanvasGradient::CanvasGradient(HTML::Window& window, Type type)
: m_type(type) : PlatformObject(window.realm())
, m_type(type)
{ {
set_prototype(&window.ensure_web_prototype<Bindings::CanvasGradientPrototype>("CanvasGradient"));
} }
CanvasGradient::~CanvasGradient() = default; CanvasGradient::~CanvasGradient() = default;

21
Userland/Libraries/LibWeb/HTML/CanvasGradient.h
View file

@ -6,15 +6,14 @@
#pragma once #pragma once
#include <AK/RefCounted.h>
#include <LibGfx/Color.h> #include <LibGfx/Color.h>
#include <LibWeb/Bindings/Wrappable.h> #include <LibWeb/Bindings/PlatformObject.h>
namespace Web::HTML { namespace Web::HTML {
class CanvasGradient final class CanvasGradient final : public Bindings::PlatformObject {
: public RefCounted<CanvasGradient> WEB_PLATFORM_OBJECT(CanvasGradient, Bindings::PlatformObject);
, public Bindings::Wrappable {
public: public:
enum class Type { enum class Type {
Linear, Linear,
@ -22,18 +21,16 @@ public:
Conic, Conic,
}; };
using WrapperType = Bindings::CanvasGradientWrapper; static JS::NonnullGCPtr<CanvasGradient> create_radial(HTML::Window&, double x0, double y0, double r0, double x1, double y1, double r1);
static JS::NonnullGCPtr<CanvasGradient> create_linear(HTML::Window&, double x0, double y0, double x1, double y1);
static NonnullRefPtr<CanvasGradient> create_radial(double x0, double y0, double r0, double x1, double y1, double r1); static JS::NonnullGCPtr<CanvasGradient> create_conic(HTML::Window&, double start_angle, double x, double y);
static NonnullRefPtr<CanvasGradient> create_linear(double x0, double y0, double x1, double y1);
static NonnullRefPtr<CanvasGradient> create_conic(double start_angle, double x, double y);
DOM::ExceptionOr<void> add_color_stop(double offset, String const& color); DOM::ExceptionOr<void> add_color_stop(double offset, String const& color);
~CanvasGradient(); ~CanvasGradient();
private: private:
explicit CanvasGradient(Type); CanvasGradient(HTML::Window&, Type);
Type m_type {}; Type m_type {};
@ -46,3 +43,5 @@ private:
}; };
} }
WRAPPER_HACK(CanvasGradient, Web::HTML)

2
Userland/Libraries/LibWeb/idl_files.cmake
View file

@ -61,7 +61,7 @@ libweb_js_wrapper(Geometry/DOMPointReadOnly)
libweb_js_wrapper(Geometry/DOMRect) libweb_js_wrapper(Geometry/DOMRect)
libweb_js_wrapper(Geometry/DOMRectList) libweb_js_wrapper(Geometry/DOMRectList)
libweb_js_wrapper(Geometry/DOMRectReadOnly) libweb_js_wrapper(Geometry/DOMRectReadOnly)
libweb_js_wrapper(HTML/CanvasGradient) libweb_js_wrapper(HTML/CanvasGradient NO_INSTANCE)
libweb_js_wrapper(HTML/CanvasRenderingContext2D NO_INSTANCE) libweb_js_wrapper(HTML/CanvasRenderingContext2D NO_INSTANCE)
libweb_js_wrapper(HTML/CloseEvent NO_INSTANCE) libweb_js_wrapper(HTML/CloseEvent NO_INSTANCE)
libweb_js_wrapper(HTML/DOMParser NO_INSTANCE) libweb_js_wrapper(HTML/DOMParser NO_INSTANCE)