LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-06 02:55:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Port DOMImplementation from DeprecatedString to String

Browse Source
This commit is contained in:
Shannon Booth 2023-08-12 21:30:16 +12:00 committed by Andreas Kling
parent d8ae02ef59
commit 9117bcfd61
Notes: sideshowbarker 2024-07-17 08:42:05 +09:00 
Author: https://github.com/shannonbooth
Commit: https://github.com/SerenityOS/serenity/commit/9117bcfd61
Pull-request: https://github.com/SerenityOS/serenity/pull/20511
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Userland/Libraries/LibWeb/DOM/DOMImplementation.cpp
View File

@ -44,7 +44,7 @@ void DOMImplementation::visit_edges(Cell::Visitor& visitor)
}
// https://dom.spec.whatwg.org/#dom-domimplementation-createdocument
WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> DOMImplementation::create_document(DeprecatedString const& namespace_, DeprecatedString const& qualified_name, JS::GCPtr<DocumentType> doctype) const
WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> DOMImplementation::create_document(Optional<String> const& namespace_, String const& qualified_name, JS::GCPtr<DocumentType> doctype) const
{
// FIXME: 1. Let document be a new XMLDocument
auto xml_document = Document::create(realm());
@ -56,7 +56,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> DOMImplementation::create_docume
// 3. If qualifiedName is not the empty string, then set element to the result of running the internal createElementNS steps, given document, namespace, qualifiedName, and an empty dictionary.
if (!qualified_name.is_empty())
element = TRY(xml_document->create_element_ns(namespace_, qualified_name, ElementCreationOptions {}));
element = TRY(xml_document->create_element_ns(namespace_.value().to_deprecated_string(), qualified_name.to_deprecated_string(), ElementCreationOptions {}));
// 4. If doctype is non-null, append doctype to document.
if (doctype)
@ -70,10 +70,12 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> DOMImplementation::create_docume
xml_document->set_origin(document().origin());
// 7. document’s content type is determined by namespace:
if (namespace_ == Namespace::HTML) {
auto deprecated_namespace = namespace_.has_value() ? namespace_->to_deprecated_string() : DeprecatedString::empty();
if (deprecated_namespace == Namespace::HTML) {
// -> HTML namespace
xml_document->set_content_type("application/xhtml+xml");
} else if (namespace_ == Namespace::SVG) {
} else if (deprecated_namespace == Namespace::SVG) {
// -> SVG namespace
xml_document->set_content_type("image/svg+xml");
} else {
@ -86,7 +88,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> DOMImplementation::create_docume
}
// https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
JS::NonnullGCPtr<Document> DOMImplementation::create_html_document(DeprecatedString const& title) const
JS::NonnullGCPtr<Document> DOMImplementation::create_html_document(Optional<String> const& title) const
{
// 1. Let doc be a new document that is an HTML document.
auto html_document = Document::create(realm());
@ -110,13 +112,13 @@ JS::NonnullGCPtr<Document> DOMImplementation::create_html_document(DeprecatedStr
MUST(html_element->append_child(head_element));
// 6. If title is given:
if (!title.is_null()) {
if (title.has_value()) {
// 1. Append the result of creating an element given doc, title, and the HTML namespace, to the head element created earlier.
auto title_element = create_element(html_document, HTML::TagNames::title, Namespace::HTML).release_value_but_fixme_should_propagate_errors();
MUST(head_element->append_child(title_element));
// 2. Append a new Text node, with its data set to title (which could be the empty string) and its node document set to doc, to the title element created earlier.
auto text_node = heap().allocate<Text>(realm(), html_document, title);
auto text_node = heap().allocate<Text>(realm(), html_document, title->to_deprecated_string());
MUST(title_element->append_child(*text_node));
}
@ -132,16 +134,16 @@ JS::NonnullGCPtr<Document> DOMImplementation::create_html_document(DeprecatedStr
}
// https://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype
WebIDL::ExceptionOr<JS::NonnullGCPtr<DocumentType>> DOMImplementation::create_document_type(DeprecatedString const& qualified_name, DeprecatedString const& public_id, DeprecatedString const& system_id)
WebIDL::ExceptionOr<JS::NonnullGCPtr<DocumentType>> DOMImplementation::create_document_type(String const& qualified_name, String const& public_id, String const& system_id)
{
// 1. Validate qualifiedName.
TRY(Document::validate_qualified_name(realm(), qualified_name));
TRY(Document::validate_qualified_name(realm(), qualified_name.to_deprecated_string()));
// 2. Return a new doctype, with qualifiedName as its name, publicId as its public ID, and systemId as its system ID, and with its node document set to the associated document of this.
auto document_type = DocumentType::create(document());
document_type->set_name(qualified_name);
document_type->set_public_id(public_id);
document_type->set_system_id(system_id);
document_type->set_name(qualified_name.to_deprecated_string());
document_type->set_public_id(public_id.to_deprecated_string());
document_type->set_system_id(system_id.to_deprecated_string());
return document_type;
}

6
Userland/Libraries/LibWeb/DOM/DOMImplementation.h
View File

@ -20,9 +20,9 @@ public:
[[nodiscard]] static JS::NonnullGCPtr<DOMImplementation> create(Document&);
virtual ~DOMImplementation();
WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> create_document(DeprecatedString const&, DeprecatedString const&, JS::GCPtr<DocumentType>) const;
JS::NonnullGCPtr<Document> create_html_document(DeprecatedString const& title) const;
WebIDL::ExceptionOr<JS::NonnullGCPtr<DocumentType>> create_document_type(DeprecatedString const& qualified_name, DeprecatedString const& public_id, DeprecatedString const& system_id);
WebIDL::ExceptionOr<JS::NonnullGCPtr<Document>> create_document(Optional<String> const&, String const&, JS::GCPtr<DocumentType>) const;
JS::NonnullGCPtr<Document> create_html_document(Optional<String> const& title) const;
WebIDL::ExceptionOr<JS::NonnullGCPtr<DocumentType>> create_document_type(String const& qualified_name, String const& public_id, String const& system_id);
// https://dom.spec.whatwg.org/#dom-domimplementation-hasfeature
bool has_feature() const

2
Userland/Libraries/LibWeb/DOM/DOMImplementation.idl
View File

@ -1,7 +1,7 @@
#import <DOM/Document.idl>
// https://dom.spec.whatwg.org/#domimplementation
[Exposed=Window]
[Exposed=Window, UseNewAKString]
interface DOMImplementation {
// FIXME: This should return XMLDocument instead of Document.