mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 13:07:46 +00:00
LibWeb: Make DOMPoint and DOMPointReadOnly GC-allocated
This commit is contained in:
parent
a9cae56f8e
commit
44415af428
9 changed files with 78 additions and 43 deletions
25
Userland/Libraries/LibWeb/Geometry/DOMPoint.cpp
Normal file
25
Userland/Libraries/LibWeb/Geometry/DOMPoint.cpp
Normal file
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibWeb/Geometry/DOMPoint.h>
|
||||
#include <LibWeb/HTML/Window.h>
|
||||
|
||||
namespace Web::Geometry {
|
||||
|
||||
JS::NonnullGCPtr<DOMPoint> DOMPoint::create_with_global_object(HTML::Window& window, double x, double y, double z, double w)
|
||||
{
|
||||
return *window.heap().allocate<DOMPoint>(window.realm(), window, x, y, z, w);
|
||||
}
|
||||
|
||||
DOMPoint::DOMPoint(HTML::Window& window, double x, double y, double z, double w)
|
||||
: DOMPointReadOnly(window, x, y, z, w)
|
||||
{
|
||||
set_prototype(&window.cached_web_prototype("DOMPoint"));
|
||||
}
|
||||
|
||||
DOMPoint::~DOMPoint() = default;
|
||||
|
||||
}
|
|
@ -12,18 +12,12 @@ namespace Web::Geometry {
|
|||
|
||||
// https://drafts.fxtf.org/geometry/#DOMPoint
|
||||
class DOMPoint final : public DOMPointReadOnly {
|
||||
WEB_PLATFORM_OBJECT(DOMPoint, DOMPointReadOnly);
|
||||
|
||||
public:
|
||||
using WrapperType = Bindings::DOMPointWrapper;
|
||||
static JS::NonnullGCPtr<DOMPoint> create_with_global_object(HTML::Window&, double x = 0, double y = 0, double z = 0, double w = 0);
|
||||
|
||||
static NonnullRefPtr<DOMPoint> create_with_global_object(HTML::Window&, double x = 0, double y = 0, double z = 0, double w = 0)
|
||||
{
|
||||
return DOMPoint::create(x, y, z, w);
|
||||
}
|
||||
|
||||
static NonnullRefPtr<DOMPoint> create(double x = 0, double y = 0, double z = 0, double w = 0)
|
||||
{
|
||||
return adopt_ref(*new DOMPoint(x, y, z, w));
|
||||
}
|
||||
virtual ~DOMPoint() override;
|
||||
|
||||
double x() const { return m_x; }
|
||||
double y() const { return m_y; }
|
||||
|
@ -36,9 +30,9 @@ public:
|
|||
void set_w(double w) { m_w = w; }
|
||||
|
||||
private:
|
||||
DOMPoint(float x, float y, float z, float w)
|
||||
: DOMPointReadOnly(x, y, z, w)
|
||||
{
|
||||
}
|
||||
DOMPoint(HTML::Window&, double x, double y, double z, double w);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
WRAPPER_HACK(DOMPoint, Web::Geometry)
|
||||
|
|
29
Userland/Libraries/LibWeb/Geometry/DOMPointReadOnly.cpp
Normal file
29
Userland/Libraries/LibWeb/Geometry/DOMPointReadOnly.cpp
Normal file
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibWeb/Geometry/DOMPointReadOnly.h>
|
||||
#include <LibWeb/HTML/Window.h>
|
||||
|
||||
namespace Web::Geometry {
|
||||
|
||||
JS::NonnullGCPtr<DOMPointReadOnly> DOMPointReadOnly::create_with_global_object(HTML::Window& window, double x, double y, double z, double w)
|
||||
{
|
||||
return *window.heap().allocate<DOMPointReadOnly>(window.realm(), window, x, y, z, w);
|
||||
}
|
||||
|
||||
DOMPointReadOnly::DOMPointReadOnly(HTML::Window& window, double x, double y, double z, double w)
|
||||
: PlatformObject(window.realm())
|
||||
, m_x(x)
|
||||
, m_y(y)
|
||||
, m_z(z)
|
||||
, m_w(w)
|
||||
{
|
||||
set_prototype(&window.cached_web_prototype("DOMPointReadOnly"));
|
||||
}
|
||||
|
||||
DOMPointReadOnly::~DOMPointReadOnly() = default;
|
||||
|
||||
}
|
|
@ -6,29 +6,20 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/RefCounted.h>
|
||||
#include <LibGfx/Point.h>
|
||||
#include <LibWeb/Bindings/Wrappable.h>
|
||||
#include <LibWeb/Bindings/PlatformObject.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
|
||||
namespace Web::Geometry {
|
||||
|
||||
// https://drafts.fxtf.org/geometry/#dompointreadonly
|
||||
class DOMPointReadOnly
|
||||
: public RefCounted<DOMPointReadOnly>
|
||||
, public Bindings::Wrappable {
|
||||
class DOMPointReadOnly : public Bindings::PlatformObject {
|
||||
WEB_PLATFORM_OBJECT(DOMPointReadOnly, Bindings::PlatformObject);
|
||||
|
||||
public:
|
||||
using WrapperType = Bindings::DOMPointReadOnlyWrapper;
|
||||
static JS::NonnullGCPtr<DOMPointReadOnly> create_with_global_object(HTML::Window&, double x = 0, double y = 0, double z = 0, double w = 0);
|
||||
|
||||
static NonnullRefPtr<DOMPointReadOnly> create_with_global_object(HTML::Window&, double x = 0, double y = 0, double z = 0, double w = 0)
|
||||
{
|
||||
return DOMPointReadOnly::create(x, y, z, w);
|
||||
}
|
||||
|
||||
static NonnullRefPtr<DOMPointReadOnly> create(double x = 0, double y = 0, double z = 0, double w = 0)
|
||||
{
|
||||
return adopt_ref(*new DOMPointReadOnly(x, y, z, w));
|
||||
}
|
||||
virtual ~DOMPointReadOnly() override;
|
||||
|
||||
double x() const { return m_x; }
|
||||
double y() const { return m_y; }
|
||||
|
@ -36,13 +27,7 @@ public:
|
|||
double w() const { return m_w; }
|
||||
|
||||
protected:
|
||||
DOMPointReadOnly(double x, double y, double z, double w)
|
||||
: m_x(x)
|
||||
, m_y(y)
|
||||
, m_z(z)
|
||||
, m_w(w)
|
||||
{
|
||||
}
|
||||
DOMPointReadOnly(HTML::Window&, double x, double y, double z, double w);
|
||||
|
||||
double m_x;
|
||||
double m_y;
|
||||
|
@ -51,3 +36,5 @@ protected:
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
WRAPPER_HACK(DOMPointReadOnly, Web::Geometry)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue