diff --git a/Libraries/LibDevTools/Actor.cpp b/Libraries/LibDevTools/Actor.cpp index 0089d5954b2..4aa1824f0fd 100644 --- a/Libraries/LibDevTools/Actor.cpp +++ b/Libraries/LibDevTools/Actor.cpp @@ -11,10 +11,9 @@ namespace DevTools { -// FIXME: Convert `name` to a String. -Actor::Actor(DevToolsServer& devtools, ByteString name) +Actor::Actor(DevToolsServer& devtools, String name) : m_devtools(devtools) - , m_name(MUST(String::from_byte_string(name))) + , m_name(move(name)) { } diff --git a/Libraries/LibDevTools/Actor.h b/Libraries/LibDevTools/Actor.h index 21ef242bb87..54c46b2b16b 100644 --- a/Libraries/LibDevTools/Actor.h +++ b/Libraries/LibDevTools/Actor.h @@ -7,7 +7,6 @@ #pragma once #include -#include #include #include #include @@ -49,7 +48,7 @@ public: void send_unknown_actor_error(StringView actor); protected: - explicit Actor(DevToolsServer&, ByteString name); + explicit Actor(DevToolsServer&, String name); DevToolsServer& devtools() { return m_devtools; } DevToolsServer const& devtools() const { return m_devtools; } diff --git a/Libraries/LibDevTools/Actors/CSSPropertiesActor.cpp b/Libraries/LibDevTools/Actors/CSSPropertiesActor.cpp index bb55662d4af..0b066509127 100644 --- a/Libraries/LibDevTools/Actors/CSSPropertiesActor.cpp +++ b/Libraries/LibDevTools/Actors/CSSPropertiesActor.cpp @@ -12,12 +12,12 @@ namespace DevTools { -NonnullRefPtr CSSPropertiesActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr CSSPropertiesActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new CSSPropertiesActor(devtools, move(name))); } -CSSPropertiesActor::CSSPropertiesActor(DevToolsServer& devtools, ByteString name) +CSSPropertiesActor::CSSPropertiesActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } @@ -36,7 +36,7 @@ void CSSPropertiesActor::handle_message(StringView type, JsonObject const&) for (auto const& css_property : css_property_list) { JsonArray subproperties; - subproperties.must_append(MUST(String::from_byte_string(css_property.name))); + subproperties.must_append(css_property.name); JsonObject property; property.set("isInherited"sv, css_property.is_inherited); diff --git a/Libraries/LibDevTools/Actors/CSSPropertiesActor.h b/Libraries/LibDevTools/Actors/CSSPropertiesActor.h index fec5763f844..afe607ecf55 100644 --- a/Libraries/LibDevTools/Actors/CSSPropertiesActor.h +++ b/Libraries/LibDevTools/Actors/CSSPropertiesActor.h @@ -6,14 +6,14 @@ #pragma once -#include #include +#include #include namespace DevTools { struct CSSProperty { - ByteString name; + String name; bool is_inherited { false }; }; @@ -21,13 +21,13 @@ class CSSPropertiesActor final : public Actor { public: static constexpr auto base_name = "css-properties"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~CSSPropertiesActor() override; virtual void handle_message(StringView type, JsonObject const&) override; private: - CSSPropertiesActor(DevToolsServer&, ByteString name); + CSSPropertiesActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/DeviceActor.cpp b/Libraries/LibDevTools/Actors/DeviceActor.cpp index 0fdedb3b924..06b936f1faf 100644 --- a/Libraries/LibDevTools/Actors/DeviceActor.cpp +++ b/Libraries/LibDevTools/Actors/DeviceActor.cpp @@ -12,12 +12,12 @@ namespace DevTools { -NonnullRefPtr DeviceActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr DeviceActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new DeviceActor(devtools, move(name))); } -DeviceActor::DeviceActor(DevToolsServer& devtools, ByteString name) +DeviceActor::DeviceActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/DeviceActor.h b/Libraries/LibDevTools/Actors/DeviceActor.h index 7f97a050a9b..edf9286b4e0 100644 --- a/Libraries/LibDevTools/Actors/DeviceActor.h +++ b/Libraries/LibDevTools/Actors/DeviceActor.h @@ -15,13 +15,13 @@ class DeviceActor final : public Actor { public: static constexpr auto base_name = "device"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~DeviceActor() override; virtual void handle_message(StringView type, JsonObject const&) override; private: - DeviceActor(DevToolsServer&, ByteString name); + DeviceActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/FrameActor.cpp b/Libraries/LibDevTools/Actors/FrameActor.cpp index 15619df5acc..b47ee9437bb 100644 --- a/Libraries/LibDevTools/Actors/FrameActor.cpp +++ b/Libraries/LibDevTools/Actors/FrameActor.cpp @@ -14,12 +14,12 @@ namespace DevTools { -NonnullRefPtr FrameActor::create(DevToolsServer& devtools, ByteString name, WeakPtr tab, WeakPtr css_properties, WeakPtr inspector, WeakPtr thread) +NonnullRefPtr FrameActor::create(DevToolsServer& devtools, String name, WeakPtr tab, WeakPtr css_properties, WeakPtr inspector, WeakPtr thread) { return adopt_ref(*new FrameActor(devtools, move(name), move(tab), move(css_properties), move(inspector), move(thread))); } -FrameActor::FrameActor(DevToolsServer& devtools, ByteString name, WeakPtr tab, WeakPtr css_properties, WeakPtr inspector, WeakPtr thread) +FrameActor::FrameActor(DevToolsServer& devtools, String name, WeakPtr tab, WeakPtr css_properties, WeakPtr inspector, WeakPtr thread) : Actor(devtools, move(name)) , m_tab(move(tab)) , m_css_properties(move(css_properties)) @@ -50,8 +50,8 @@ void FrameActor::send_frame_update_message() if (auto tab_actor = m_tab.strong_ref()) { JsonObject frame; frame.set("id"sv, tab_actor->description().id); - frame.set("title"sv, MUST(String::from_byte_string(tab_actor->description().title))); - frame.set("url"sv, MUST(String::from_byte_string(tab_actor->description().url))); + frame.set("title"sv, tab_actor->description().title); + frame.set("url"sv, tab_actor->description().url); frames.must_append(move(frame)); } @@ -76,8 +76,8 @@ JsonObject FrameActor::serialize_target() const target.set("actor"sv, name()); if (auto tab_actor = m_tab.strong_ref()) { - target.set("title"sv, MUST(String::from_byte_string(tab_actor->description().title))); - target.set("url"sv, MUST(String::from_byte_string(tab_actor->description().url))); + target.set("title"sv, tab_actor->description().title); + target.set("url"sv, tab_actor->description().url); target.set("browsingContextID"sv, tab_actor->description().id); target.set("outerWindowID"sv, tab_actor->description().id); target.set("isTopLevelTarget"sv, true); diff --git a/Libraries/LibDevTools/Actors/FrameActor.h b/Libraries/LibDevTools/Actors/FrameActor.h index a8b06198d04..525169157ae 100644 --- a/Libraries/LibDevTools/Actors/FrameActor.h +++ b/Libraries/LibDevTools/Actors/FrameActor.h @@ -15,7 +15,7 @@ class FrameActor final : public Actor { public: static constexpr auto base_name = "frame"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, WeakPtr, WeakPtr, WeakPtr, WeakPtr); + static NonnullRefPtr create(DevToolsServer&, String name, WeakPtr, WeakPtr, WeakPtr, WeakPtr); virtual ~FrameActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -24,7 +24,7 @@ public: JsonObject serialize_target() const; private: - FrameActor(DevToolsServer&, ByteString name, WeakPtr, WeakPtr, WeakPtr, WeakPtr); + FrameActor(DevToolsServer&, String name, WeakPtr, WeakPtr, WeakPtr, WeakPtr); WeakPtr m_tab; diff --git a/Libraries/LibDevTools/Actors/HighlighterActor.cpp b/Libraries/LibDevTools/Actors/HighlighterActor.cpp index 081c8ea6c9f..d4c74d9626f 100644 --- a/Libraries/LibDevTools/Actors/HighlighterActor.cpp +++ b/Libraries/LibDevTools/Actors/HighlighterActor.cpp @@ -9,12 +9,12 @@ namespace DevTools { -NonnullRefPtr HighlighterActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr HighlighterActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new HighlighterActor(devtools, move(name))); } -HighlighterActor::HighlighterActor(DevToolsServer& devtools, ByteString name) +HighlighterActor::HighlighterActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/HighlighterActor.h b/Libraries/LibDevTools/Actors/HighlighterActor.h index d34888f0bf1..3a0028c5b89 100644 --- a/Libraries/LibDevTools/Actors/HighlighterActor.h +++ b/Libraries/LibDevTools/Actors/HighlighterActor.h @@ -15,14 +15,14 @@ class HighlighterActor final : public Actor { public: static constexpr auto base_name = "highlighter"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~HighlighterActor() override; virtual void handle_message(StringView type, JsonObject const&) override; JsonValue serialize_highlighter() const; private: - HighlighterActor(DevToolsServer&, ByteString name); + HighlighterActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/InspectorActor.cpp b/Libraries/LibDevTools/Actors/InspectorActor.cpp index fbb040c531e..ac85d25cffe 100644 --- a/Libraries/LibDevTools/Actors/InspectorActor.cpp +++ b/Libraries/LibDevTools/Actors/InspectorActor.cpp @@ -16,12 +16,12 @@ namespace DevTools { -NonnullRefPtr InspectorActor::create(DevToolsServer& devtools, ByteString name, WeakPtr tab) +NonnullRefPtr InspectorActor::create(DevToolsServer& devtools, String name, WeakPtr tab) { return adopt_ref(*new InspectorActor(devtools, move(name), move(tab))); } -InspectorActor::InspectorActor(DevToolsServer& devtools, ByteString name, WeakPtr tab) +InspectorActor::InspectorActor(DevToolsServer& devtools, String name, WeakPtr tab) : Actor(devtools, move(name)) , m_tab(move(tab)) { diff --git a/Libraries/LibDevTools/Actors/InspectorActor.h b/Libraries/LibDevTools/Actors/InspectorActor.h index d62b7da3123..ee6c513b13d 100644 --- a/Libraries/LibDevTools/Actors/InspectorActor.h +++ b/Libraries/LibDevTools/Actors/InspectorActor.h @@ -15,13 +15,13 @@ class InspectorActor final : public Actor { public: static constexpr auto base_name = "inspector"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, WeakPtr); + static NonnullRefPtr create(DevToolsServer&, String name, WeakPtr); virtual ~InspectorActor() override; virtual void handle_message(StringView type, JsonObject const&) override; private: - InspectorActor(DevToolsServer&, ByteString name, WeakPtr); + InspectorActor(DevToolsServer&, String name, WeakPtr); void received_dom_tree(JsonObject, BlockToken); diff --git a/Libraries/LibDevTools/Actors/PageStyleActor.cpp b/Libraries/LibDevTools/Actors/PageStyleActor.cpp index e584b8de90d..8d70076d492 100644 --- a/Libraries/LibDevTools/Actors/PageStyleActor.cpp +++ b/Libraries/LibDevTools/Actors/PageStyleActor.cpp @@ -9,12 +9,12 @@ namespace DevTools { -NonnullRefPtr PageStyleActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr PageStyleActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new PageStyleActor(devtools, move(name))); } -PageStyleActor::PageStyleActor(DevToolsServer& devtools, ByteString name) +PageStyleActor::PageStyleActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/PageStyleActor.h b/Libraries/LibDevTools/Actors/PageStyleActor.h index 133024f4fad..03d324f7898 100644 --- a/Libraries/LibDevTools/Actors/PageStyleActor.h +++ b/Libraries/LibDevTools/Actors/PageStyleActor.h @@ -15,14 +15,14 @@ class PageStyleActor final : public Actor { public: static constexpr auto base_name = "page-style"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~PageStyleActor() override; virtual void handle_message(StringView type, JsonObject const&) override; JsonValue serialize_style() const; private: - PageStyleActor(DevToolsServer&, ByteString name); + PageStyleActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/PreferenceActor.cpp b/Libraries/LibDevTools/Actors/PreferenceActor.cpp index d4097d67aac..fea93786762 100644 --- a/Libraries/LibDevTools/Actors/PreferenceActor.cpp +++ b/Libraries/LibDevTools/Actors/PreferenceActor.cpp @@ -9,12 +9,12 @@ namespace DevTools { -NonnullRefPtr PreferenceActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr PreferenceActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new PreferenceActor(devtools, move(name))); } -PreferenceActor::PreferenceActor(DevToolsServer& devtools, ByteString name) +PreferenceActor::PreferenceActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/PreferenceActor.h b/Libraries/LibDevTools/Actors/PreferenceActor.h index 15bb6b6ce1c..b0a14e232cc 100644 --- a/Libraries/LibDevTools/Actors/PreferenceActor.h +++ b/Libraries/LibDevTools/Actors/PreferenceActor.h @@ -15,13 +15,13 @@ class PreferenceActor final : public Actor { public: static constexpr auto base_name = "preference"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~PreferenceActor() override; virtual void handle_message(StringView type, JsonObject const&) override; private: - PreferenceActor(DevToolsServer&, ByteString name); + PreferenceActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/ProcessActor.cpp b/Libraries/LibDevTools/Actors/ProcessActor.cpp index 4b14cb4a891..dd71536f917 100644 --- a/Libraries/LibDevTools/Actors/ProcessActor.cpp +++ b/Libraries/LibDevTools/Actors/ProcessActor.cpp @@ -9,12 +9,12 @@ namespace DevTools { -NonnullRefPtr ProcessActor::create(DevToolsServer& devtools, ByteString name, ProcessDescription description) +NonnullRefPtr ProcessActor::create(DevToolsServer& devtools, String name, ProcessDescription description) { return adopt_ref(*new ProcessActor(devtools, move(name), move(description))); } -ProcessActor::ProcessActor(DevToolsServer& devtools, ByteString name, ProcessDescription description) +ProcessActor::ProcessActor(DevToolsServer& devtools, String name, ProcessDescription description) : Actor(devtools, move(name)) , m_description(move(description)) { diff --git a/Libraries/LibDevTools/Actors/ProcessActor.h b/Libraries/LibDevTools/Actors/ProcessActor.h index 15d7fba82b1..1fc9160884b 100644 --- a/Libraries/LibDevTools/Actors/ProcessActor.h +++ b/Libraries/LibDevTools/Actors/ProcessActor.h @@ -21,7 +21,7 @@ class ProcessActor final : public Actor { public: static constexpr auto base_name = "process"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, ProcessDescription); + static NonnullRefPtr create(DevToolsServer&, String name, ProcessDescription); virtual ~ProcessActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -30,7 +30,7 @@ public: JsonObject serialize_description() const; private: - ProcessActor(DevToolsServer&, ByteString name, ProcessDescription); + ProcessActor(DevToolsServer&, String name, ProcessDescription); ProcessDescription m_description; }; diff --git a/Libraries/LibDevTools/Actors/RootActor.cpp b/Libraries/LibDevTools/Actors/RootActor.cpp index 76871b28932..72084807ec4 100644 --- a/Libraries/LibDevTools/Actors/RootActor.cpp +++ b/Libraries/LibDevTools/Actors/RootActor.cpp @@ -16,7 +16,7 @@ namespace DevTools { // https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#the-root-actor -NonnullRefPtr RootActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr RootActor::create(DevToolsServer& devtools, String name) { auto actor = adopt_ref(*new RootActor(devtools, move(name))); @@ -35,7 +35,7 @@ NonnullRefPtr RootActor::create(DevToolsServer& devtools, ByteString return actor; } -RootActor::RootActor(DevToolsServer& devtools, ByteString name) +RootActor::RootActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } @@ -57,9 +57,9 @@ void RootActor::handle_message(StringView type, JsonObject const& message) for (auto const& actor : devtools().actor_registry()) { if (is(*actor.value)) - response.set("deviceActor"sv, MUST(String::from_byte_string(actor.key))); + response.set("deviceActor"sv, actor.key); else if (is(*actor.value)) - response.set("preferenceActor"sv, MUST(String::from_byte_string(actor.key))); + response.set("preferenceActor"sv, actor.key); } send_message(move(response)); diff --git a/Libraries/LibDevTools/Actors/RootActor.h b/Libraries/LibDevTools/Actors/RootActor.h index 218a54f5758..4ace2e427d0 100644 --- a/Libraries/LibDevTools/Actors/RootActor.h +++ b/Libraries/LibDevTools/Actors/RootActor.h @@ -15,7 +15,7 @@ class RootActor final : public Actor { public: static constexpr auto base_name = "root"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~RootActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -23,7 +23,7 @@ public: void send_tab_list_changed_message(); private: - RootActor(DevToolsServer&, ByteString name); + RootActor(DevToolsServer&, String name); // https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#the-request-reply-notify-pattern // the root actor sends at most one "tabListChanged" notification after each "listTabs" request. diff --git a/Libraries/LibDevTools/Actors/TabActor.cpp b/Libraries/LibDevTools/Actors/TabActor.cpp index cfc0c2a16b9..64fbb5e0b19 100644 --- a/Libraries/LibDevTools/Actors/TabActor.cpp +++ b/Libraries/LibDevTools/Actors/TabActor.cpp @@ -11,12 +11,12 @@ namespace DevTools { -NonnullRefPtr TabActor::create(DevToolsServer& devtools, ByteString name, TabDescription description) +NonnullRefPtr TabActor::create(DevToolsServer& devtools, String name, TabDescription description) { return adopt_ref(*new TabActor(devtools, move(name), move(description))); } -TabActor::TabActor(DevToolsServer& devtools, ByteString name, TabDescription description) +TabActor::TabActor(DevToolsServer& devtools, String name, TabDescription description) : Actor(devtools, move(name)) , m_description(move(description)) { @@ -60,8 +60,8 @@ JsonObject TabActor::serialize_description() const // provide different IDs for browserId, browsingContextID, and outerWindowID. JsonObject description; description.set("actor"sv, name()); - description.set("title"sv, MUST(String::from_byte_string(m_description.title))); - description.set("url"sv, MUST(String::from_byte_string(m_description.url))); + description.set("title"sv, m_description.title); + description.set("url"sv, m_description.url); description.set("browserId"sv, m_description.id); description.set("browsingContextID"sv, m_description.id); description.set("outerWindowID"sv, m_description.id); diff --git a/Libraries/LibDevTools/Actors/TabActor.h b/Libraries/LibDevTools/Actors/TabActor.h index fd42725306f..fe28799be54 100644 --- a/Libraries/LibDevTools/Actors/TabActor.h +++ b/Libraries/LibDevTools/Actors/TabActor.h @@ -7,21 +7,22 @@ #pragma once #include +#include #include namespace DevTools { struct TabDescription { u64 id { 0 }; - ByteString title; - ByteString url; + String title; + String url; }; class TabActor final : public Actor { public: static constexpr auto base_name = "tab"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, TabDescription); + static NonnullRefPtr create(DevToolsServer&, String name, TabDescription); virtual ~TabActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -30,7 +31,7 @@ public: JsonObject serialize_description() const; private: - TabActor(DevToolsServer&, ByteString name, TabDescription); + TabActor(DevToolsServer&, String name, TabDescription); TabDescription m_description; WeakPtr m_watcher; diff --git a/Libraries/LibDevTools/Actors/TargetConfigurationActor.cpp b/Libraries/LibDevTools/Actors/TargetConfigurationActor.cpp index fe575126cda..1a386f9353b 100644 --- a/Libraries/LibDevTools/Actors/TargetConfigurationActor.cpp +++ b/Libraries/LibDevTools/Actors/TargetConfigurationActor.cpp @@ -10,12 +10,12 @@ namespace DevTools { -NonnullRefPtr TargetConfigurationActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr TargetConfigurationActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new TargetConfigurationActor(devtools, move(name))); } -TargetConfigurationActor::TargetConfigurationActor(DevToolsServer& devtools, ByteString name) +TargetConfigurationActor::TargetConfigurationActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/TargetConfigurationActor.h b/Libraries/LibDevTools/Actors/TargetConfigurationActor.h index 6c0de3b410b..ac37a93db7b 100644 --- a/Libraries/LibDevTools/Actors/TargetConfigurationActor.h +++ b/Libraries/LibDevTools/Actors/TargetConfigurationActor.h @@ -15,7 +15,7 @@ class TargetConfigurationActor final : public Actor { public: static constexpr auto base_name = "target-configuration"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~TargetConfigurationActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -23,7 +23,7 @@ public: JsonObject serialize_configuration() const; private: - TargetConfigurationActor(DevToolsServer&, ByteString name); + TargetConfigurationActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/ThreadActor.cpp b/Libraries/LibDevTools/Actors/ThreadActor.cpp index efa968707ad..8862122cf1f 100644 --- a/Libraries/LibDevTools/Actors/ThreadActor.cpp +++ b/Libraries/LibDevTools/Actors/ThreadActor.cpp @@ -8,12 +8,12 @@ namespace DevTools { -NonnullRefPtr ThreadActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr ThreadActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new ThreadActor(devtools, move(name))); } -ThreadActor::ThreadActor(DevToolsServer& devtools, ByteString name) +ThreadActor::ThreadActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/ThreadActor.h b/Libraries/LibDevTools/Actors/ThreadActor.h index 7688f996c55..6381043266c 100644 --- a/Libraries/LibDevTools/Actors/ThreadActor.h +++ b/Libraries/LibDevTools/Actors/ThreadActor.h @@ -15,13 +15,13 @@ class ThreadActor final : public Actor { public: static constexpr auto base_name = "thread"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~ThreadActor() override; virtual void handle_message(StringView type, JsonObject const&) override; private: - ThreadActor(DevToolsServer&, ByteString name); + ThreadActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/ThreadConfigurationActor.cpp b/Libraries/LibDevTools/Actors/ThreadConfigurationActor.cpp index a53e6bfb3c6..d940d840f96 100644 --- a/Libraries/LibDevTools/Actors/ThreadConfigurationActor.cpp +++ b/Libraries/LibDevTools/Actors/ThreadConfigurationActor.cpp @@ -10,12 +10,12 @@ namespace DevTools { -NonnullRefPtr ThreadConfigurationActor::create(DevToolsServer& devtools, ByteString name) +NonnullRefPtr ThreadConfigurationActor::create(DevToolsServer& devtools, String name) { return adopt_ref(*new ThreadConfigurationActor(devtools, move(name))); } -ThreadConfigurationActor::ThreadConfigurationActor(DevToolsServer& devtools, ByteString name) +ThreadConfigurationActor::ThreadConfigurationActor(DevToolsServer& devtools, String name) : Actor(devtools, move(name)) { } diff --git a/Libraries/LibDevTools/Actors/ThreadConfigurationActor.h b/Libraries/LibDevTools/Actors/ThreadConfigurationActor.h index b0e77b2cd44..440d325b7ca 100644 --- a/Libraries/LibDevTools/Actors/ThreadConfigurationActor.h +++ b/Libraries/LibDevTools/Actors/ThreadConfigurationActor.h @@ -15,7 +15,7 @@ class ThreadConfigurationActor final : public Actor { public: static constexpr auto base_name = "thread-configuration"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name); + static NonnullRefPtr create(DevToolsServer&, String name); virtual ~ThreadConfigurationActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -23,7 +23,7 @@ public: JsonObject serialize_configuration() const; private: - ThreadConfigurationActor(DevToolsServer&, ByteString name); + ThreadConfigurationActor(DevToolsServer&, String name); }; } diff --git a/Libraries/LibDevTools/Actors/WalkerActor.cpp b/Libraries/LibDevTools/Actors/WalkerActor.cpp index a833dd42bd1..9b85320ac13 100644 --- a/Libraries/LibDevTools/Actors/WalkerActor.cpp +++ b/Libraries/LibDevTools/Actors/WalkerActor.cpp @@ -5,18 +5,19 @@ */ #include +#include #include #include #include namespace DevTools { -NonnullRefPtr WalkerActor::create(DevToolsServer& devtools, ByteString name, WeakPtr tab, JsonObject dom_tree) +NonnullRefPtr WalkerActor::create(DevToolsServer& devtools, String name, WeakPtr tab, JsonObject dom_tree) { return adopt_ref(*new WalkerActor(devtools, move(name), move(tab), move(dom_tree))); } -WalkerActor::WalkerActor(DevToolsServer& devtools, ByteString name, WeakPtr tab, JsonObject dom_tree) +WalkerActor::WalkerActor(DevToolsServer& devtools, String name, WeakPtr tab, JsonObject dom_tree) : Actor(devtools, move(name)) , m_tab(move(tab)) , m_dom_tree(move(dom_tree)) @@ -32,7 +33,7 @@ void WalkerActor::handle_message(StringView type, JsonObject const& message) response.set("from"sv, name()); if (type == "children"sv) { - auto node = message.get_byte_string("node"sv); + auto node = message.get_string("node"sv); if (!node.has_value()) { send_missing_parameter_error("node"sv); return; @@ -57,13 +58,13 @@ void WalkerActor::handle_message(StringView type, JsonObject const& message) } if (type == "querySelector"sv) { - auto node = message.get_byte_string("node"sv); + auto node = message.get_string("node"sv); if (!node.has_value()) { send_missing_parameter_error("node"sv); return; } - auto selector = message.get_byte_string("selector"sv); + auto selector = message.get_string("selector"sv); if (!selector.has_value()) { send_missing_parameter_error("selector"sv); return; @@ -112,12 +113,12 @@ bool WalkerActor::is_suitable_for_dom_inspection(JsonValue const& node) if (!object.has_string("name"sv) || !object.has_string("type"sv)) return false; - if (auto text = object.get_byte_string("text"sv); text.has_value()) { - if (text->is_whitespace()) + if (auto text = object.get_string("text"sv); text.has_value()) { + if (AK::StringUtils::is_whitespace(*text)) return false; } - if (auto data = object.get_byte_string("data"sv); data.has_value()) { - if (data->is_whitespace()) + if (auto data = object.get_string("data"sv); data.has_value()) { + if (AK::StringUtils::is_whitespace(*data)) return false; } @@ -189,7 +190,7 @@ JsonValue WalkerActor::serialize_node(JsonObject const& node) const JsonObject serialized; serialized.set("actor"sv, actor.release_value()); serialized.set("attrs"sv, move(attrs)); - serialized.set("baseURI"sv, MUST(String::from_byte_string(tab->description().url))); + serialized.set("baseURI"sv, tab->description().url); serialized.set("causesOverflow"sv, false); serialized.set("containerType"sv, JsonValue {}); serialized.set("displayName"sv, name.to_ascii_lowercase()); @@ -230,7 +231,7 @@ JsonValue WalkerActor::serialize_node(JsonObject const& node) const Optional WalkerActor::find_node_by_selector(JsonObject const& node, StringView selector) { auto matches = [&](auto const& candidate) { - return candidate.get_byte_string("name"sv)->equals_ignoring_ascii_case(selector); + return candidate.get_string("name"sv)->equals_ignoring_ascii_case(selector); }; if (matches(node)) @@ -256,7 +257,7 @@ void WalkerActor::populate_dom_tree_cache(JsonObject& node, JsonObject const* pa m_dom_node_to_parent_map.set(&node, parent); auto actor = MUST(String::formatted("{}-node{}", name(), m_dom_node_count++)); - m_actor_to_dom_node_map.set(actor.to_byte_string(), &node); + m_actor_to_dom_node_map.set(actor, &node); node.set("actor"sv, actor); auto children = node.get_array("children"sv); diff --git a/Libraries/LibDevTools/Actors/WalkerActor.h b/Libraries/LibDevTools/Actors/WalkerActor.h index 87bc8bb0234..70b3e3fed31 100644 --- a/Libraries/LibDevTools/Actors/WalkerActor.h +++ b/Libraries/LibDevTools/Actors/WalkerActor.h @@ -18,7 +18,7 @@ class WalkerActor final : public Actor { public: static constexpr auto base_name = "walker"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, WeakPtr, JsonObject dom_tree); + static NonnullRefPtr create(DevToolsServer&, String name, WeakPtr, JsonObject dom_tree); virtual ~WalkerActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -27,7 +27,7 @@ public: JsonValue serialize_root() const; private: - WalkerActor(DevToolsServer&, ByteString name, WeakPtr, JsonObject dom_tree); + WalkerActor(DevToolsServer&, String name, WeakPtr, JsonObject dom_tree); JsonValue serialize_node(JsonObject const&) const; Optional find_node_by_selector(JsonObject const& node, StringView selector); @@ -38,7 +38,7 @@ private: JsonObject m_dom_tree; HashMap m_dom_node_to_parent_map; - HashMap m_actor_to_dom_node_map; + HashMap m_actor_to_dom_node_map; size_t m_dom_node_count { 0 }; }; diff --git a/Libraries/LibDevTools/Actors/WatcherActor.cpp b/Libraries/LibDevTools/Actors/WatcherActor.cpp index 115beed6a47..a417681752c 100644 --- a/Libraries/LibDevTools/Actors/WatcherActor.cpp +++ b/Libraries/LibDevTools/Actors/WatcherActor.cpp @@ -18,12 +18,12 @@ namespace DevTools { -NonnullRefPtr WatcherActor::create(DevToolsServer& devtools, ByteString name, WeakPtr tab) +NonnullRefPtr WatcherActor::create(DevToolsServer& devtools, String name, WeakPtr tab) { return adopt_ref(*new WatcherActor(devtools, move(name), move(tab))); } -WatcherActor::WatcherActor(DevToolsServer& devtools, ByteString name, WeakPtr tab) +WatcherActor::WatcherActor(DevToolsServer& devtools, String name, WeakPtr tab) : Actor(devtools, move(name)) , m_tab(move(tab)) { @@ -67,7 +67,7 @@ void WatcherActor::handle_message(StringView type, JsonObject const& message) } if (type == "watchTargets"sv) { - auto target_type = message.get_byte_string("targetType"sv); + auto target_type = message.get_string("targetType"sv); if (!target_type.has_value()) { send_missing_parameter_error("targetType"sv); return; diff --git a/Libraries/LibDevTools/Actors/WatcherActor.h b/Libraries/LibDevTools/Actors/WatcherActor.h index 8bc9886f5ec..03c6017bf3a 100644 --- a/Libraries/LibDevTools/Actors/WatcherActor.h +++ b/Libraries/LibDevTools/Actors/WatcherActor.h @@ -15,7 +15,7 @@ class WatcherActor final : public Actor { public: static constexpr auto base_name = "watcher"sv; - static NonnullRefPtr create(DevToolsServer&, ByteString name, WeakPtr); + static NonnullRefPtr create(DevToolsServer&, String name, WeakPtr); virtual ~WatcherActor() override; virtual void handle_message(StringView type, JsonObject const&) override; @@ -23,7 +23,7 @@ public: JsonObject serialize_description() const; private: - WatcherActor(DevToolsServer&, ByteString name, WeakPtr); + WatcherActor(DevToolsServer&, String name, WeakPtr); WeakPtr m_tab; WeakPtr m_target; diff --git a/Libraries/LibDevTools/DevToolsServer.cpp b/Libraries/LibDevTools/DevToolsServer.cpp index 4f21949b322..ef6a419f3fc 100644 --- a/Libraries/LibDevTools/DevToolsServer.cpp +++ b/Libraries/LibDevTools/DevToolsServer.cpp @@ -85,7 +85,7 @@ ErrorOr DevToolsServer::on_new_client() void DevToolsServer::on_message_received(JsonObject const& message) { - auto to = message.get_byte_string("to"sv); + auto to = message.get_string("to"sv); if (!to.has_value()) { m_root_actor->send_missing_parameter_error("to"sv); return; @@ -97,7 +97,7 @@ void DevToolsServer::on_message_received(JsonObject const& message) return; } - auto type = message.get_byte_string("type"sv); + auto type = message.get_string("type"sv); if (!type.has_value()) { actor->value->send_missing_parameter_error("type"sv); return; diff --git a/Libraries/LibDevTools/DevToolsServer.h b/Libraries/LibDevTools/DevToolsServer.h index 87190ba8398..9f8e6ac4c83 100644 --- a/Libraries/LibDevTools/DevToolsServer.h +++ b/Libraries/LibDevTools/DevToolsServer.h @@ -10,13 +10,14 @@ #include #include #include +#include #include #include #include namespace DevTools { -using ActorRegistry = HashMap>; +using ActorRegistry = HashMap>; class DevToolsServer { public: @@ -30,12 +31,12 @@ public: template ActorType& register_actor(Args&&... args) { - ByteString name; + String name; if constexpr (IsSame) { - name = ActorType::base_name; + name = String::from_utf8_without_validation(ActorType::base_name.bytes()); } else { - name = ByteString::formatted("server{}-{}{}", m_server_id, ActorType::base_name, m_actor_count); + name = MUST(String::formatted("server{}-{}{}", m_server_id, ActorType::base_name, m_actor_count)); } auto actor = ActorType::create(*this, name, forward(args)...); diff --git a/Libraries/LibWebView/Application.cpp b/Libraries/LibWebView/Application.cpp index 3da2e29b4ce..5096d12dfd8 100644 --- a/Libraries/LibWebView/Application.cpp +++ b/Libraries/LibWebView/Application.cpp @@ -340,7 +340,7 @@ Vector Application::tab_list() const Vector tabs; ViewImplementation::for_each_view([&](ViewImplementation& view) { - tabs.empend(view.view_id(), view.title(), view.url().to_byte_string()); + tabs.empend(view.view_id(), MUST(String::from_byte_string(view.title())), view.url().to_string()); return IterationDecision::Continue; }); @@ -355,7 +355,7 @@ Vector Application::css_property_list() const auto property_id = static_cast(i); DevTools::CSSProperty property; - property.name = Web::CSS::string_from_property_id(property_id).to_string().to_byte_string(); + property.name = Web::CSS::string_from_property_id(property_id).to_string(); property.is_inherited = Web::CSS::is_inherited_property(property_id); property_list.append(move(property)); }