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

LibWeb+LibJS: Use JS::GCPtr for pointers to GC-allocated objects

Browse source 
Fixes warnings found by LibJSGCVerifier
This commit is contained in:
Aliaksandr Kalenik 2023-12-11 12:23:04 +01:00 • committed by Alexander Kalenik
parent ed97946975
commit 6ac43274b2
14 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/Loader/LoadRequest.h
View file

@ -43,7 +43,7 @@ public:
void start_timer() { m_load_timer.start(); }
Duration load_time() const { return m_load_timer.elapsed_time(); }
Optional<Page&>& page() { return m_page; }
JS::GCPtr<Page> page() { return m_page; }
void set_page(Page& page) { m_page = page; }
unsigned hash() const
@ -79,7 +79,7 @@ private:
HashMap<DeprecatedString, DeprecatedString, CaseInsensitiveStringTraits> m_headers;
ByteBuffer m_body;
Core::ElapsedTimer m_load_timer;
Optional<Page&> m_page;
JS::GCPtr<Page> m_page;
bool m_main_resource { false };
};

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

@ -231,8 +231,8 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
}
if (url.scheme() == "file") {
if (request.page().has_value())
m_page = request.page().value();
if (request.page())
m_page = request.page();
if (!m_page.has_value()) {
log_failure(request, "INTERNAL ERROR: No Page for request");
@ -302,7 +302,7 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
success_callback(data, response_headers, {});
});
m_page->client().request_file(move(file_request));
(*m_page)->client().request_file(move(file_request));
++m_pending_loads;
if (on_load_counter_change)
@ -348,9 +348,9 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
if (on_load_counter_change)
on_load_counter_change();
if (request.page().has_value()) {
if (request.page()) {
if (auto set_cookie = response_headers.get("Set-Cookie"); set_cookie.has_value())
store_response_cookies(request.page().value(), request.url(), *set_cookie);
store_response_cookies(*request.page(), request.url(), *set_cookie);
if (auto cache_control = response_headers.get("cache-control"); cache_control.has_value()) {
if (cache_control.value().contains("no-store"sv)) {
s_resource_cache.remove(request);

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

@ -144,7 +144,7 @@ private:
NonnullRefPtr<ResourceLoaderConnector> m_connector;
String m_user_agent;
String m_platform;
Optional<Page&> m_page {};
Optional<JS::GCPtr<Page>> m_page {};
};
}