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

LibWeb: Port supported property names from DeprecatedString to String

Browse source
This commit is contained in:
Shannon Booth 2023-11-21 07:39:58 +13:00 • committed by Tim Flynn
parent 66ac0d88a3
commit 629f661e3b
19 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp
View file

@ -91,13 +91,13 @@ Vector<DOMStringMap::NameValuePair> DOMStringMap::get_name_value_pairs() const
// https://html.spec.whatwg.org/multipage/dom.html#concept-domstringmap-pairs
// NOTE: There isn't a direct link to this, so the link is to one of the algorithms above it.
Vector<DeprecatedString> DOMStringMap::supported_property_names() const
Vector<String> DOMStringMap::supported_property_names() const
{
// The supported property names on a DOMStringMap object at any instant are the names of each pair returned from getting the DOMStringMap's name-value pairs at that instant, in the order returned.
Vector<DeprecatedString> names;
Vector<String> names;
auto name_value_pairs = get_name_value_pairs();
for (auto& name_value_pair : name_value_pairs) {
names.append(name_value_pair.name);
names.append(MUST(String::from_deprecated_string(name_value_pair.name)));
}
return names;
}

2
Userland/Libraries/LibWeb/HTML/DOMStringMap.h
View file

@ -37,7 +37,7 @@ private:
// ^LegacyPlatformObject
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const&) const override;
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual Vector<String> supported_property_names() const override;
virtual bool supports_indexed_properties() const override { return false; }
virtual bool supports_named_properties() const override { return true; }

8
Userland/Libraries/LibWeb/HTML/MimeTypeArray.cpp
View file

@ -28,7 +28,7 @@ void MimeTypeArray::initialize(JS::Realm& realm)
}
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewing-support:support-named-properties-2
Vector<DeprecatedString> MimeTypeArray::supported_property_names() const
Vector<String> MimeTypeArray::supported_property_names() const
{
// The MimeTypeArray interface supports named properties. If the user agent's PDF viewer supported is true, then they are the PDF viewer mime types. Otherwise, they are the empty list.
auto const& window = verify_cast<HTML::Window>(HTML::relevant_global_object(*this));
@ -37,9 +37,9 @@ Vector<DeprecatedString> MimeTypeArray::supported_property_names() const
return {};
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewer-mime-types
static Vector<DeprecatedString> mime_types = {
"application/pdf"sv,
"text/pdf"sv,
static Vector<String> const mime_types = {
"application/pdf"_string,
"text/pdf"_string,
};
return mime_types;

2
Userland/Libraries/LibWeb/HTML/MimeTypeArray.h
View file

@ -28,7 +28,7 @@ private:
virtual void initialize(JS::Realm&) override;
// ^Bindings::LegacyPlatformObject
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual Vector<String> supported_property_names() const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const& name) const override;
virtual bool is_supported_property_index(u32) const override;

8
Userland/Libraries/LibWeb/HTML/Plugin.cpp
View file

@ -52,7 +52,7 @@ String Plugin::filename() const
}
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewing-support:support-named-properties-3
Vector<DeprecatedString> Plugin::supported_property_names() const
Vector<String> Plugin::supported_property_names() const
{
// The Plugin interface supports named properties. If the user agent's PDF viewer supported is true, then they are the PDF viewer mime types. Otherwise, they are the empty list.
auto const& window = verify_cast<HTML::Window>(HTML::relevant_global_object(*this));
@ -61,9 +61,9 @@ Vector<DeprecatedString> Plugin::supported_property_names() const
return {};
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewer-mime-types
static Vector<DeprecatedString> mime_types = {
"application/pdf"sv,
"text/pdf"sv,
static Vector<String> const mime_types = {
"application/pdf"_string,
"text/pdf"_string,
};
return mime_types;

2
Userland/Libraries/LibWeb/HTML/Plugin.h
View file

@ -34,7 +34,7 @@ private:
virtual void initialize(JS::Realm&) override;
// ^Bindings::LegacyPlatformObject
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual Vector<String> supported_property_names() const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const& name) const override;
virtual bool is_supported_property_index(u32) const override;

14
Userland/Libraries/LibWeb/HTML/PluginArray.cpp
View file

@ -34,7 +34,7 @@ void PluginArray::refresh() const
}
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewing-support:support-named-properties
Vector<DeprecatedString> PluginArray::supported_property_names() const
Vector<String> PluginArray::supported_property_names() const
{
// The PluginArray interface supports named properties. If the user agent's PDF viewer supported is true, then they are the PDF viewer plugin names. Otherwise, they are the empty list.
auto const& window = verify_cast<HTML::Window>(HTML::relevant_global_object(*this));
@ -43,12 +43,12 @@ Vector<DeprecatedString> PluginArray::supported_property_names() const
return {};
// https://html.spec.whatwg.org/multipage/system-state.html#pdf-viewer-plugin-names
static Vector<DeprecatedString> plugin_names = {
"PDF Viewer"sv,
"Chrome PDF Viewer"sv,
"Chromium PDF Viewer"sv,
"Microsoft Edge PDF Viewer"sv,
"WebKit built-in PDF"sv,
static Vector<String> const plugin_names = {
"PDF Viewer"_string,
"Chrome PDF Viewer"_string,
"Chromium PDF Viewer"_string,
"Microsoft Edge PDF Viewer"_string,
"WebKit built-in PDF"_string,
};
return plugin_names;

2
Userland/Libraries/LibWeb/HTML/PluginArray.h
View file

@ -29,7 +29,7 @@ private:
virtual void initialize(JS::Realm&) override;
// ^Bindings::LegacyPlatformObject
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual Vector<String> supported_property_names() const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const& name) const override;
virtual bool is_supported_property_index(u32) const override;

6
Userland/Libraries/LibWeb/HTML/Storage.cpp
View file

@ -149,13 +149,13 @@ void Storage::broadcast(StringView key, StringView old_value, StringView new_val
// FIXME: Implement.
}
Vector<DeprecatedString> Storage::supported_property_names() const
Vector<String> Storage::supported_property_names() const
{
// The supported property names on a Storage object storage are the result of running get the keys on storage's map.
Vector<DeprecatedString> names;
Vector<String> names;
names.ensure_capacity(m_map.size());
for (auto const& key : m_map.keys())
names.unchecked_append(key.to_deprecated_string());
names.unchecked_append(key);
return names;
}

2
Userland/Libraries/LibWeb/HTML/Storage.h
View file

@ -40,7 +40,7 @@ private:
// ^LegacyPlatformObject
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const&) const override;
virtual WebIDL::ExceptionOr<DidDeletionFail> delete_value(DeprecatedString const&) override;
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual Vector<String> supported_property_names() const override;
virtual WebIDL::ExceptionOr<void> set_value_of_named_property(DeprecatedString const& key, JS::Value value) override;
virtual bool supports_indexed_properties() const override { return false; }

8
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -1563,7 +1563,7 @@ OrderedHashMap<String, JS::NonnullGCPtr<Navigable>> Window::document_tree_child_
}
// https://html.spec.whatwg.org/#named-access-on-the-window-object
Vector<DeprecatedString> Window::supported_property_names()
Vector<String> Window::supported_property_names()
{
// The Window object supports named properties.
// The supported property names of a Window object window at any moment consist of the following,
@ -1590,12 +1590,12 @@ Vector<DeprecatedString> Window::supported_property_names()
return IterationDecision::Continue;
});
// FIXME: Many copies here. Would be nice to be able to return Vector<String>
Vector<DeprecatedString> names;
Vector<String> names;
names.ensure_capacity(property_names.size());
for (auto const& name : property_names) {
names.append(name.to_deprecated_string());
names.append(name);
}
return names;
}

2
Userland/Libraries/LibWeb/HTML/Window.h
View file

@ -201,7 +201,7 @@ public:
[[nodiscard]] OrderedHashMap<String, JS::NonnullGCPtr<Navigable>> document_tree_child_navigable_target_name_property_set();
[[nodiscard]] Vector<DeprecatedString> supported_property_names();
[[nodiscard]] Vector<String> supported_property_names();
[[nodiscard]] WebIDL::ExceptionOr<JS::Value> named_item_value(FlyString const&);
private: