mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-13 04:52:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

UI/Qt: Pass WebContentOptions to TaskManagerWindow constructor

Browse source 
Previously, the browser would crash when opening a task manager window
with the `--enable-qt-networking` flag set because we were passing the
default WebContentOptions to the underlying WebContentView.
This commit is contained in:
Tim Ledbetter 2024-07-10 14:28:01 +01:00 • committed by Alexander Kalenik
commit 11039085d0
Notes: sideshowbarker 2024-07-17 07:35:03 +09:00
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ladybird/Qt/Application.cpp
View file

@ -77,10 +77,10 @@ ErrorOr<void> Application::initialize_image_decoder()
return {}; return {};
} }
void Application::show_task_manager_window() void Application::show_task_manager_window(WebContentOptions const& web_content_options)
{ {
if (!m_task_manager_window) { if (!m_task_manager_window) {
m_task_manager_window = new TaskManagerWindow(nullptr); m_task_manager_window = new TaskManagerWindow(nullptr, web_content_options);
} }
m_task_manager_window->show(); m_task_manager_window->show();
m_task_manager_window->activateWindow(); m_task_manager_window->activateWindow();

2
Ladybird/Qt/Application.h
View file

@ -33,7 +33,7 @@ public:
BrowserWindow& new_window(Vector<URL::URL> const& initial_urls, WebView::CookieJar&, WebContentOptions const&, StringView webdriver_content_ipc_path, bool allow_popups, Tab* parent_tab = nullptr, Optional<u64> page_index = {}); BrowserWindow& new_window(Vector<URL::URL> const& initial_urls, WebView::CookieJar&, WebContentOptions const&, StringView webdriver_content_ipc_path, bool allow_popups, Tab* parent_tab = nullptr, Optional<u64> page_index = {});
void show_task_manager_window(); void show_task_manager_window(WebContentOptions const&);
void close_task_manager_window(); void close_task_manager_window();
BrowserWindow& active_window() { return *m_active_window; } BrowserWindow& active_window() { return *m_active_window; }

4
Ladybird/Qt/BrowserWindow.cpp
View file

@ -349,8 +349,8 @@ BrowserWindow::BrowserWindow(Vector<URL::URL> const& initial_urls, WebView::Cook
task_manager_action->setIcon(load_icon_from_uri("resource://icons/16x16/app-system-monitor.png"sv)); task_manager_action->setIcon(load_icon_from_uri("resource://icons/16x16/app-system-monitor.png"sv));
task_manager_action->setShortcuts({ QKeySequence("Ctrl+Shift+M") }); task_manager_action->setShortcuts({ QKeySequence("Ctrl+Shift+M") });
inspect_menu->addAction(task_manager_action); inspect_menu->addAction(task_manager_action);
QObject::connect(task_manager_action, &QAction::triggered, this, [] { QObject::connect(task_manager_action, &QAction::triggered, this, [&] {
static_cast<Ladybird::Application*>(QApplication::instance())->show_task_manager_window(); static_cast<Ladybird::Application*>(QApplication::instance())->show_task_manager_window(m_web_content_options);
}); });
auto* debug_menu = m_hamburger_menu->addMenu("&Debug"); auto* debug_menu = m_hamburger_menu->addMenu("&Debug");

4
Ladybird/Qt/TaskManagerWindow.cpp
View file

@ -10,9 +10,9 @@
namespace Ladybird { namespace Ladybird {
TaskManagerWindow::TaskManagerWindow(QWidget* parent) TaskManagerWindow::TaskManagerWindow(QWidget* parent, WebContentOptions const& web_content_options)
: QWidget(parent, Qt::WindowFlags(Qt::WindowType::Window)) : QWidget(parent, Qt::WindowFlags(Qt::WindowType::Window))
, m_web_view(new WebContentView(this, {}, {})) , m_web_view(new WebContentView(this, web_content_options, {}))
{ {
setLayout(new QVBoxLayout); setLayout(new QVBoxLayout);
layout()->addWidget(m_web_view); layout()->addWidget(m_web_view);

2
Ladybird/Qt/TaskManagerWindow.h
View file

@ -16,7 +16,7 @@ class TaskManagerWindow : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit TaskManagerWindow(QWidget* parent); TaskManagerWindow(QWidget* parent, WebContentOptions const&);
private: private:
virtual void showEvent(QShowEvent*) override; virtual void showEvent(QShowEvent*) override;