RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 11:37:45 +00:00
Code Issues Activity Actions

LibWeb+Browser: Make ad blocking work in the multi-process world

Browse source 
We now send the list of content filters over to new WebContent processes
after creating an OutOfProcessWebView. :^)
This commit is contained in:
Andreas Kling 2021-09-27 11:39:17 +02:00
parent b0858b2a55
commit a79bdd2bd5
8 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/Browser/Browser.h
View file

@ -12,5 +12,6 @@ namespace Browser {
extern String g_home_url;
extern String g_search_engine;
extern Vector<String> g_content_filters;
}

1
Userland/Applications/Browser/Tab.cpp
View file

@ -87,6 +87,7 @@ Tab::Tab(BrowserWindow& window)
auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
m_web_content_view = webview_container.add<Web::OutOfProcessWebView>();
m_web_content_view->set_content_filters(g_content_filters);
auto& go_back_button = toolbar.add_action(window.go_back_action());
go_back_button.on_context_menu_request = [this](auto& context_menu_event) {

6
Userland/Applications/Browser/main.cpp
View file

@ -19,9 +19,6 @@
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Icon.h>
#include <LibGUI/TabWidget.h>
#include <LibWeb/HTML/WebSocket.h>
#include <LibWeb/Loader/ContentFilter.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <stdio.h>
#include <unistd.h>
@ -29,6 +26,7 @@ namespace Browser {
String g_search_engine;
String g_home_url;
Vector<String> g_content_filters;
}
@ -107,7 +105,7 @@ int main(int argc, char** argv)
auto line = ad_filter_list.read_line();
if (line.is_empty())
continue;
Web::ContentFilter::the().add_pattern(line);
Browser::g_content_filters.append(move(line));
}
}