diff options
author | AnotherTest <ali.mpfard@gmail.com> | 2021-04-13 23:03:48 +0430 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-04-13 22:31:06 +0200 |
commit | 9c201767a011979ba84b614eca4d5301f867c42f (patch) | |
tree | be0b5f50f8be6de610c9f7c703d6d696a99f2b4e | |
parent | 8ba2b5f36f5420402b71d5eaf90aa2961a0705d2 (diff) | |
download | serenity-9c201767a011979ba84b614eca4d5301f867c42f.zip |
LibWeb: Fix some FIXMEs related to ExceptionOr<T>
This fixes a few FIXMEs mentioned in 5beacf08a2d578d0eb36d6320255d0f4634a1085,
which depended on #6075 being fixed.
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Document.cpp | 14 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Document.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Node.cpp | 18 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Node.h | 6 |
4 files changed, 16 insertions, 24 deletions
diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 68cf4fed8d..3cf3a18aa1 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -743,17 +743,13 @@ void Document::adopt_node(Node& node) } // 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)) { - dbgln("Document::adopt_node_binding: Cannot adopt a document into a document (FIXME: throw as NotSupportedError exception, see issue #6075"); - return node; - } + if (is<Document>(*node)) + return DOM ::NotSupportedError::create("Cannot adopt a document into a document"); - 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 node; - } + if (is<ShadowRoot>(*node)) + return DOM::HierarchyRequestError::create("Cannot adopt a shadow root into a document"); if (is<DocumentFragment>(*node) && downcast<DocumentFragment>(*node).host()) return node; diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h index f3fa83b674..27d350b256 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.h +++ b/Userland/Libraries/LibWeb/DOM/Document.h @@ -189,7 +189,7 @@ public: void set_quirks_mode(QuirksMode mode) { m_quirks_mode = mode; } void adopt_node(Node&); - NonnullRefPtr<Node> adopt_node_binding(NonnullRefPtr<Node>); + ExceptionOr<NonnullRefPtr<Node>> adopt_node_binding(NonnullRefPtr<Node>); const DocumentType* doctype() const; const String& compat_mode() const; diff --git a/Userland/Libraries/LibWeb/DOM/Node.cpp b/Userland/Libraries/LibWeb/DOM/Node.cpp index a784afd242..90ccf5ef2d 100644 --- a/Userland/Libraries/LibWeb/DOM/Node.cpp +++ b/Userland/Libraries/LibWeb/DOM/Node.cpp @@ -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 -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); - 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 node; - } + if (validity_result.is_exception()) + return NonnullRefPtr<DOMException>(validity_result.exception()); auto reference_child = child; 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 -NonnullRefPtr<Node> Node::pre_remove(NonnullRefPtr<Node> child) +ExceptionOr<NonnullRefPtr<Node>> Node::pre_remove(NonnullRefPtr<Node> child) { - if (child->parent() != this) { - dbgln("Node::pre_remove: Child doesn't belong to this node. (FIXME: throw NotFoundError DOMException, see issue #6075)"); - return child; - } + if (child->parent() != this) + return DOM::NotFoundError::create("Child does not belong to this node"); child->remove(); @@ -310,7 +306,7 @@ NonnullRefPtr<Node> Node::pre_remove(NonnullRefPtr<Node> child) } // 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); } diff --git a/Userland/Libraries/LibWeb/DOM/Node.h b/Userland/Libraries/LibWeb/DOM/Node.h index f399f88d7f..e4a2927c51 100644 --- a/Userland/Libraries/LibWeb/DOM/Node.h +++ b/Userland/Libraries/LibWeb/DOM/Node.h @@ -93,10 +93,10 @@ public: virtual bool is_editable() const; - NonnullRefPtr<Node> pre_insert(NonnullRefPtr<Node>, RefPtr<Node>); - NonnullRefPtr<Node> pre_remove(NonnullRefPtr<Node>); + ExceptionOr<NonnullRefPtr<Node>> pre_insert(NonnullRefPtr<Node>, RefPtr<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 remove(bool suppress_observers = false); void remove_all_children(bool suppress_observers = false); |