mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-26 12:17:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Make DOM::Position's node mandatory

Browse source 
We can only construct positions if there's a node involved, which was
already enforced by Position::create() only accepting a GC::Ref.
This commit is contained in:
Jelle Raaijmakers 2025-08-20 11:32:16 +02:00 • committed by Tim Ledbetter
commit 51ce46859e
Notes: github-actions[bot] 2025-08-20 11:26:01 +00:00
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibWeb/DOM/Document.cpp
View file

@ -477,14 +477,11 @@ Document::Document(JS::Realm& realm, const URL::URL& url, TemporaryDocumentForFr
if (!cursor_position) if (!cursor_position)
return; return;
auto node = cursor_position->node();
if (!node)
return;
auto navigable = this->navigable(); auto navigable = this->navigable();
if (!navigable || !navigable->is_focused()) if (!navigable || !navigable->is_focused())
return; return;
auto node = cursor_position->node();
node->document().update_layout(UpdateLayoutReason::CursorBlinkTimer); node->document().update_layout(UpdateLayoutReason::CursorBlinkTimer);
if (node->paintable()) { if (node->paintable()) {

5
Libraries/LibWeb/DOM/Position.cpp
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <andreas@ladybird.org> * Copyright (c) 2018-2020, Andreas Kling <andreas@ladybird.org>
* Copyright (c) 2021, Max Wipfli <mail@maxwipfli.ch> * Copyright (c) 2021, Max Wipfli <mail@maxwipfli.ch>
* Copyright (c) 2025, Jelle Raaijmakers <jelle@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -13,7 +14,7 @@ namespace Web::DOM {
GC_DEFINE_ALLOCATOR(Position); GC_DEFINE_ALLOCATOR(Position);
Position::Position(GC::Ptr<Node> node, unsigned offset) Position::Position(GC::Ref<Node> node, unsigned offset)
: m_node(node) : m_node(node)
, m_offset(offset) , m_offset(offset)
{ {
@ -27,8 +28,6 @@ void Position::visit_edges(Visitor& visitor)
ErrorOr<String> Position::to_string() const ErrorOr<String> Position::to_string() const
{ {
if (!node())
return String::formatted("DOM::Position(nullptr, {})", offset());
return String::formatted("DOM::Position({} ({})), {})", node()->node_name(), node().ptr(), offset()); return String::formatted("DOM::Position({} ({})), {})", node()->node_name(), node().ptr(), offset());
} }

12
Libraries/LibWeb/DOM/Position.h
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <andreas@ladybird.org> * Copyright (c) 2018-2020, Andreas Kling <andreas@ladybird.org>
* Copyright (c) 2021, Max Wipfli <mail@maxwipfli.ch> * Copyright (c) 2021, Max Wipfli <mail@maxwipfli.ch>
* Copyright (c) 2025, Jelle Raaijmakers <jelle@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,7 +9,6 @@
#pragma once #pragma once
#include <AK/Error.h> #include <AK/Error.h>
#include <AK/RefPtr.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibGC/Heap.h> #include <LibGC/Heap.h>
#include <LibWeb/DOM/Node.h> #include <LibWeb/DOM/Node.h>
@ -26,24 +26,24 @@ public:
return realm.create<Position>(node, offset); return realm.create<Position>(node, offset);
} }
GC::Ptr<Node> node() { return m_node; } GC::Ref<Node> node() { return m_node; }
GC::Ptr<Node const> node() const { return m_node; } GC::Ref<Node const> node() const { return m_node; }
unsigned offset() const { return m_offset; } unsigned offset() const { return m_offset; }
bool equals(GC::Ref<Position> other) const bool equals(GC::Ref<Position> other) const
{ {
return m_node.ptr() == other->m_node.ptr() && m_offset == other->m_offset; return m_node == other->m_node && m_offset == other->m_offset;
} }
ErrorOr<String> to_string() const; ErrorOr<String> to_string() const;
private: private:
Position(GC::Ptr<Node>, unsigned offset); Position(GC::Ref<Node>, unsigned offset);
virtual void visit_edges(Visitor&) override; virtual void visit_edges(Visitor&) override;
GC::Ptr<Node> m_node; GC::Ref<Node> m_node;
unsigned m_offset { 0 }; unsigned m_offset { 0 };
}; };

2
Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -695,7 +695,7 @@ void paint_cursor_if_needed(DisplayListRecordingContext& context, TextPaintable
return; return;
auto cursor_position = document.cursor_position(); auto cursor_position = document.cursor_position();
if (!cursor_position || !cursor_position->node()) if (!cursor_position)
return; return;
if (cursor_position->node() != paintable.dom_node()) if (cursor_position->node() != paintable.dom_node())