From c80b698589c8d194ef46e9e3b3eecbdc229282f7 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 3 Nov 2025 11:27:38 -0500 Subject: [PATCH] LibWebView+UI: Remove some now-superfluous debug menu items No need to keep these actions around, users can use the about:settings page instead. --- Base/res/icons/browser/clear-cache.png | Bin 3289 -> 0 bytes Libraries/LibWebView/Application.cpp | 5 ----- Libraries/LibWebView/CookieJar.cpp | 15 --------------- Libraries/LibWebView/CookieJar.h | 2 -- Libraries/LibWebView/Menu.h | 2 -- UI/Qt/Menu.cpp | 3 --- UI/cmake/ResourceFiles.cmake | 1 - 7 files changed, 28 deletions(-) delete mode 100644 Base/res/icons/browser/clear-cache.png diff --git a/Base/res/icons/browser/clear-cache.png b/Base/res/icons/browser/clear-cache.png deleted file mode 100644 index a69ce4889de94dfa771fb6116ec939ad690e62c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3289 zcmc&%U2GIp6yAbXKruCl5K$P1NHAe`{%3b5EVOi6T6Iflx6(dnxO3;uc4T*En3?Tv zOCm(022m0*!H5Q8qA?*xi6ll)B8J2u!DxICED$tCfd}Nl2NI0pnf;k=wS|HjH~Vwv z-tV5j`<-*{Ztd<`J$u%@vm%km?9Pr<5BxR-pBattz3A7g2!3Wd9Rpq@a{HX%(-7J9 z#(WqQ%}l@FpMF%uc0P)9TO-j@-T`zZvV3L9L3ji4DUD=JD@kAa_*0rP^(4JcPIGCe zl?<94BQEJ3>B``d4LG6GD_2m1cF_yQuCLu*U?3#{m+7=Z^M4Daj zlQbAx@gnbpVlA&4DTox!n1=cG8&@}KsZ;cwsczUv^*bKm~^I+G?*GSOK4iYs@kTeY^7)>EMBO$^wah;c$1m+Yejul0c2u+RYZMAc@o3?d`xmZ8n z+1lFe+J>2fh1J9&u8FCh)vKuLBuxd>P{9)L3I)lSr1|P(f57Wpp)wg0piXcsAADEW z2d=X|w%li#a2f(l1>{o8ruIUq1Ctb47Uk-Ew^<^&{*(y;_9})b^(zD8SAxnHq_f&# zdO*^$7NtH8LMY!Su4ya7vEGyII1YDR})GPaog9L(g4T4u-o^AL=I~9ctMweAAdiK3G2sy?hdxC zA>!82%Rw%J_DftZNgJ-6r;y|1OkB<}cF5AJEiKGo%D1VpdNpa-bjaX39@J|IO`!fo zeb;5()XL}oa7=7)tEiL%_OF$q@|>!~vOPGRa<^6|stHr&A+&E5x~XXH5au|!OP+9HY~Pq1J} zoU*(e;+#1q>qdO8+g+AZF^avm^<`w;)e%&er{F#s48yxHJcPGtVnHQx;jY}(b$)v! z(lDbl)sl(7^!6(cSVx+h+Rmodc6HD1&Sk!xp1SpyhT}}1@YT#0?>I93k#o};U%v40 zf##z-riqttd9b%>6Mkpo!JhUH9^3!Tg5=dRb49%Lt^-o>*zr_~6L;d1iFrpB(}po^ z-+bkh%WJtUdmB%+Npcn%|E|65Edx6n&MiCNDqT9%uy)Vh(bpC|JELiVcIv}de;z%Y zxct#)o0s5cnzY^L-ZDq#3?5@5ue-N3KYrrf?ayC`TuS!!ow;wHy71`kJzu|XKlQ}f zCBN&!1D;C+Iu# diff --git a/Libraries/LibWebView/Application.cpp b/Libraries/LibWebView/Application.cpp index e8851ec930..4487f72b10 100644 --- a/Libraries/LibWebView/Application.cpp +++ b/Libraries/LibWebView/Application.cpp @@ -876,11 +876,6 @@ void Application::initialize_actions() m_debug_menu->add_separator(); m_debug_menu->add_action(Action::create("Collect Garbage"sv, ActionID::CollectGarbage, debug_request("collect-garbage"sv))); - m_debug_menu->add_action(Action::create("Clear Cache"sv, ActionID::ClearCache, [this, clear_memory_cache = debug_request("clear-cache")]() { - m_request_server_client->async_remove_cache_entries_accessed_since({}); - clear_memory_cache(); - })); - m_debug_menu->add_action(Action::create("Clear All Cookies"sv, ActionID::ClearCookies, [this]() { m_cookie_jar->clear_all_cookies(); })); m_debug_menu->add_separator(); auto spoof_user_agent_menu = Menu::create_group("Spoof User Agent"sv); diff --git a/Libraries/LibWebView/CookieJar.cpp b/Libraries/LibWebView/CookieJar.cpp index a51365d0e9..3ef1280d80 100644 --- a/Libraries/LibWebView/CookieJar.cpp +++ b/Libraries/LibWebView/CookieJar.cpp @@ -176,11 +176,6 @@ void CookieJar::dump_cookies() dbgln("{} cookies stored\n{}", m_transient_storage.size(), builder.string_view()); } -void CookieJar::clear_all_cookies() -{ - m_transient_storage.expire_and_purge_all_cookies(); -} - Vector CookieJar::get_all_cookies() { Vector cookies; @@ -647,16 +642,6 @@ UnixDateTime CookieJar::TransientStorage::purge_expired_cookies(Optional get_all_cookies(); Vector get_all_cookies_webdriver(URL::URL const& url); Vector get_all_cookies_cookiestore(URL::URL const& url); @@ -68,7 +67,6 @@ private: size_t size() const { return m_cookies.size(); } UnixDateTime purge_expired_cookies(Optional offset = {}); - void expire_and_purge_all_cookies(); void expire_and_purge_cookies_accessed_since(UnixDateTime since); Requests::CacheSizes estimate_storage_size_accessed_since(UnixDateTime since) const; diff --git a/Libraries/LibWebView/Menu.h b/Libraries/LibWebView/Menu.h index 716443aaf5..d150eb25f9 100644 --- a/Libraries/LibWebView/Menu.h +++ b/Libraries/LibWebView/Menu.h @@ -81,8 +81,6 @@ enum class ActionID { DumpGCGraph, ShowLineBoxBorders, CollectGarbage, - ClearCache, - ClearCookies, SpoofUserAgent, NavigatorCompatibilityMode, EnableScripting, diff --git a/UI/Qt/Menu.cpp b/UI/Qt/Menu.cpp index 6f00d13222..373b8f2dbf 100644 --- a/UI/Qt/Menu.cpp +++ b/UI/Qt/Menu.cpp @@ -220,9 +220,6 @@ static void initialize_native_control(WebView::Action& action, QAction& qaction, qaction.setIcon(load_icon_from_uri("resource://icons/16x16/trash-can.png"sv)); qaction.setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_G)); break; - case WebView::ActionID::ClearCache: - qaction.setIcon(load_icon_from_uri("resource://icons/browser/clear-cache.png"sv)); - break; default: break; diff --git a/UI/cmake/ResourceFiles.cmake b/UI/cmake/ResourceFiles.cmake index 99fa56a5a3..2a942b99b6 100644 --- a/UI/cmake/ResourceFiles.cmake +++ b/UI/cmake/ResourceFiles.cmake @@ -51,7 +51,6 @@ set(128x128_ICONS app-browser-dark.png ) set(BROWSER_ICONS - clear-cache.png cookie.png dom-tree.png local-storage.png