diff --git a/build/patches/Eyeo-Adblock-for-Cromite.patch b/build/patches/Eyeo-Adblock-for-Cromite.patch index a8667789..b9cde51f 100644 --- a/build/patches/Eyeo-Adblock-for-Cromite.patch +++ b/build/patches/Eyeo-Adblock-for-Cromite.patch @@ -104,7 +104,7 @@ suit Cromite logic. .../adblock/core/subscription/subscription.cc | 20 + .../adblock/core/subscription/subscription.h | 3 + .../subscription_collection_impl.cc | 7 +- - .../core/subscription/subscription_config.cc | 86 +- + .../core/subscription/subscription_config.cc | 88 +- .../core/subscription/subscription_config.h | 6 +- .../subscription_downloader_impl.cc | 19 +- .../subscription_persistent_metadata.h | 1 + @@ -132,7 +132,7 @@ suit Cromite logic. .../renderer/core/exported/web_document.cc | 13 +- .../blink/renderer/core/html/html_element.cc | 8 +- .../definitions/adblock_private.d.ts | 14 + - 127 files changed, 9444 insertions(+), 709 deletions(-) + 127 files changed, 9442 insertions(+), 713 deletions(-) rename chrome/browser/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (59%) create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.ts @@ -274,7 +274,7 @@ diff --git a/chrome/browser/adblock/android/adblock_strings.grd b/chrome/browser + + Snippets are pieces of JavaScript code, injected by the Adblock Plus, that execute within the context of a website and combat advanced ads that circumvent ordinary blocking. +The functionality is ONLY allowed for the list -+https://www.cromite.org/filters/abp-filters-anti-cv.txt ++https://uazo.github.io/cromite/filters/abp-filters-anti-cv.txt +which is activated by this setting. + + @@ -1289,7 +1289,7 @@ new file mode 100644 +
+ Snippets are pieces of JavaScript code, injected by the Adblock Plus, that execute within the context of a website and combat advanced ads that circumvent ordinary blocking. + The functionality is ONLY allowed for the list -+ abp-filters-anti-cv.txt ++ abp-filters-anti-cv.txt + which is activated by this setting. +
Open ABP anti-circumvention filter list repo +
Open ABP Snippets Overview @@ -12415,7 +12415,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo std::string GetHost() { - GURL url("https://easylist-downloads.adblockplus.org"); -+ GURL url("https://www.cromite.org/filters/"); ++ GURL url("https://uazo.github.io/cromite/filters/"); if (!g_port_for_testing) { return url.spec(); } @@ -12478,7 +12478,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo + SubscriptionUiVisibility::Visible, + SubscriptionFirstRunBehavior::SubscribeAtFirstRun, + SubscriptionPrivilegedFilterStatus::Forbidden}, -+ {GURL(GetHost() + "badmojr-1Hosts-master-Pro-adblock.txt"), ++ {GURL(GetHost() + "badmojr-1Hosts-master-Lite-adblock.txt"), + "badmojr/1Hosts", + {"en"}, + SubscriptionUiVisibility::Visible, @@ -12486,7 +12486,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo SubscriptionPrivilegedFilterStatus::Forbidden}, {GURL(GetHost() + "abpindo.txt"), "ABPindo", -@@ -262,17 +276,23 @@ const std::vector& config::GetKnownSubscriptions() { +@@ -262,23 +276,23 @@ const std::vector& config::GetKnownSubscriptions() { SubscriptionFirstRunBehavior::SubscribeIfLocaleMatch, SubscriptionPrivilegedFilterStatus::Forbidden}, {AcceptableAdsUrl(), @@ -12503,18 +12503,22 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo SubscriptionUiVisibility::Visible, - SubscriptionFirstRunBehavior::Subscribe, - SubscriptionPrivilegedFilterStatus::Allowed}, +- {GURL(GetHost() + "i_dont_care_about_cookies.txt"), +- "I don't care about cookies", + SubscriptionFirstRunBehavior::SubscribeAtFirstRun, + SubscriptionPrivilegedFilterStatus::AllowedAndChecked}, + {GURL("https://raw.githubusercontent.com/uazo/cromite/master/tools/filters/experimental-cromite-filters.txt"), + "Cromite experimental filters", -+ {}, -+ SubscriptionUiVisibility::Visible, + {}, + SubscriptionUiVisibility::Visible, +- SubscriptionFirstRunBehavior::Ignore, +- SubscriptionPrivilegedFilterStatus::Forbidden}, + SubscriptionFirstRunBehavior::SubscribeAtFirstRun, + SubscriptionPrivilegedFilterStatus::AllowedAndChecked}, - {GURL(GetHost() + "i_dont_care_about_cookies.txt"), - "I don't care about cookies", - {}, -@@ -303,13 +323,13 @@ const std::vector& config::GetKnownSubscriptions() { + {GURL(GetHost() + "" + "fanboy-notifications.txt"), + "Fanboy's Notifications Blocking List", +@@ -303,13 +317,13 @@ const std::vector& config::GetKnownSubscriptions() { {}, SubscriptionUiVisibility::Invisible, SubscriptionFirstRunBehavior::Ignore, @@ -12530,7 +12534,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo // You can customize subscriptions available on first run and in settings // here. Items are displayed in settings in order declared here. See -@@ -329,9 +349,9 @@ const std::vector& config::GetKnownSubscriptions() { +@@ -329,9 +343,9 @@ const std::vector& config::GetKnownSubscriptions() { */ // clang-format on @@ -12542,7 +12546,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo } bool config::AllowPrivilegedFilters(const GURL& url) { -@@ -346,7 +366,7 @@ bool config::AllowPrivilegedFilters(const GURL& url) { +@@ -346,7 +360,7 @@ bool config::AllowPrivilegedFilters(const GURL& url) { for (const auto& cur : GetKnownSubscriptions()) { if (cur.url == url) { return cur.privileged_status == @@ -12551,7 +12555,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo } } -@@ -356,9 +376,7 @@ bool config::AllowPrivilegedFilters(const GURL& url) { +@@ -356,9 +370,7 @@ bool config::AllowPrivilegedFilters(const GURL& url) { const std::vector& config::GetPreloadedSubscriptionConfiguration() { static const std::vector preloaded_subscriptions = @@ -12562,7 +12566,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo return preloaded_subscriptions; } -@@ -368,10 +386,11 @@ void SetFilterListServerPortForTesting(int port_for_testing) { +@@ -368,10 +380,11 @@ void SetFilterListServerPortForTesting(int port_for_testing) { const std::vector& config::MaybeSplitCombinedAdblockList( const GURL& filter_list) { @@ -12578,7 +12582,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo {"abpindo+easylist.txt", {"abpindo.txt", VALUE_EASYLIST_EN}}, {"abpvn+easylist", {"abpvn.txt", VALUE_EASYLIST_EN}}, {"bulgarian_list+easylist.", -@@ -410,11 +429,11 @@ const std::vector& config::MaybeSplitCombinedAdblockList( +@@ -410,11 +423,11 @@ const std::vector& config::MaybeSplitCombinedAdblockList( {"rolist+easylist.txt", {"rolist.txt", VALUE_EASYLIST_EN}}, {"ruadlist+easylist.txt", {"ruadlist.txt", VALUE_EASYLIST_EN}}, {"turkish+easylist.txt", {"turkish.txt", VALUE_EASYLIST_EN}}, @@ -12593,7 +12597,7 @@ diff --git a/components/adblock/core/subscription/subscription_config.cc b/compo auto path = base::TrimString(filter_list.path(), "/", base::TRIM_LEADING); -@@ -422,7 +441,8 @@ const std::vector& config::MaybeSplitCombinedAdblockList( +@@ -422,7 +435,8 @@ const std::vector& config::MaybeSplitCombinedAdblockList( if (it == filter_lists_map->end()) { return *EMPTY_VALUE; }