PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Eyeo Adblock for Cromite: stricter verification for strict blocking (#1850)

Browse Source
This commit is contained in:
Carmelo Messina
2025-03-11 09:53:54 +01:00
parent 387be3e56b
commit 317f1f0b5c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Eyeo-Adblock-for-Cromite.patch
+7 -9
View File
@@ -59,7 +59,7 @@ deactivation of all pop-ups (default disabled)
.../content/browser/element_hider_impl.cc | 9 +-
.../browser/frame_hierarchy_builder.cc | 3 +-
.../browser/resource_classification_runner.h | 9 +
.../resource_classification_runner_impl.cc | 83 +-
.../resource_classification_runner_impl.cc | 81 +-
.../resource_classification_runner_impl.h | 10 +
.../subscription_service_factory_base.cc | 11 +-
.../subscription_service_factory_base.h | 1 +
@@ -130,7 +130,7 @@ deactivation of all pop-ups (default disabled)
.../blink/renderer/core/css/style_engine.h | 1 +
.../renderer/core/exported/web_document.cc | 15 +-
.../definitions/adblock_private.d.ts | 14 +
120 files changed, 6729 insertions(+), 1313 deletions(-)
120 files changed, 6727 insertions(+), 1313 deletions(-)
create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html
create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.ts
rename components/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (56%)
@@ -3049,7 +3049,7 @@ diff --git a/components/adblock/content/browser/resource_classification_runner_i
std::move(site_key)),
base::BindOnce(
&ResourceClassificationRunnerImpl::OnCheckResourceFilterMatchComplete,
@@ -260,9 +273,18 @@ ResourceClassificationRunnerImpl::CheckRequestFilterMatchInternal(
@@ -260,9 +273,16 @@ ResourceClassificationRunnerImpl::CheckRequestFilterMatchInternal(
const scoped_refptr<ResourceClassifier>& resource_classifier,
SubscriptionService::Snapshot subscription_collections,
const GURL request_url,
@@ -3058,17 +3058,15 @@ diff --git a/components/adblock/content/browser/resource_classification_runner_i
ContentType adblock_resource_type,
const SiteKey sitekey) {
+ std::vector<std::string> aliases;
+ if (dns_aliases.size() <= 1) {
+ aliases.push_back(request_url.host());
+ } else {
+ for (const std::string& alias : dns_aliases)
+ aliases.push_back(alias);
+ aliases.push_back(request_url.host());
+ for (const std::string& alias : dns_aliases) {
+ aliases.push_back(alias);
+ }
+
TRACE_EVENT1("eyeo",
"ResourceClassificationRunnerImpl::"
"CheckRequestFilterMatchInternal",
@@ -270,26 +292,35 @@ ResourceClassificationRunnerImpl::CheckRequestFilterMatchInternal(
@@ -270,26 +290,35 @@ ResourceClassificationRunnerImpl::CheckRequestFilterMatchInternal(
DVLOG(1) << "[eyeo] CheckRequestFilterMatchInternal start";