RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 00:37: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

6
Ladybird/AppKit/Application/ApplicationDelegate.h
View file

@ -9,9 +9,9 @@
#include <AK/Optional.h>
#include <AK/StringView.h>
#include <AK/URL.h>
#include <Browser/CookieJar.h>
#include <LibWeb/CSS/PreferredColorScheme.h>
#include <LibWeb/HTML/ActivateTab.h>
#include <LibWebView/CookieJar.h>
#import <System/Cocoa.h>
@ -21,7 +21,7 @@
@interface ApplicationDelegate : NSObject <NSApplicationDelegate>
- (nullable instancetype)init:(Optional<URL>)initial_url
withCookieJar:(Browser::CookieJar)cookie_jar
withCookieJar:(WebView::CookieJar)cookie_jar
webdriverContentIPCPath:(StringView)webdriver_content_ipc_path;
- (nonnull TabController*)createNewTab:(Optional<URL> const&)url
@ -35,7 +35,7 @@
- (void)removeTab:(nonnull TabController*)controller;
- (Browser::CookieJar&)cookieJar;
- (WebView::CookieJar&)cookieJar;
- (Optional<StringView> const&)webdriverContentIPCPath;
- (Web::CSS::PreferredColorScheme)preferredColorScheme;

6
Ladybird/AppKit/Application/ApplicationDelegate.mm
View file

@ -22,7 +22,7 @@
URL m_new_tab_page_url;
// This will always be populated, but we cannot have a non-default constructible instance variable.
Optional<Browser::CookieJar> m_cookie_jar;
Optional<WebView::CookieJar> m_cookie_jar;
Optional<StringView> m_webdriver_content_ipc_path;
@ -46,7 +46,7 @@
@implementation ApplicationDelegate
- (instancetype)init:(Optional<URL>)initial_url
withCookieJar:(Browser::CookieJar)cookie_jar
withCookieJar:(WebView::CookieJar)cookie_jar
webdriverContentIPCPath:(StringView)webdriver_content_ipc_path
{
if (self = [super init]) {
@ -110,7 +110,7 @@
[self.managed_tabs removeObject:controller];
}
- (Browser::CookieJar&)cookieJar
- (WebView::CookieJar&)cookieJar
{
return *m_cookie_jar;
}

4
Ladybird/AppKit/UI/TabController.mm
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <Browser/History.h>
#include <LibWebView/History.h>
#import <Application/ApplicationDelegate.h>
#import <UI/LadybirdWebView.h>
@ -34,7 +34,7 @@ enum class IsHistoryNavigation {
{
DeprecatedString m_title;
Browser::History m_history;
WebView::History m_history;
IsHistoryNavigation m_is_history_navigation;
}

8
Ladybird/AppKit/main.mm
View file

@ -4,13 +4,13 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <Browser/CookieJar.h>
#include <Browser/Database.h>
#include <Ladybird/Utilities.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibMain/Main.h>
#include <LibWebView/CookieJar.h>
#include <LibWebView/Database.h>
#import <Application/Application.h>
#import <Application/ApplicationDelegate.h>
@ -48,8 +48,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
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)));
auto database = TRY(Browser::Database::create(move(sql_client)));
auto cookie_jar = TRY(Browser::CookieJar::create(*database));
auto database = TRY(WebView::Database::create(move(sql_client)));
auto cookie_jar = TRY(WebView::CookieJar::create(*database));
Optional<URL> initial_url;
if (auto parsed_url = Ladybird::sanitize_url(url); parsed_url.is_valid()) {