RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +00:00
Code Issues Activity Actions

LibWebView+WebContent: Do not manually serialize cookie sources over IPC

Browse source 
LibIPC can serialize enumeration automatically (this was not the case
when these IPCs were added).
This commit is contained in:
Timothy Flynn 2024-01-26 11:14:42 -05:00 • committed by Andreas Kling
parent 85b8971a80
commit 9b957ead13
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
View file

@ -70,7 +70,7 @@ static bool is_primitive_type(ByteString const& type)
static bool is_simple_type(ByteString const& type) static bool is_simple_type(ByteString const& type)
{ {
// Small types that it makes sense just to pass by value. // Small types that it makes sense just to pass by value.
return type.is_one_of("Gfx::Color", "Web::DevicePixels", "Gfx::IntPoint", "Gfx::FloatPoint", "Web::DevicePixelPoint", "Gfx::IntSize", "Gfx::FloatSize", "Web::DevicePixelSize", "Core::File::OpenMode"); return type.is_one_of("Gfx::Color", "Web::DevicePixels", "Gfx::IntPoint", "Gfx::FloatPoint", "Web::DevicePixelPoint", "Gfx::IntSize", "Gfx::FloatSize", "Web::DevicePixelSize", "Core::File::OpenMode", "Web::Cookie::Source");
} }
static bool is_primitive_or_simple_type(ByteString const& type) static bool is_primitive_or_simple_type(ByteString const& type)

8
Userland/Libraries/LibWebView/WebContentClient.cpp
View file

@ -309,17 +309,17 @@ Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_
return OptionalNone {}; return OptionalNone {};
} }
Messages::WebContentClient::DidRequestCookieResponse WebContentClient::did_request_cookie(AK::URL const& url, u8 source) Messages::WebContentClient::DidRequestCookieResponse WebContentClient::did_request_cookie(AK::URL const& url, Web::Cookie::Source source)
{ {
if (m_view.on_get_cookie) if (m_view.on_get_cookie)
return m_view.on_get_cookie(url, static_cast<Web::Cookie::Source>(source)); return m_view.on_get_cookie(url, source);
return String {}; return String {};
} }
void WebContentClient::did_set_cookie(AK::URL const& url, Web::Cookie::ParsedCookie const& cookie, u8 source) void WebContentClient::did_set_cookie(AK::URL const& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)
{ {
if (m_view.on_set_cookie) if (m_view.on_set_cookie)
m_view.on_set_cookie(url, cookie, static_cast<Web::Cookie::Source>(source)); m_view.on_set_cookie(url, cookie, source);
} }
void WebContentClient::did_update_cookie(Web::Cookie::Cookie const& cookie) void WebContentClient::did_update_cookie(Web::Cookie::Cookie const& cookie)

4
Userland/Libraries/LibWebView/WebContentClient.h
View file

@ -70,8 +70,8 @@ private:
virtual void did_request_dismiss_dialog() override; virtual void did_request_dismiss_dialog() override;
virtual Messages::WebContentClient::DidRequestAllCookiesResponse did_request_all_cookies(AK::URL const&) override; virtual Messages::WebContentClient::DidRequestAllCookiesResponse did_request_all_cookies(AK::URL const&) override;
virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(AK::URL const&, ByteString const&) override; virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(AK::URL const&, ByteString const&) override;
virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(AK::URL const&, u8) override; virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(AK::URL const&, Web::Cookie::Source) override;
virtual void did_set_cookie(AK::URL const&, Web::Cookie::ParsedCookie const&, u8) override; virtual void did_set_cookie(AK::URL const&, Web::Cookie::ParsedCookie const&, Web::Cookie::Source) override;
virtual void did_update_cookie(Web::Cookie::Cookie const&) override; virtual void did_update_cookie(Web::Cookie::Cookie const&) override;
virtual Messages::WebContentClient::DidRequestNewTabResponse did_request_new_tab(Web::HTML::ActivateTab const& activate_tab) override; virtual Messages::WebContentClient::DidRequestNewTabResponse did_request_new_tab(Web::HTML::ActivateTab const& activate_tab) override;
virtual void did_request_activate_tab() override; virtual void did_request_activate_tab() override;

4
Userland/Services/WebContent/PageClient.cpp
View file

@ -470,7 +470,7 @@ Optional<Web::Cookie::Cookie> PageClient::page_did_request_named_cookie(URL cons
String PageClient::page_did_request_cookie(const URL& url, Web::Cookie::Source source) String PageClient::page_did_request_cookie(const URL& url, Web::Cookie::Source source)
{ {
auto response = client().send_sync_but_allow_failure<Messages::WebContentClient::DidRequestCookie>(move(url), static_cast<u8>(source)); auto response = client().send_sync_but_allow_failure<Messages::WebContentClient::DidRequestCookie>(move(url), source);
if (!response) { if (!response) {
dbgln("WebContent client disconnected during DidRequestCookie. Exiting peacefully."); dbgln("WebContent client disconnected during DidRequestCookie. Exiting peacefully.");
exit(0); exit(0);
@ -480,7 +480,7 @@ String PageClient::page_did_request_cookie(const URL& url, Web::Cookie::Source s
void PageClient::page_did_set_cookie(const URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source) void PageClient::page_did_set_cookie(const URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)
{ {
auto response = client().send_sync_but_allow_failure<Messages::WebContentClient::DidSetCookie>(url, cookie, static_cast<u8>(source)); auto response = client().send_sync_but_allow_failure<Messages::WebContentClient::DidSetCookie>(url, cookie, source);
if (!response) { if (!response) {
dbgln("WebContent client disconnected during DidSetCookie. Exiting peacefully."); dbgln("WebContent client disconnected during DidSetCookie. Exiting peacefully.");
exit(0); exit(0);

4
Userland/Services/WebContent/WebContentClient.ipc
View file

@ -54,8 +54,8 @@ endpoint WebContentClient
did_change_favicon(Gfx::ShareableBitmap favicon) =| did_change_favicon(Gfx::ShareableBitmap favicon) =|
did_request_all_cookies(URL url) => (Vector<Web::Cookie::Cookie> cookies) did_request_all_cookies(URL url) => (Vector<Web::Cookie::Cookie> cookies)
did_request_named_cookie(URL url, ByteString name) => (Optional<Web::Cookie::Cookie> cookie) did_request_named_cookie(URL url, ByteString name) => (Optional<Web::Cookie::Cookie> cookie)
did_request_cookie(URL url, u8 source) => (String cookie) did_request_cookie(URL url, Web::Cookie::Source source) => (String cookie)
did_set_cookie(URL url, Web::Cookie::ParsedCookie cookie, u8 source) => () did_set_cookie(URL url, Web::Cookie::ParsedCookie cookie, Web::Cookie::Source source) => ()
did_update_cookie(Web::Cookie::Cookie cookie) =| did_update_cookie(Web::Cookie::Cookie cookie) =|
did_update_resource_count(i32 count_waiting) =| did_update_resource_count(i32 count_waiting) =|
did_request_new_tab(Web::HTML::ActivateTab activate_tab) => (String handle) did_request_new_tab(Web::HTML::ActivateTab activate_tab) => (String handle)