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

LibWeb: Port NavigatorID from DeprecatedString to String

Browse source
This commit is contained in:
Shannon Booth 2023-11-20 13:44:27 +13:00 • committed by Andreas Kling
parent 0a4586d510
commit 6aff55d655
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -59,8 +59,8 @@ ErrorOr<NonnullRefPtr<ResourceLoader>> ResourceLoader::try_create(NonnullRefPtr<
ResourceLoader::ResourceLoader(NonnullRefPtr<ResourceLoaderConnector> connector)
: m_connector(move(connector))
, m_user_agent(default_user_agent)
, m_platform(default_platform)
, m_user_agent(MUST(String::from_utf8(default_user_agent)))
, m_platform(MUST(String::from_utf8(default_platform)))
{
}
@ -315,7 +315,7 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
auto proxy = ProxyMappings::the().proxy_for_url(url);
HashMap<DeprecatedString, DeprecatedString> headers;
headers.set("User-Agent", m_user_agent);
headers.set("User-Agent", m_user_agent.to_deprecated_string());
headers.set("Accept-Encoding", "gzip, deflate, br");
for (auto& it : request.headers()) {

12
Userland/Libraries/LibWeb/Loader/ResourceLoader.h
View file

@ -123,11 +123,11 @@ public:
int pending_loads() const { return m_pending_loads; }
DeprecatedString const& user_agent() const { return m_user_agent; }
void set_user_agent(DeprecatedString const& user_agent) { m_user_agent = user_agent; }
String const& user_agent() const { return m_user_agent; }
void set_user_agent(String user_agent) { m_user_agent = move(user_agent); }
DeprecatedString const& platform() const { return m_platform; }
void set_platform(DeprecatedString const& platform) { m_platform = platform; }
String const& platform() const { return m_platform; }
void set_platform(String platform) { m_platform = move(platform); }
void clear_cache();
void evict_from_cache(LoadRequest const&);
@ -142,8 +142,8 @@ private:
HashTable<NonnullRefPtr<ResourceLoaderConnectorRequest>> m_active_requests;
NonnullRefPtr<ResourceLoaderConnector> m_connector;
DeprecatedString m_user_agent;
DeprecatedString m_platform;
String m_user_agent;
String m_platform;
Optional<Page&> m_page {};
};