beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Make DOMPoint and DOMPointReadOnly GC-allocated

Browse source
This commit is contained in:
Andreas Kling 2022-09-03 21:32:14 +02:00
parent a9cae56f8e
commit 44415af428
Notes: sideshowbarker 2024-07-18 02:47:59 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/44415af428
Pull-request: https://github.com/SerenityOS/serenity/pull/14816
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/linusg ✅
9 changed files with 78 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -135,6 +135,8 @@ set(SOURCES
FileAPI/Blob.cpp
FileAPI/File.cpp
FontCache.cpp
Geometry/DOMPoint.cpp
Geometry/DOMPointReadOnly.cpp
Geometry/DOMRectList.cpp
HTML/AttributeNames.cpp
HTML/BrowsingContext.cpp

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

@ -451,8 +451,6 @@ namespace Web::Bindings {
class BlobWrapper;
class CryptoWrapper;
class DOMExceptionWrapper;
class DOMPointWrapper;
class DOMPointReadOnlyWrapper;
class DOMRectListWrapper;
class DOMRectReadOnlyWrapper;
class DOMRectWrapper;

25
Userland/Libraries/LibWeb/Geometry/DOMPoint.cpp Normal file
View 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;
}

22
Userland/Libraries/LibWeb/Geometry/DOMPoint.h
View file

@ -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
View 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;
}

31
Userland/Libraries/LibWeb/Geometry/DOMPointReadOnly.h
View file

@ -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)

4
Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp
View file

@ -26,10 +26,10 @@ float SVGGeometryElement::get_total_length()
return 0;
}
NonnullRefPtr<Geometry::DOMPoint> SVGGeometryElement::get_point_at_length(float distance)
JS::NonnullGCPtr<Geometry::DOMPoint> SVGGeometryElement::get_point_at_length(float distance)
{
(void)distance;
return Geometry::DOMPoint::create(0, 0, 0, 0);
return Geometry::DOMPoint::create_with_global_object(window(), 0, 0, 0, 0);
}
}

2
Userland/Libraries/LibWeb/SVG/SVGGeometryElement.h
View file

@ -21,7 +21,7 @@ public:
virtual Gfx::Path& get_path() = 0;
float get_total_length();
NonnullRefPtr<Geometry::DOMPoint> get_point_at_length(float distance);
JS::NonnullGCPtr<Geometry::DOMPoint> get_point_at_length(float distance);
protected:
SVGGeometryElement(DOM::Document& document, DOM::QualifiedName qualified_name);

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

@ -56,8 +56,8 @@ libweb_js_wrapper(Encoding/TextEncoder)
libweb_js_wrapper(Fetch/Headers ITERABLE)
libweb_js_wrapper(FileAPI/Blob)
libweb_js_wrapper(FileAPI/File)
libweb_js_wrapper(Geometry/DOMPoint)
libweb_js_wrapper(Geometry/DOMPointReadOnly)
libweb_js_wrapper(Geometry/DOMPoint NO_INSTANCE)
libweb_js_wrapper(Geometry/DOMPointReadOnly NO_INSTANCE)
libweb_js_wrapper(Geometry/DOMRect)
libweb_js_wrapper(Geometry/DOMRectList)
libweb_js_wrapper(Geometry/DOMRectReadOnly)