浏览代码

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

LibIPC can serialize enumeration automatically (this was not the case
when these IPCs were added).
Timothy Flynn 1 年之前
父节点
当前提交
9b957ead13

+ 1 - 1
Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp

@@ -70,7 +70,7 @@ static bool is_primitive_type(ByteString const& type)
 static bool is_simple_type(ByteString const& type)
 {
     // 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)

+ 4 - 4
Userland/Libraries/LibWebView/WebContentClient.cpp

@@ -309,17 +309,17 @@ Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_
     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)
-        return m_view.on_get_cookie(url, static_cast<Web::Cookie::Source>(source));
+        return m_view.on_get_cookie(url, source);
     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)
-        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)

+ 2 - 2
Userland/Libraries/LibWebView/WebContentClient.h

@@ -70,8 +70,8 @@ private:
     virtual void did_request_dismiss_dialog() 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::DidRequestCookieResponse did_request_cookie(AK::URL const&, u8) override;
-    virtual void did_set_cookie(AK::URL const&, Web::Cookie::ParsedCookie 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&, Web::Cookie::Source) 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 void did_request_activate_tab() override;

+ 2 - 2
Userland/Services/WebContent/PageClient.cpp

@@ -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)
 {
-    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) {
         dbgln("WebContent client disconnected during DidRequestCookie. Exiting peacefully.");
         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)
 {
-    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) {
         dbgln("WebContent client disconnected during DidSetCookie. Exiting peacefully.");
         exit(0);

+ 2 - 2
Userland/Services/WebContent/WebContentClient.ipc

@@ -54,8 +54,8 @@ endpoint WebContentClient
     did_change_favicon(Gfx::ShareableBitmap favicon) =|
     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_cookie(URL url, u8 source) => (String cookie)
-    did_set_cookie(URL url, Web::Cookie::ParsedCookie cookie, u8 source) => ()
+    did_request_cookie(URL url, Web::Cookie::Source source) => (String cookie)
+    did_set_cookie(URL url, Web::Cookie::ParsedCookie cookie, Web::Cookie::Source source) => ()
     did_update_cookie(Web::Cookie::Cookie cookie) =|
     did_update_resource_count(i32 count_waiting) =|
     did_request_new_tab(Web::HTML::ActivateTab activate_tab) => (String handle)