From 71dadabfaa0f08a6e0bbc4b6235e3adb48ece466 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 11 Oct 2022 10:53:28 +0200 Subject: [PATCH] Ladybird: Hook up the CookieJar again after WebContent introduction --- Ladybird/BrowserWindow.cpp | 10 +++++++++- Ladybird/BrowserWindow.h | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Ladybird/BrowserWindow.cpp b/Ladybird/BrowserWindow.cpp index f92d66adaa..30830c6aa2 100644 --- a/Ladybird/BrowserWindow.cpp +++ b/Ladybird/BrowserWindow.cpp @@ -159,7 +159,7 @@ BrowserWindow::BrowserWindow() dump_cookies_action->setIcon(QIcon(QString("%1/res/icons/browser/cookie.png").arg(s_serenity_resource_root.characters()))); debug_menu->addAction(dump_cookies_action); QObject::connect(dump_cookies_action, &QAction::triggered, this, [this] { - debug_request("dump-cookies"); + m_cookie_jar.dump_cookies(); }); auto* dump_local_storage_action = new QAction("Dump Local Storage", this); @@ -295,6 +295,14 @@ void BrowserWindow::new_tab() QObject::connect(tab_ptr, &Tab::title_changed, this, &BrowserWindow::tab_title_changed); QObject::connect(tab_ptr, &Tab::favicon_changed, this, &BrowserWindow::tab_favicon_changed); + tab_ptr->view().on_get_cookie = [this](auto& url, auto source) -> String { + return m_cookie_jar.get_cookie(url, source); + }; + + tab_ptr->view().on_set_cookie = [this](auto& url, auto& cookie, auto source) { + m_cookie_jar.set_cookie(url, cookie, source); + }; + tab_ptr->focus_location_editor(); } diff --git a/Ladybird/BrowserWindow.h b/Ladybird/BrowserWindow.h index 3d98526306..d5e456ad09 100644 --- a/Ladybird/BrowserWindow.h +++ b/Ladybird/BrowserWindow.h @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include "CookieJar.h" #include "Tab.h" #include #include @@ -45,4 +46,6 @@ private: QTabWidget* m_tabs_container { nullptr }; NonnullOwnPtrVector m_tabs; Tab* m_current_tab { nullptr }; + + Browser::CookieJar m_cookie_jar; };