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

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
Notes: sideshowbarker 2024-07-18 08:59:31 +09:00
8 changed files with 22 additions and 4 deletions

View file

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

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) {

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));
}
}

View file

@ -472,4 +472,9 @@ String OutOfProcessWebView::dump_layout_tree()
return client().dump_layout_tree();
}
void OutOfProcessWebView::set_content_filters(Vector<String> filters)
{
client().async_set_content_filters(filters);
}
}

View file

@ -51,6 +51,8 @@ public:
String dump_layout_tree();
void set_content_filters(Vector<String>);
void notify_server_did_layout(Badge<WebContentClient>, const Gfx::IntSize& content_size);
void notify_server_did_paint(Badge<WebContentClient>, i32 bitmap_id);
void notify_server_did_invalidate_content_rect(Badge<WebContentClient>, const Gfx::IntRect&);

View file

@ -19,6 +19,7 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Layout/InitialContainingBlock.h>
#include <LibWeb/Loader/ContentFilter.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/BrowsingContext.h>
#include <WebContent/ClientConnection.h>
@ -338,4 +339,10 @@ Messages::WebContentServer::DumpLayoutTreeResponse ClientConnection::dump_layout
return builder.to_string();
}
void ClientConnection::set_content_filters(Vector<String> const& filters)
{
for (auto& filter : filters)
Web::ContentFilter::the().add_pattern(filter);
}
}

View file

@ -55,6 +55,7 @@ private:
virtual Messages::WebContentServer::InspectDomNodeResponse inspect_dom_node(i32) override;
virtual Messages::WebContentServer::GetHoveredNodeIdResponse get_hovered_node_id() override;
virtual Messages::WebContentServer::DumpLayoutTreeResponse dump_layout_tree() override;
virtual void set_content_filters(Vector<String> const&) override;
virtual void js_console_input(String const&) override;
virtual void run_javascript(String const&) override;

View file

@ -38,4 +38,7 @@ endpoint WebContentServer
get_selected_text() => (String selection)
select_all() =|
set_content_filters(Vector<String> filters) =|
}