From 8c127918e2d3322dd89bc34143548115e3078979 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:25:52 +0200 Subject: [PATCH] Release 102.0.5005.92 --- CHANGELOG.md | 3 +++ build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/patches/Add-webGL-site-setting.patch | 2 ++ build/patches/Automated-domain-substitution.patch | 14 +++++++------- .../patches/Content-settings-infrastructure.patch | 6 +++--- build/patches/Disable-all-predictors-code.patch | 2 +- .../Restore-offline-indicator-v2-flag.patch | 6 +++--- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55af728a..4c358f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 102.0.5005.92 +* restore offline-indicator-v2 flag functionality (thanks to @Zelda189) + # 102.0.5005.67 * dropped patch to disable mobile identity consistency by default * fix text for blocked ads (fixes https://github.com/bromite/bromite/issues/2026) diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 8d79ea74..bfdbbce9 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -e2f81b1dde1b1797abac2016085412a9f5cd16b0- \ No newline at end of file +a36e9bc9c8f2df56c89b7b7a1afbde175eee1fad- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index fbcb94c1..fa981ff4 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -102.0.5005.67 \ No newline at end of file +102.0.5005.92 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index 67f6fbfa..ece7129a 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -56d61c35a8cc36f6c7e4a47b81ffbcad0b7bc405 \ No newline at end of file +ab83f30c1716f7fc990039b28a3ded97ff082625 \ No newline at end of file diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 8e4121f4..5ac954eb 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -2,6 +2,8 @@ From: uazo Date: Tue, 3 May 2022 14:44:11 +0000 Subject: Add webGL site setting +Do not provide any device information when serving context creation errors. + Requires patch: Content-settings-infrastructure.patch --- .../browser_ui/site_settings/android/BUILD.gn | 3 + diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 035eb016..6f9801b8 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -29775,7 +29775,7 @@ diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests diff --git a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json b/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json --- a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json +++ b/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json -@@ -10,7 +10,7 @@ +@@ -94,7 +94,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -29787,7 +29787,7 @@ diff --git a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-c diff --git a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json --- a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json +++ b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json -@@ -13,7 +13,7 @@ +@@ -63,7 +63,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -29871,7 +29871,7 @@ diff --git a/infra/config/generated/builders/try/android_compile_x64_dbg/propert diff --git a/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json b/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json --- a/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json +++ b/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json -@@ -2,7 +2,7 @@ +@@ -46,7 +46,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29907,7 +29907,7 @@ diff --git a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/ diff --git a/infra/config/generated/builders/try/cast_shell_android/properties.json b/infra/config/generated/builders/try/cast_shell_android/properties.json --- a/infra/config/generated/builders/try/cast_shell_android/properties.json +++ b/infra/config/generated/builders/try/cast_shell_android/properties.json -@@ -2,7 +2,7 @@ +@@ -48,7 +48,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -30015,7 +30015,7 @@ diff --git a/infra/config/generated/builders/try/chromeos-kevin-rel/properties.j diff --git a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json --- a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json +++ b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json -@@ -2,7 +2,7 @@ +@@ -117,7 +117,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -30027,8 +30027,8 @@ diff --git a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/propert diff --git a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json --- a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json +++ b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json -@@ -1,7 +1,7 @@ - { +@@ -113,7 +113,7 @@ + }, "$build/goma": { "rpc_extra_params": "?prod", - "server_host": "goma.chromium.org", diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index f7d02bdf..1ada2248 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -2,10 +2,10 @@ From: uazo Date: Thu, 24 Feb 2022 07:54:36 +0000 Subject: Content settings infrastructure -Small internal framework for the simplified management of -the ui relative to the site settings for use by the other patches +This patch is used by other patches to provide the UI for Bromite-specific +site settings. -See BromiteCustomContentSetting_README.md +See BromiteCustomContentSetting_README.md for more information. --- .../browser_ui/site_settings/android/BUILD.gn | 4 + .../BromiteCustomContentSetting.java | 125 ++++++++ diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 1f99b5d7..eb07d8ac 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -31,7 +31,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc -@@ -326,7 +326,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( +@@ -362,7 +362,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 93fe5f1a..539dad4c 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -8,13 +8,13 @@ Reverts acc8b6f4542703211e5f3c5181914fd3374c9e84 .../indicator/OfflineIndicatorController.java | 3 +- .../tabbed_mode/TabbedRootUiCoordinator.java | 16 +++++++- chrome/browser/about_flags.cc | 3 ++ - chrome/browser/flag-metadata.json | 10 +++++ + chrome/browser/flag-metadata.json | 5 +++ chrome/browser/flag_descriptions.cc | 4 ++ chrome/browser/flag_descriptions.h | 3 ++ .../flags/android/chrome_feature_list.cc | 4 ++ .../flags/android/chrome_feature_list.h | 1 + .../browser/flags/ChromeFeatureList.java | 1 + - 10 files changed, 79 insertions(+), 4 deletions(-) + 10 files changed, 74 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java @@ -161,7 +161,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -4337,6 +4342,11 @@ +@@ -4337,6 +4337,11 @@ "owners": [ "adamta", "sczs" ], "expiry_milestone": 98 },