Release 72.0.3626.81 (c800e61c) · Commits · e / os / Browser

CHANGELOG.md

+4 −0

Original line number	Diff line number	Diff line
		# 72.0.3626.81
		* serve empty content for blocked scripts/images (fixes https://github.com/bromite/bromite/issues/238)
		* keep support of Jelly Bean (workaround for upstream https://bugs.chromium.org/p/chromium/issues/detail?id=923477)

		# 72.0.3626.73

		# 72.0.3626.68

build/filters/adblock_entries.h

+300 −120

File changed.

Preview size limit exceeded, changes collapsed.

build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch

+2 −2

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
		"bookmarks/bookmark_model_factory.cc",
		"bookmarks/bookmark_model_factory.h",
		"bookmarks/bookmark_stats.cc",
		@@ -2614,8 +2618,6 @@ jumbo_split_static_library("browser") {
		@@ -2616,8 +2620,6 @@ jumbo_split_static_library("browser") {
		"banners/app_banner_infobar_delegate_desktop.h",
		"banners/app_banner_manager_desktop.cc",
		"banners/app_banner_manager_desktop.h",
		@@ -367,7 +367,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
		"certificate_viewer.h",
		"chrome_browser_field_trials_desktop.cc",
		"chrome_browser_field_trials_desktop.h",
		@@ -2704,8 +2706,6 @@ jumbo_split_static_library("browser") {
		@@ -2706,8 +2708,6 @@ jumbo_split_static_library("browser") {
		"importer/importer_uma.h",
		"importer/in_process_importer_bridge.cc",
		"importer/in_process_importer_bridge.h",

build/patches/Bromite-adblock-engine.patch

+21 −8

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook
		.../browser/appmenu/AppMenuPropertiesDelegate.java \| 38 +++
		.../CustomTabAppMenuPropertiesDelegate.java \| 2 +
		.../java/strings/android_chrome_strings.grd \| 11 +
		chrome/browser/net/chrome_network_delegate.cc \| 62 ++++
		chrome/browser/net/chrome_network_delegate.cc \| 75 +++++
		.../subresource_filter_content_settings_manager.cc \| 1 +
		net/BUILD.gn \| 7 +
		net/url_request/adblock_intercept.cc \| 341 +++++++++++++++++++++
		net/url_request/adblock_intercept.h \| 41 +++
		12 files changed, 542 insertions(+)
		12 files changed, 555 insertions(+)
		create mode 100644 net/url_request/adblock_intercept.cc
		create mode 100644 net/url_request/adblock_intercept.h

		@@ -213,11 +213,13 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
		#endif

		#if defined(OS_CHROMEOS)
		@@ -193,16 +195,76 @@ void ChromeNetworkDelegate::set_cookie_settings(
		@@ -193,16 +195,89 @@ void ChromeNetworkDelegate::set_cookie_settings(
		cookie_settings_ = cookie_settings;
		}

		+#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
		+#define EMPTYJS "data:text/javascript;base64,Cg=="
		+#define EMPTYCSS "data:text/css;base64,Cg=="
		+
		int ChromeNetworkDelegate::OnBeforeURLRequest(
		net::URLRequest* request,
		@@ -268,13 +270,22 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
		+ }
		+
		+ if (block) {
		+ if (content::RESOURCE_TYPE_IMAGE == info->GetResourceType()) {
		+ switch (info->GetResourceType()) {
		+ case content::RESOURCE_TYPE_IMAGE:
		+ case content::RESOURCE_TYPE_FAVICON:
		+ *new_url = GURL(TRANSPARENT1PXGIF);
		+ } else {
		+ break;
		+ case content::RESOURCE_TYPE_SCRIPT:
		+ *new_url = GURL(EMPTYJS);
		+ break;
		+ case content::RESOURCE_TYPE_STYLESHEET:
		+ *new_url = GURL(EMPTYCSS);
		+ break;
		+ default:
		+ *new_url = GURL("");
		+ }
		+ return net::ERR_BLOCKED_BY_ADMINISTRATOR;
		+ }
		+ }
		+ } // valid URL and info
		+ } // request
		+#endif // OS_ANDROID
		@@ -286,6 +297,8 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
		}

		+#undef TRANSPARENT1PXGIF
		+#undef EMPTYJS
		+#undef EMPTYCSS
		+
		int ChromeNetworkDelegate::OnBeforeStartTransaction(
		net::URLRequest* request,

build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch

0 → 100644

+401 −0

File added.

Preview size limit exceeded, changes collapsed.