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

Ladybird+LibWebView: Move CookieJar, Database, and History to LibWebView

Browse source 
These classes are used as-is in all chromes. Move them to LibWebView so
that non-Serenity chromes don't have to awkwardly reach into its headers
and sources.
This commit is contained in:
Timothy Flynn 2023-08-31 07:07:07 -04:00 • committed by Andreas Kling
parent 7d313ff83d
commit 5c5a00dd3a
28 changed files with 76 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ladybird/Qt/main.cpp
View file

@ -9,8 +9,6 @@
#include "Settings.h"
#include "WebContentView.h"
#include <AK/OwnPtr.h>
#include <Browser/CookieJar.h>
#include <Browser/Database.h>
#include <Ladybird/HelperProcess.h>
#include <Ladybird/Utilities.h>
#include <LibCore/ArgsParser.h>
@ -21,6 +19,8 @@
#include <LibGfx/Font/FontDatabase.h>
#include <LibMain/Main.h>
#include <LibSQL/SQLClient.h>
#include <LibWebView/CookieJar.h>
#include <LibWebView/Database.h>
#include <QApplication>
namespace Ladybird {
@ -95,15 +95,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return url;
};
RefPtr<Browser::Database> database;
RefPtr<WebView::Database> database;
if (enable_sql_database) {
auto sql_server_paths = TRY(get_paths_for_helper_process("SQLServer"sv));
auto sql_client = TRY(SQL::SQLClient::launch_server_and_create_client(move(sql_server_paths)));
database = TRY(Browser::Database::create(move(sql_client)));
database = TRY(WebView::Database::create(move(sql_client)));
}
auto cookie_jar = database ? TRY(Browser::CookieJar::create(*database)) : Browser::CookieJar::create();
auto cookie_jar = database ? TRY(WebView::CookieJar::create(*database)) : WebView::CookieJar::create();
Optional<URL> initial_url;
if (auto url = TRY(get_formatted_url(raw_url)); url.is_valid())