RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:37:35 +00:00
Code Issues Activity Actions

LibWeb: Fix some FIXMEs related to ExceptionOr<T>

Browse source 
This fixes a few FIXMEs mentioned in 5beacf08a2,
which depended on #6075 being fixed.
This commit is contained in:
AnotherTest 2021-04-13 23:03:48 +04:30 • committed by Andreas Kling
parent 8ba2b5f36f
commit 9c201767a0
4 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -743,17 +743,13 @@ void Document::adopt_node(Node& node)
} }
// https://dom.spec.whatwg.org/#dom-document-adoptnode // https://dom.spec.whatwg.org/#dom-document-adoptnode
NonnullRefPtr<Node> Document::adopt_node_binding(NonnullRefPtr<Node> node) ExceptionOr<NonnullRefPtr<Node>> Document::adopt_node_binding(NonnullRefPtr<Node> node)
{ {
if (is<Document>(*node)) { if (is<Document>(*node))
dbgln("Document::adopt_node_binding: Cannot adopt a document into a document (FIXME: throw as NotSupportedError exception, see issue #6075"); return DOM ::NotSupportedError::create("Cannot adopt a document into a document");
return node;
}
if (is<ShadowRoot>(*node)) { if (is<ShadowRoot>(*node))
dbgln("Document::adopt_node_binding: Cannot adopt a shadow root into a document (FIXME: throw as HierarchyRequestError exception, see issue #6075"); return DOM::HierarchyRequestError::create("Cannot adopt a shadow root into a document");
return node;
}
if (is<DocumentFragment>(*node) && downcast<DocumentFragment>(*node).host()) if (is<DocumentFragment>(*node) && downcast<DocumentFragment>(*node).host())
return node; return node;

2
Userland/Libraries/LibWeb/DOM/Document.h
View file

@ -189,7 +189,7 @@ public:
void set_quirks_mode(QuirksMode mode) { m_quirks_mode = mode; } void set_quirks_mode(QuirksMode mode) { m_quirks_mode = mode; }
void adopt_node(Node&); void adopt_node(Node&);
NonnullRefPtr<Node> adopt_node_binding(NonnullRefPtr<Node>); ExceptionOr<NonnullRefPtr<Node>> adopt_node_binding(NonnullRefPtr<Node>);
const DocumentType* doctype() const; const DocumentType* doctype() const;
const String& compat_mode() const; const String& compat_mode() const;

18
Userland/Libraries/LibWeb/DOM/Node.cpp
View file

@ -280,13 +280,11 @@ void Node::insert_before(NonnullRefPtr<Node> node, RefPtr<Node> child, bool supp
} }
// https://dom.spec.whatwg.org/#concept-node-pre-insert // https://dom.spec.whatwg.org/#concept-node-pre-insert
NonnullRefPtr<Node> Node::pre_insert(NonnullRefPtr<Node> node, RefPtr<Node> child) ExceptionOr<NonnullRefPtr<Node>> Node::pre_insert(NonnullRefPtr<Node> node, RefPtr<Node> child)
{ {
auto validity_result = ensure_pre_insertion_validity(node, child); auto validity_result = ensure_pre_insertion_validity(node, child);
if (validity_result.is_exception()) { if (validity_result.is_exception())
dbgln("Node::pre_insert: ensure_pre_insertion_validity failed: {}. (FIXME: throw as exception, see issue #6075)", validity_result.exception().message()); return NonnullRefPtr<DOMException>(validity_result.exception());
return node;
}
auto reference_child = child; auto reference_child = child;
if (reference_child == node) if (reference_child == node)
@ -297,12 +295,10 @@ NonnullRefPtr<Node> Node::pre_insert(NonnullRefPtr<Node> node, RefPtr<Node> chil
} }
// https://dom.spec.whatwg.org/#concept-node-pre-remove // https://dom.spec.whatwg.org/#concept-node-pre-remove
NonnullRefPtr<Node> Node::pre_remove(NonnullRefPtr<Node> child) ExceptionOr<NonnullRefPtr<Node>> Node::pre_remove(NonnullRefPtr<Node> child)
{ {
if (child->parent() != this) { if (child->parent() != this)
dbgln("Node::pre_remove: Child doesn't belong to this node. (FIXME: throw NotFoundError DOMException, see issue #6075)"); return DOM::NotFoundError::create("Child does not belong to this node");
return child;
}
child->remove(); child->remove();
@ -310,7 +306,7 @@ NonnullRefPtr<Node> Node::pre_remove(NonnullRefPtr<Node> child)
} }
// https://dom.spec.whatwg.org/#concept-node-append // https://dom.spec.whatwg.org/#concept-node-append
NonnullRefPtr<Node> Node::append_child(NonnullRefPtr<Node> node) ExceptionOr<NonnullRefPtr<Node>> Node::append_child(NonnullRefPtr<Node> node)
{ {
return pre_insert(node, nullptr); return pre_insert(node, nullptr);
} }

6
Userland/Libraries/LibWeb/DOM/Node.h
View file

@ -93,10 +93,10 @@ public:
virtual bool is_editable() const; virtual bool is_editable() const;
NonnullRefPtr<Node> pre_insert(NonnullRefPtr<Node>, RefPtr<Node>); ExceptionOr<NonnullRefPtr<Node>> pre_insert(NonnullRefPtr<Node>, RefPtr<Node>);
NonnullRefPtr<Node> pre_remove(NonnullRefPtr<Node>); ExceptionOr<NonnullRefPtr<Node>> pre_remove(NonnullRefPtr<Node>);
NonnullRefPtr<Node> append_child(NonnullRefPtr<Node>); ExceptionOr<NonnullRefPtr<Node>> append_child(NonnullRefPtr<Node>);
void insert_before(NonnullRefPtr<Node> node, RefPtr<Node> child, bool suppress_observers = false); void insert_before(NonnullRefPtr<Node> node, RefPtr<Node> child, bool suppress_observers = false);
void remove(bool suppress_observers = false); void remove(bool suppress_observers = false);
void remove_all_children(bool suppress_observers = false); void remove_all_children(bool suppress_observers = false);