From 21e4a63a088d6f60c9a8d330b02896fa927bacee Mon Sep 17 00:00:00 2001 From: PF4Public Date: Wed, 23 Aug 2023 13:46:44 +0300 Subject: [PATCH] Update to Chromium 116.0.5845.110 --- chromium_version.txt | 2 +- domain_substitution.list | 1 + ...01-fix-building-without-safebrowsing.patch | 4 +- .../disable-web-environment-integrity.patch | 2 +- .../remove-unused-preferences-fields.patch | 45 ++++++++++++++----- ...g-flags-client-rects-and-measuretext.patch | 2 +- ...ngerprinting-canvas-image-data-noise.patch | 2 +- 7 files changed, 41 insertions(+), 17 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 278bb9b30..a90ae2898 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -116.0.5845.97 +116.0.5845.110 diff --git a/domain_substitution.list b/domain_substitution.list index 485989d4f..c1d281045 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -13545,6 +13545,7 @@ tools/gn/src/base/memory/scoped_refptr.h tools/gn/src/base/values.h tools/gn/src/base/win/registry.cc tools/gn/src/base/win/registry.h +tools/gn/src/gn/args.cc tools/gn/src/gn/command_gen.cc tools/gn/src/gn/compile_commands_writer.h tools/gn/src/gn/standard_out.cc diff --git a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index d028cbc4a..6fe8f516d 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -764,7 +764,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -515,6 +517,7 @@ static_library("advanced_protection") { +@@ -516,6 +518,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -772,7 +772,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -534,6 +537,7 @@ source_set("metrics_collector") { +@@ -535,6 +538,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] diff --git a/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch b/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch index 8495db781..098f5ecef 100644 --- a/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch +++ b/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch @@ -153,7 +153,7 @@ "//third_party/blink/renderer/modules/eyedropper", --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3918,12 +3918,6 @@ +@@ -3920,12 +3920,6 @@ base_feature: "none", }, { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index b720eca78..0484dc289 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -3972,24 +3972,27 @@ --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc -@@ -346,10 +346,9 @@ const V4LocalDatabaseManager* +@@ -346,12 +346,9 @@ const V4LocalDatabaseManager* scoped_refptr V4LocalDatabaseManager::Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, - scoped_refptr io_task_runner, -- ExtendedReportingLevelCallback extended_reporting_level_callback) { +- ExtendedReportingLevelCallback extended_reporting_level_callback, +- RecordMigrationMetricsCallback record_migration_metrics_callback) { + scoped_refptr io_task_runner) { return base::WrapRefCounted(new V4LocalDatabaseManager( -- base_path, extended_reporting_level_callback, std::move(ui_task_runner), +- base_path, extended_reporting_level_callback, +- std::move(record_migration_metrics_callback), std::move(ui_task_runner), + base_path, std::move(ui_task_runner), std::move(io_task_runner), nullptr)); } -@@ -372,14 +371,12 @@ void V4LocalDatabaseManager::CollectData +@@ -374,17 +371,12 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, - ExtendedReportingLevelCallback extended_reporting_level_callback, +- RecordMigrationMetricsCallback record_migration_metrics_callback, scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests) @@ -3997,10 +4000,25 @@ std::move(io_task_runner)), base_path_(base_path), - extended_reporting_level_callback_(extended_reporting_level_callback), +- record_migration_metrics_callback_( +- std::move(record_migration_metrics_callback)), list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -1277,8 +1274,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -709,12 +701,6 @@ void V4LocalDatabaseManager::DatabaseRea + v4_database_ = std::move(v4_database); + + v4_database_->RecordFileSizeHistograms(); +- if (record_migration_metrics_callback_) { +- ui_task_runner()->PostTask( +- FROM_HERE, +- base::BindOnce(std::move(record_migration_metrics_callback_), +- v4_database_->GetMigrateResult())); +- } + + PopulateArtificialDatabase(); + +@@ -1288,8 +1274,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -4012,31 +4030,36 @@ void V4LocalDatabaseManager::UpdateRequestCompleted( --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h -@@ -39,8 +39,7 @@ class V4LocalDatabaseManager : public Sa +@@ -42,9 +42,7 @@ class V4LocalDatabaseManager : public Sa static scoped_refptr Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, - scoped_refptr io_task_runner, -- ExtendedReportingLevelCallback extended_reporting_level_callback); +- ExtendedReportingLevelCallback extended_reporting_level_callback, +- RecordMigrationMetricsCallback record_migration_metrics_callback); + scoped_refptr io_task_runner); V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; -@@ -112,7 +111,6 @@ class V4LocalDatabaseManager : public Sa +@@ -116,8 +114,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnSBThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, - ExtendedReportingLevelCallback extended_reporting_level_callback, +- RecordMigrationMetricsCallback record_migration_metrics_callback, scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -430,10 +428,6 @@ class V4LocalDatabaseManager : public Sa +@@ -435,13 +431,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; - // Callback to get the current extended reporting level. Needed by the update - // manager. - ExtendedReportingLevelCallback extended_reporting_level_callback_; +- +- // Callback to record metrics on database migration after initialization. +- RecordMigrationMetricsCallback record_migration_metrics_callback_; - // The client_state of each list currently being synced. This is updated each // time a database update completes, and used to send list client_state @@ -5976,7 +5999,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -106134,7 +106134,6 @@ Full version information for the fingerp +@@ -106139,7 +106139,6 @@ Full version information for the fingerp @@ -5984,7 +6007,7 @@ -@@ -106149,10 +106148,7 @@ Full version information for the fingerp +@@ -106154,10 +106153,7 @@ Full version information for the fingerp diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index d214b5c24..f17ecb430 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -311,7 +311,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1787,6 +1787,12 @@ +@@ -1789,6 +1789,12 @@ origin_trial_feature_name: "Focusgroup", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index d4fd540f3..a8e6cc2f6 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -322,7 +322,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1793,6 +1793,9 @@ +@@ -1795,6 +1795,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, {