mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-29 04:09:13 +00:00
LibGC+Everywhere: Factor out a LibGC from LibJS
Resulting in a massive rename across almost everywhere! Alongside the namespace change, we now have the following names: * JS::NonnullGCPtr -> GC::Ref * JS::GCPtr -> GC::Ptr * JS::HeapFunction -> GC::Function * JS::CellImpl -> GC::Cell * JS::Handle -> GC::Root
This commit is contained in:
parent
ce23efc5f6
commit
f87041bf3a
Notes:
github-actions[bot]
2024-11-15 13:50:17 +00:00
Author: https://github.com/shannonbooth
Commit: f87041bf3a
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2345
1722 changed files with 9939 additions and 9906 deletions
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibJS/Heap/Heap.h>
|
||||
#include <LibGC/Heap.h>
|
||||
#include <LibWeb/Bindings/ExceptionOrUtils.h>
|
||||
#include <LibWeb/DOM/Element.h>
|
||||
#include <LibWeb/Painting/PaintableBox.h>
|
||||
|
@ -12,9 +12,9 @@
|
|||
|
||||
namespace Web::ResizeObserver {
|
||||
|
||||
JS_DEFINE_ALLOCATOR(ResizeObservation);
|
||||
GC_DEFINE_ALLOCATOR(ResizeObservation);
|
||||
|
||||
WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObservation>> ResizeObservation::create(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box)
|
||||
WebIDL::ExceptionOr<GC::Ref<ResizeObservation>> ResizeObservation::create(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box)
|
||||
{
|
||||
return realm.create<ResizeObservation>(realm, target, observed_box);
|
||||
}
|
||||
|
|
|
@ -14,28 +14,28 @@ namespace Web::ResizeObserver {
|
|||
|
||||
// https://drafts.csswg.org/resize-observer-1/#resize-observation-interface
|
||||
class ResizeObservation : public JS::Cell {
|
||||
JS_CELL(ResizeObservation, JS::Cell);
|
||||
JS_DECLARE_ALLOCATOR(ResizeObservation);
|
||||
GC_CELL(ResizeObservation, JS::Cell);
|
||||
GC_DECLARE_ALLOCATOR(ResizeObservation);
|
||||
|
||||
public:
|
||||
static WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObservation>> create(JS::Realm&, DOM::Element&, Bindings::ResizeObserverBoxOptions);
|
||||
static WebIDL::ExceptionOr<GC::Ref<ResizeObservation>> create(JS::Realm&, DOM::Element&, Bindings::ResizeObserverBoxOptions);
|
||||
|
||||
bool is_active();
|
||||
|
||||
JS::NonnullGCPtr<DOM::Element> target() const { return m_target; }
|
||||
GC::Ref<DOM::Element> target() const { return m_target; }
|
||||
Bindings::ResizeObserverBoxOptions observed_box() const { return m_observed_box; }
|
||||
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>>& last_reported_sizes() { return m_last_reported_sizes; }
|
||||
Vector<GC::Ref<ResizeObserverSize>>& last_reported_sizes() { return m_last_reported_sizes; }
|
||||
|
||||
explicit ResizeObservation(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box);
|
||||
|
||||
private:
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
JS::NonnullGCPtr<JS::Realm> m_realm;
|
||||
JS::NonnullGCPtr<DOM::Element> m_target;
|
||||
GC::Ref<JS::Realm> m_realm;
|
||||
GC::Ref<DOM::Element> m_target;
|
||||
Bindings::ResizeObserverBoxOptions m_observed_box;
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> m_last_reported_sizes;
|
||||
Vector<GC::Ref<ResizeObserverSize>> m_last_reported_sizes;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
|
||||
namespace Web::ResizeObserver {
|
||||
|
||||
JS_DEFINE_ALLOCATOR(ResizeObserver);
|
||||
GC_DEFINE_ALLOCATOR(ResizeObserver);
|
||||
|
||||
// https://drafts.csswg.org/resize-observer/#dom-resizeobserver-resizeobserver
|
||||
WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObserver>> ResizeObserver::construct_impl(JS::Realm& realm, WebIDL::CallbackType* callback)
|
||||
WebIDL::ExceptionOr<GC::Ref<ResizeObserver>> ResizeObserver::construct_impl(JS::Realm& realm, WebIDL::CallbackType* callback)
|
||||
{
|
||||
return realm.create<ResizeObserver>(realm, callback);
|
||||
}
|
||||
|
@ -97,7 +97,7 @@ void ResizeObserver::disconnect()
|
|||
m_active_targets.clear();
|
||||
}
|
||||
|
||||
void ResizeObserver::invoke_callback(ReadonlySpan<JS::NonnullGCPtr<ResizeObserverEntry>> entries) const
|
||||
void ResizeObserver::invoke_callback(ReadonlySpan<GC::Ref<ResizeObserverEntry>> entries) const
|
||||
{
|
||||
auto& callback = *m_callback;
|
||||
auto& realm = callback.callback_context->realm();
|
||||
|
|
|
@ -20,10 +20,10 @@ struct ResizeObserverOptions {
|
|||
// https://drafts.csswg.org/resize-observer-1/#resize-observer-interface
|
||||
class ResizeObserver : public Bindings::PlatformObject {
|
||||
WEB_PLATFORM_OBJECT(ResizeObserver, Bindings::PlatformObject);
|
||||
JS_DECLARE_ALLOCATOR(ResizeObserver);
|
||||
GC_DECLARE_ALLOCATOR(ResizeObserver);
|
||||
|
||||
public:
|
||||
static WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObserver>> construct_impl(JS::Realm&, WebIDL::CallbackType* callback);
|
||||
static WebIDL::ExceptionOr<GC::Ref<ResizeObserver>> construct_impl(JS::Realm&, WebIDL::CallbackType* callback);
|
||||
|
||||
virtual ~ResizeObserver() override;
|
||||
|
||||
|
@ -31,11 +31,11 @@ public:
|
|||
void unobserve(DOM::Element& target);
|
||||
void disconnect();
|
||||
|
||||
void invoke_callback(ReadonlySpan<JS::NonnullGCPtr<ResizeObserverEntry>> entries) const;
|
||||
void invoke_callback(ReadonlySpan<GC::Ref<ResizeObserverEntry>> entries) const;
|
||||
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>>& observation_targets() { return m_observation_targets; }
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>>& active_targets() { return m_active_targets; }
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>>& skipped_targets() { return m_skipped_targets; }
|
||||
Vector<GC::Ref<ResizeObservation>>& observation_targets() { return m_observation_targets; }
|
||||
Vector<GC::Ref<ResizeObservation>>& active_targets() { return m_active_targets; }
|
||||
Vector<GC::Ref<ResizeObservation>>& skipped_targets() { return m_skipped_targets; }
|
||||
|
||||
private:
|
||||
explicit ResizeObserver(JS::Realm&, WebIDL::CallbackType* callback);
|
||||
|
@ -44,10 +44,10 @@ private:
|
|||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
virtual void finalize() override;
|
||||
|
||||
JS::GCPtr<WebIDL::CallbackType> m_callback;
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>> m_observation_targets;
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>> m_active_targets;
|
||||
Vector<JS::NonnullGCPtr<ResizeObservation>> m_skipped_targets;
|
||||
GC::Ptr<WebIDL::CallbackType> m_callback;
|
||||
Vector<GC::Ref<ResizeObservation>> m_observation_targets;
|
||||
Vector<GC::Ref<ResizeObservation>> m_active_targets;
|
||||
Vector<GC::Ref<ResizeObservation>> m_skipped_targets;
|
||||
|
||||
// AD-HOC: This is the document where we've registered the observer.
|
||||
WeakPtr<DOM::Document> m_document;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibJS/Heap/Heap.h>
|
||||
#include <LibGC/Heap.h>
|
||||
#include <LibWeb/Bindings/ExceptionOrUtils.h>
|
||||
#include <LibWeb/Bindings/Intrinsics.h>
|
||||
#include <LibWeb/Bindings/ResizeObserverEntryPrototype.h>
|
||||
|
@ -13,10 +13,10 @@
|
|||
|
||||
namespace Web::ResizeObserver {
|
||||
|
||||
JS_DEFINE_ALLOCATOR(ResizeObserverEntry);
|
||||
GC_DEFINE_ALLOCATOR(ResizeObserverEntry);
|
||||
|
||||
// https://drafts.csswg.org/resize-observer-1/#create-and-populate-resizeobserverentry-h
|
||||
WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObserverEntry>> ResizeObserverEntry::create_and_populate(JS::Realm& realm, DOM::Element& target)
|
||||
WebIDL::ExceptionOr<GC::Ref<ResizeObserverEntry>> ResizeObserverEntry::create_and_populate(JS::Realm& realm, DOM::Element& target)
|
||||
{
|
||||
// 1. Let this be a new ResizeObserverEntry.
|
||||
// 2. Set this.target slot to target.
|
||||
|
@ -74,9 +74,9 @@ void ResizeObserverEntry::visit_edges(JS::Cell::Visitor& visitor)
|
|||
visitor.visit(m_content_rect);
|
||||
}
|
||||
|
||||
static JS::NonnullGCPtr<JS::Object> to_js_array(JS::Realm& realm, Vector<JS::NonnullGCPtr<ResizeObserverSize>> const& sizes)
|
||||
static GC::Ref<JS::Object> to_js_array(JS::Realm& realm, Vector<GC::Ref<ResizeObserverSize>> const& sizes)
|
||||
{
|
||||
JS::MarkedVector<JS::Value> vector(realm.heap());
|
||||
GC::MarkedVector<JS::Value> vector(realm.heap());
|
||||
for (auto const& size : sizes)
|
||||
vector.append(JS::Value(size.ptr()));
|
||||
|
||||
|
@ -85,17 +85,17 @@ static JS::NonnullGCPtr<JS::Object> to_js_array(JS::Realm& realm, Vector<JS::Non
|
|||
return array;
|
||||
}
|
||||
|
||||
JS::NonnullGCPtr<JS::Object> ResizeObserverEntry::border_box_size_js_array() const
|
||||
GC::Ref<JS::Object> ResizeObserverEntry::border_box_size_js_array() const
|
||||
{
|
||||
return to_js_array(realm(), m_border_box_size);
|
||||
}
|
||||
|
||||
JS::NonnullGCPtr<JS::Object> ResizeObserverEntry::content_box_size_js_array() const
|
||||
GC::Ref<JS::Object> ResizeObserverEntry::content_box_size_js_array() const
|
||||
{
|
||||
return to_js_array(realm(), m_content_box_size);
|
||||
}
|
||||
|
||||
JS::NonnullGCPtr<JS::Object> ResizeObserverEntry::device_pixel_content_box_size_js_array() const
|
||||
GC::Ref<JS::Object> ResizeObserverEntry::device_pixel_content_box_size_js_array() const
|
||||
{
|
||||
return to_js_array(realm(), m_device_pixel_content_box_size);
|
||||
}
|
||||
|
|
|
@ -18,21 +18,21 @@ namespace Web::ResizeObserver {
|
|||
// https://drafts.csswg.org/resize-observer-1/#resize-observer-entry-interface
|
||||
class ResizeObserverEntry : public Bindings::PlatformObject {
|
||||
WEB_PLATFORM_OBJECT(ResizeObserverEntry, Bindings::PlatformObject);
|
||||
JS_DECLARE_ALLOCATOR(ResizeObserverEntry);
|
||||
GC_DECLARE_ALLOCATOR(ResizeObserverEntry);
|
||||
|
||||
public:
|
||||
static WebIDL::ExceptionOr<JS::NonnullGCPtr<ResizeObserverEntry>> create_and_populate(JS::Realm&, DOM::Element& target);
|
||||
static WebIDL::ExceptionOr<GC::Ref<ResizeObserverEntry>> create_and_populate(JS::Realm&, DOM::Element& target);
|
||||
|
||||
JS::NonnullGCPtr<Geometry::DOMRectReadOnly> content_rect() const { return *m_content_rect; }
|
||||
JS::NonnullGCPtr<DOM::Element> target() const { return m_target; }
|
||||
GC::Ref<Geometry::DOMRectReadOnly> content_rect() const { return *m_content_rect; }
|
||||
GC::Ref<DOM::Element> target() const { return m_target; }
|
||||
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> const& border_box_size() const { return m_border_box_size; }
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> const& content_box_size() const { return m_content_box_size; }
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> const& device_pixel_content_box_size() const { return m_device_pixel_content_box_size; }
|
||||
Vector<GC::Ref<ResizeObserverSize>> const& border_box_size() const { return m_border_box_size; }
|
||||
Vector<GC::Ref<ResizeObserverSize>> const& content_box_size() const { return m_content_box_size; }
|
||||
Vector<GC::Ref<ResizeObserverSize>> const& device_pixel_content_box_size() const { return m_device_pixel_content_box_size; }
|
||||
|
||||
JS::NonnullGCPtr<JS::Object> border_box_size_js_array() const;
|
||||
JS::NonnullGCPtr<JS::Object> content_box_size_js_array() const;
|
||||
JS::NonnullGCPtr<JS::Object> device_pixel_content_box_size_js_array() const;
|
||||
GC::Ref<JS::Object> border_box_size_js_array() const;
|
||||
GC::Ref<JS::Object> content_box_size_js_array() const;
|
||||
GC::Ref<JS::Object> device_pixel_content_box_size_js_array() const;
|
||||
|
||||
private:
|
||||
explicit ResizeObserverEntry(JS::Realm& realm, DOM::Element& target)
|
||||
|
@ -44,13 +44,13 @@ private:
|
|||
virtual void initialize(JS::Realm&) override;
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
JS::NonnullGCPtr<DOM::Element> m_target;
|
||||
GC::Ref<DOM::Element> m_target;
|
||||
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> m_content_box_size;
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> m_border_box_size;
|
||||
Vector<JS::NonnullGCPtr<ResizeObserverSize>> m_device_pixel_content_box_size;
|
||||
Vector<GC::Ref<ResizeObserverSize>> m_content_box_size;
|
||||
Vector<GC::Ref<ResizeObserverSize>> m_border_box_size;
|
||||
Vector<GC::Ref<ResizeObserverSize>> m_device_pixel_content_box_size;
|
||||
|
||||
JS::GCPtr<Geometry::DOMRectReadOnly> m_content_rect;
|
||||
GC::Ptr<Geometry::DOMRectReadOnly> m_content_rect;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibJS/Heap/Heap.h>
|
||||
#include <LibGC/Heap.h>
|
||||
#include <LibWeb/Bindings/ResizeObserverSizePrototype.h>
|
||||
#include <LibWeb/HTML/Window.h>
|
||||
#include <LibWeb/Painting/PaintableBox.h>
|
||||
|
@ -12,7 +12,7 @@
|
|||
|
||||
namespace Web::ResizeObserver {
|
||||
|
||||
JS_DEFINE_ALLOCATOR(ResizeObserverSize);
|
||||
GC_DEFINE_ALLOCATOR(ResizeObserverSize);
|
||||
|
||||
void ResizeObserverSize::initialize(JS::Realm& realm)
|
||||
{
|
||||
|
@ -21,7 +21,7 @@ void ResizeObserverSize::initialize(JS::Realm& realm)
|
|||
}
|
||||
|
||||
// https://drafts.csswg.org/resize-observer-1/#calculate-box-size
|
||||
JS::NonnullGCPtr<ResizeObserverSize> ResizeObserverSize::calculate_box_size(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box)
|
||||
GC::Ref<ResizeObserverSize> ResizeObserverSize::calculate_box_size(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box)
|
||||
{
|
||||
// 1. Let computedSize be a new ResizeObserverSize object.
|
||||
auto computed_size = realm.create<ResizeObserverSize>(realm);
|
||||
|
|
|
@ -14,10 +14,10 @@ namespace Web::ResizeObserver {
|
|||
// https://drafts.csswg.org/resize-observer-1/#resizeobserversize
|
||||
class ResizeObserverSize : public Bindings::PlatformObject {
|
||||
WEB_PLATFORM_OBJECT(ResizeObserverSize, Bindings::PlatformObject);
|
||||
JS_DECLARE_ALLOCATOR(ResizeObserverSize);
|
||||
GC_DECLARE_ALLOCATOR(ResizeObserverSize);
|
||||
|
||||
public:
|
||||
static JS::NonnullGCPtr<ResizeObserverSize> calculate_box_size(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box);
|
||||
static GC::Ref<ResizeObserverSize> calculate_box_size(JS::Realm& realm, DOM::Element& target, Bindings::ResizeObserverBoxOptions observed_box);
|
||||
|
||||
double inline_size() const { return m_inline_size; }
|
||||
void set_inline_size(double inline_size) { m_inline_size = inline_size; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue