diff --git a/Ladybird/AppKit/Application/Application.mm b/Ladybird/AppKit/Application/Application.mm index 2473f3af943..292728cb5fd 100644 --- a/Ladybird/AppKit/Application/Application.mm +++ b/Ladybird/AppKit/Application/Application.mm @@ -137,11 +137,6 @@ static ErrorOr> launch_new_image_decod return worker_client->dup_socket(); } -- (void)dumpConnectionInfo:(id)sender -{ - m_request_server_client->dump_connection_info(); -} - #pragma mark - NSApplication - (void)terminate:(id)sender diff --git a/Ladybird/AppKit/Application/ApplicationDelegate.mm b/Ladybird/AppKit/Application/ApplicationDelegate.mm index 36e42e00428..36f8b15e92e 100644 --- a/Ladybird/AppKit/Application/ApplicationDelegate.mm +++ b/Ladybird/AppKit/Application/ApplicationDelegate.mm @@ -642,9 +642,6 @@ [submenu addItem:[[NSMenuItem alloc] initWithTitle:@"Dump Local Storage" action:@selector(dumpLocalStorage:) keyEquivalent:@""]]; - [submenu addItem:[[NSMenuItem alloc] initWithTitle:@"Dump Connection Info" - action:@selector(dumpConnectionInfo:) - keyEquivalent:@""]]; [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItem:[[NSMenuItem alloc] initWithTitle:@"Show Line Box Borders" diff --git a/Ladybird/Qt/BrowserWindow.cpp b/Ladybird/Qt/BrowserWindow.cpp index 5cd0a5d6c5f..92360513283 100644 --- a/Ladybird/Qt/BrowserWindow.cpp +++ b/Ladybird/Qt/BrowserWindow.cpp @@ -431,11 +431,6 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, IsPopupWindow debug_request("dump-local-storage"); }); - auto* dump_connection_info = new QAction("Dump Co&nnection Info", this); - dump_connection_info->setIcon(load_icon_from_uri("resource://icons/16x16/network.png"sv)); - debug_menu->addAction(dump_connection_info); - QObject::connect(dump_connection_info, &QAction::triggered, this, &BrowserWindow::dump_connection_info); - debug_menu->addSeparator(); m_show_line_box_borders_action = new QAction("Show Line Box Borders", this); @@ -1239,10 +1234,4 @@ void BrowserWindow::closeEvent(QCloseEvent* event) QMainWindow::closeEvent(event); } -void BrowserWindow::dump_connection_info() -{ - if (auto& application = static_cast(WebView::Application::the()); application.request_server_client) - application.request_server_client->dump_connection_info(); -} - } diff --git a/Ladybird/Qt/BrowserWindow.h b/Ladybird/Qt/BrowserWindow.h index d38a933ccfc..f7d6aec4385 100644 --- a/Ladybird/Qt/BrowserWindow.h +++ b/Ladybird/Qt/BrowserWindow.h @@ -183,8 +183,6 @@ private: Web::CSS::PreferredColorScheme m_preferred_color_scheme; void set_preferred_color_scheme(Web::CSS::PreferredColorScheme color_scheme); - static void dump_connection_info(); - QTabWidget* m_tabs_container { nullptr }; Tab* m_current_tab { nullptr }; QMenu* m_zoom_menu { nullptr }; diff --git a/Userland/Libraries/LibRequests/RequestClient.cpp b/Userland/Libraries/LibRequests/RequestClient.cpp index 22f73d51556..bfdf11a9194 100644 --- a/Userland/Libraries/LibRequests/RequestClient.cpp +++ b/Userland/Libraries/LibRequests/RequestClient.cpp @@ -146,9 +146,4 @@ void RequestClient::websocket_certificate_requested(i32 connection_id) maybe_connection.value()->did_request_certificates({}); } -void RequestClient::dump_connection_info() -{ - async_dump_connection_info(); -} - } diff --git a/Userland/Libraries/LibRequests/RequestClient.h b/Userland/Libraries/LibRequests/RequestClient.h index 8827f203685..0465d8e2f3b 100644 --- a/Userland/Libraries/LibRequests/RequestClient.h +++ b/Userland/Libraries/LibRequests/RequestClient.h @@ -36,8 +36,6 @@ public: bool stop_request(Badge, Request&); bool set_certificate(Badge, Request&, ByteString, ByteString); - void dump_connection_info(); - private: virtual void die() override; diff --git a/Userland/Services/RequestServer/ConnectionFromClient.cpp b/Userland/Services/RequestServer/ConnectionFromClient.cpp index 26da6b5c2ca..ddfe967f079 100644 --- a/Userland/Services/RequestServer/ConnectionFromClient.cpp +++ b/Userland/Services/RequestServer/ConnectionFromClient.cpp @@ -204,48 +204,6 @@ ConnectionFromClient::~ConnectionFromClient() { } -class Job : public RefCounted - , public Weakable { -public: - static NonnullRefPtr ensure(URL::URL const& url) - { - RefPtr job; - if (auto it = s_jobs.find(url); it != s_jobs.end()) - job = it->value.strong_ref(); - if (job == nullptr) { - job = adopt_ref(*new Job(url)); - s_jobs.set(url, job); - } - return *job; - } - - void start(Core::Socket& socket) - { - auto is_connected = socket.is_open(); - VERIFY(is_connected); - ConnectionCache::request_did_finish(m_url, &socket); - } - - void fail(Core::NetworkJob::Error error) - { - dbgln("Pre-connect to {} failed: {}", m_url, Core::to_string(error)); - } - - void will_be_destroyed() const - { - s_jobs.remove(m_url); - } - -private: - explicit Job(URL::URL url) - : m_url(move(url)) - { - } - - URL::URL m_url; - inline static HashMap> s_jobs {}; -}; - void ConnectionFromClient::die() { auto client_id = this->client_id(); @@ -504,9 +462,4 @@ Messages::RequestServer::WebsocketSetCertificateResponse ConnectionFromClient::w return success; } -void ConnectionFromClient::dump_connection_info() -{ - ConnectionCache::dump_jobs(); -} - } diff --git a/Userland/Services/RequestServer/ConnectionFromClient.h b/Userland/Services/RequestServer/ConnectionFromClient.h index ae2a0960fdc..41f9c8e326e 100644 --- a/Userland/Services/RequestServer/ConnectionFromClient.h +++ b/Userland/Services/RequestServer/ConnectionFromClient.h @@ -49,8 +49,6 @@ private: virtual void websocket_close(i32, u16, ByteString const&) override; virtual Messages::RequestServer::WebsocketSetCertificateResponse websocket_set_certificate(i32, ByteString const&, ByteString const&) override; - virtual void dump_connection_info() override; - HashMap> m_websockets; struct ActiveRequest; diff --git a/Userland/Services/RequestServer/RequestServer.ipc b/Userland/Services/RequestServer/RequestServer.ipc index 600111e7ea9..6916675cb6f 100644 --- a/Userland/Services/RequestServer/RequestServer.ipc +++ b/Userland/Services/RequestServer/RequestServer.ipc @@ -23,5 +23,4 @@ endpoint RequestServer websocket_close(i32 connection_id, u16 code, ByteString reason) =| websocket_set_certificate(i32 request_id, ByteString certificate, ByteString key) => (bool success) - dump_connection_info() =| }