Ladybird+LibWebView: Migrate file APIs to LibWebView callbacks

This also sets the default callback to do what every non-Serenity
browser is doing, rather than copy-pasting this callback into every
implementation. The callback is still available for any platform which
might want to override the default behavior. For example, OOPWV now
overrides this callback to use FileSystemAccessClient.

Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp

@@ -7,7 +7,6 @@
 #include <Ladybird/HelperProcess.h>
 #include <Ladybird/Types.h>
 #include <Ladybird/Utilities.h>
-#include <LibCore/File.h>
 #include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Rect.h>
 #include <LibIPC/File.h>
@@ -197,15 +196,6 @@ void WebViewBridge::notify_server_did_leave_tooltip_area(Badge<WebView::WebConte
     if (on_tooltip_left)
         on_tooltip_left();
 }
-void WebViewBridge::notify_server_did_request_file(Badge<WebView::WebContentClient>, DeprecatedString const& path, i32 request_id)
-{
-    auto file = Core::File::open(path, Core::File::OpenMode::Read);
-
-    if (file.is_error())
-        client().async_handle_file_return(file.error().code(), {}, request_id);
-    else
-        client().async_handle_file_return(0, IPC::File(*file.value()), request_id);
-}
 
 void WebViewBridge::notify_server_did_finish_handling_input_event(bool)
 {

Ladybird/AppKit/UI/LadybirdWebViewBridge.h

@@ -72,7 +72,6 @@ private:
     virtual void notify_server_did_request_scroll_into_view(Badge<WebView::WebContentClient>, Gfx::IntRect const&) override;
     virtual void notify_server_did_enter_tooltip_area(Badge<WebView::WebContentClient>, Gfx::IntPoint, DeprecatedString const&) override;
     virtual void notify_server_did_leave_tooltip_area(Badge<WebView::WebContentClient>) override;
-    virtual void notify_server_did_request_file(Badge<WebView::WebContentClient>, DeprecatedString const& path, i32) override;
     virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override;
 
     virtual void update_zoom() override;

Ladybird/Qt/WebContentView.cpp

@@ -725,15 +725,6 @@ void WebContentView::notify_server_did_leave_tooltip_area(Badge<WebContentClient
     QToolTip::hideText();
 }
 
-void WebContentView::notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32 request_id)
-{
-    auto file = Core::File::open(path, Core::File::OpenMode::Read);
-    if (file.is_error())
-        client().async_handle_file_return(file.error().code(), {}, request_id);
-    else
-        client().async_handle_file_return(0, IPC::File(*file.value()), request_id);
-}
-
 Gfx::IntRect WebContentView::viewport_rect() const
 {
     return m_viewport_rect;

Ladybird/Qt/WebContentView.h

@@ -86,7 +86,6 @@ public:
     virtual void notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const&) override;
     virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint, DeprecatedString const&) override;
     virtual void notify_server_did_leave_tooltip_area(Badge<WebContentClient>) override;
-    virtual void notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32) override;
     virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override;
 
 signals:

Userland/Libraries/LibWebView/OutOfProcessWebView.cpp

@@ -28,6 +28,15 @@ OutOfProcessWebView::OutOfProcessWebView()
     set_focus_policy(GUI::FocusPolicy::StrongFocus);
 
     create_client();
+
+    on_request_file = [this](auto const& path, auto request_id) {
+        auto file = FileSystemAccessClient::Client::the().request_file_read_only_approved(window(), path);
+
+        if (file.is_error())
+            client().async_handle_file_return(file.error().code(), {}, request_id);
+        else
+            client().async_handle_file_return(0, IPC::File(file.value().stream()), request_id);
+    };
 }
 
 OutOfProcessWebView::~OutOfProcessWebView() = default;
@@ -231,15 +240,6 @@ void OutOfProcessWebView::notify_server_did_leave_tooltip_area(Badge<WebContentC
     GUI::Application::the()->hide_tooltip();
 }
 
-void OutOfProcessWebView::notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32 request_id)
-{
-    auto file = FileSystemAccessClient::Client::the().request_file_read_only_approved(window(), path);
-    if (file.is_error())
-        client().async_handle_file_return(file.error().code(), {}, request_id);
-    else
-        client().async_handle_file_return(0, IPC::File(file.value().stream()), request_id);
-}
-
 void OutOfProcessWebView::did_scroll()
 {
     client().async_set_viewport_rect(visible_content_rect());

Userland/Libraries/LibWebView/OutOfProcessWebView.h

@@ -92,7 +92,6 @@ private:
     virtual void notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const&) override;
     virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint, DeprecatedString const&) override;
     virtual void notify_server_did_leave_tooltip_area(Badge<WebContentClient>) override;
-    virtual void notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32) override;
     virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override;
 
     virtual Gfx::IntRect viewport_rect() const override;

Userland/Libraries/LibWebView/ViewImplementation.cpp

@@ -25,6 +25,15 @@ ViewImplementation::ViewImplementation()
         // happen to be visiting crashy websites a lot.
         this->m_crash_count = 0;
     }).release_value_but_fixme_should_propagate_errors();
+
+    on_request_file = [this](auto const& path, auto request_id) {
+        auto file = Core::File::open(path, Core::File::OpenMode::Read);
+
+        if (file.is_error())
+            client().async_handle_file_return(file.error().code(), {}, request_id);
+        else
+            client().async_handle_file_return(0, IPC::File(*file.value()), request_id);
+    };
 }
 
 WebContentClient& ViewImplementation::client()

Userland/Libraries/LibWebView/ViewImplementation.h

@@ -104,6 +104,7 @@ public:
     Function<void(DeprecatedString const&)> on_title_change;
     Function<void(const AK::URL&, bool)> on_load_start;
     Function<void(const AK::URL&)> on_load_finish;
+    Function<void(DeprecatedString const& path, i32)> on_request_file;
     Function<void()> on_navigate_back;
     Function<void()> on_navigate_forward;
     Function<void()> on_refresh;
@@ -143,7 +144,6 @@ public:
     virtual void notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const&) = 0;
     virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint, DeprecatedString const&) = 0;
     virtual void notify_server_did_leave_tooltip_area(Badge<WebContentClient>) = 0;
-    virtual void notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32) = 0;
     virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) = 0;
 
     virtual Gfx::IntRect viewport_rect() const = 0;

Userland/Libraries/LibWebView/WebContentClient.cpp

@@ -366,7 +366,8 @@ Messages::WebContentClient::DidRequestFullscreenWindowResponse WebContentClient:
 
 void WebContentClient::did_request_file(DeprecatedString const& path, i32 request_id)
 {
-    m_view.notify_server_did_request_file({}, path, request_id);
+    if (m_view.on_request_file)
+        m_view.on_request_file(path, request_id);
 }
 
 void WebContentClient::did_finish_handling_input_event(bool event_was_accepted)

Userland/Utilities/headless-browser.cpp

@@ -112,17 +112,6 @@ private:
     void notify_server_did_request_scroll_into_view(Badge<WebView::WebContentClient>, Gfx::IntRect const&) override { }
     void notify_server_did_enter_tooltip_area(Badge<WebView::WebContentClient>, Gfx::IntPoint, DeprecatedString const&) override { }
     void notify_server_did_leave_tooltip_area(Badge<WebView::WebContentClient>) override { }
-
-    void notify_server_did_request_file(Badge<WebView::WebContentClient>, DeprecatedString const& path, i32 request_id) override
-    {
-        auto file = Core::File::open(path, Core::File::OpenMode::Read);
-
-        if (file.is_error())
-            client().async_handle_file_return(file.error().code(), {}, request_id);
-        else
-            client().async_handle_file_return(0, IPC::File(*file.value()), request_id);
-    }
-
     void notify_server_did_finish_handling_input_event(bool) override { }
     void update_zoom() override { }
     void create_client(WebView::EnableCallgrindProfiling) override { }