diff --git a/CHANGELOG.md b/CHANGELOG.md index 37fdd624..adabf661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ -# 86.0.4240.55 +# 86.0.4240.66 * switch to upstream UI for DoH URL customization * remove weblayer dependency on Play Services * build fixes for password service * removed obsolete patch to kill Translate -* removed timezone customization patch * removed patch to revert unified consent code * removed patch for dav1d library * removed patch for improved cookie controls defaults +* removed patches for ARM64 AImageReader issues # 85.0.4183.114 diff --git a/build/RELEASE b/build/RELEASE index c47f09bd..ffaba5b3 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -86.0.4240.55 +86.0.4240.66 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index e7b106fc..dfa0bcb0 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -127,10 +127,6 @@ Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch disable-browser-autologin-by-default.patch -Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch -Revert-Remove-flags-to-enable-disable-AImageReader.patch -Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch -Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch Update-i18n-zh_CN-support.patch Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch Add-menu-item-to-view-source.patch @@ -146,6 +142,6 @@ Disable-scroll-to-text-fragment.patch Disable-the-DIAL-repeating-discovery.patch Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch Hardening-against-incognito-mode-detection.patch -Automated-domain-substitution.patch Remove-weblayer-dependency-on-Play-Services.patch Timezone-customization.patch +Automated-domain-substitution.patch diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 53a8cb43..5cd9fe0c 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -443,7 +443,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -350,7 +350,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -351,7 +351,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognito{"CCTIncognito", diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 6b4619e7..1869f551 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc -@@ -1080,6 +1080,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1082,6 +1082,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3493,7 +3499,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3505,7 +3511,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { // Audio only stream is allowed to play when in background. // TODO: We should check IsBackgroundOptimizationCandidate here. But we need // to move the logic of checking video frames out of that function. diff --git a/build/patches/Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch b/build/patches/Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch deleted file mode 100644 index 15f5289c..00000000 --- a/build/patches/Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Thu, 20 Feb 2020 22:44:06 +0100 -Subject: Disable AImageReader for ARM64/P and ARM64/Q - ---- - gpu/config/gpu_finch_features.cc | 4 ++++ - media/base/media_switches.cc | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc ---- a/gpu/config/gpu_finch_features.cc -+++ b/gpu/config/gpu_finch_features.cc -@@ -15,7 +15,11 @@ namespace features { - - // Use android AImageReader when playing videos with MediaPlayer. - const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer", -+#ifdef ARCH_CPU_ARM64 -+ base::FEATURE_DISABLED_BY_DEFAULT}; -+#else - base::FEATURE_ENABLED_BY_DEFAULT}; -+#endif - - #if defined(OS_ANDROID) - // Used to limit GL version to 2.0 for skia raster on Android. -diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc ---- a/media/base/media_switches.cc -+++ b/media/base/media_switches.cc -@@ -549,7 +549,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{ - - // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD) - const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput", -+#ifdef ARCH_CPU_ARM64 -+ base::FEATURE_DISABLED_BY_DEFAULT}; -+#else - base::FEATURE_ENABLED_BY_DEFAULT}; -+#endif - - // Prevents using SurfaceLayer for videos. This is meant to be used by embedders - // that cannot support SurfaceLayer at the moment. --- -2.17.1 - diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 4bdd0e5a..f1fb8f0d 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -15,7 +15,7 @@ leak information through the TextClassifier set by OEM, if any diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -396,7 +396,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", +@@ -397,7 +397,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kChromeSmartSelection{"ChromeSmartSelection", diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index ac498b15..0ca60a3d 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -452,7 +452,7 @@ const base::Feature kContextualSearchTranslations{ +@@ -456,7 +456,7 @@ const base::Feature kContextualSearchTranslations{ "ContextualSearchTranslations", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kDarkenWebsitesCheckboxInThemesSetting{ diff --git a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch index 52fd6289..96030582 100644 --- a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch +++ b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch @@ -34,7 +34,7 @@ Subject: Remove dependency on auth, signin, dynamic and tasks diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -263,9 +263,6 @@ android_library("chrome_java") { +@@ -265,9 +265,6 @@ android_library("chrome_java") { ":partner_location_descriptor_proto_java", ":update_proto_java", ":usage_stats_proto_java", @@ -44,7 +44,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:jni_java", "//chrome/android/features/keyboard_accessory:public_java", -@@ -739,8 +736,6 @@ junit_binary("chrome_junit_tests") { +@@ -741,8 +738,6 @@ junit_binary("chrome_junit_tests") { ":chrome_app_java_resources", ":chrome_java", ":partner_location_descriptor_proto_java", @@ -53,7 +53,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -928,9 +923,6 @@ android_library("chrome_test_java") { +@@ -930,9 +925,6 @@ android_library("chrome_test_java") { ":chrome_test_util_java", ":native_java_unittests_java", ":partner_location_descriptor_proto_java", diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch index 8a414320..6f99d9cf 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch @@ -14,7 +14,7 @@ Subject: Remove dependency on com.google.android.gms.auth diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -263,7 +263,6 @@ android_library("chrome_java") { +@@ -265,7 +265,6 @@ android_library("chrome_java") { ":partner_location_descriptor_proto_java", ":update_proto_java", ":usage_stats_proto_java", diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch index 746249d9..4f6691bb 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch @@ -32,7 +32,7 @@ Subject: Remove dependency on com.google.android.gms.cast diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -265,14 +265,11 @@ android_library("chrome_java") { +@@ -267,14 +267,11 @@ android_library("chrome_java") { ":usage_stats_proto_java", "$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_basement_java", @@ -47,7 +47,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/android/modules/image_editor/provider:java", "//chrome/android/modules/image_editor/public:java", "//chrome/android/modules/stack_unwinder/provider:java", -@@ -744,8 +741,6 @@ junit_binary("chrome_junit_tests") { +@@ -746,8 +743,6 @@ junit_binary("chrome_junit_tests") { ":partner_location_descriptor_proto_java", "$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_basement_java", @@ -56,7 +56,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -935,8 +930,6 @@ android_library("chrome_test_java") { +@@ -937,8 +932,6 @@ android_library("chrome_test_java") { ":partner_location_descriptor_proto_java", "$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_basement_java", diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch b/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch index c22f4a9b..5037dbbd 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch @@ -22,7 +22,7 @@ The snippets are already disabled in native codes, this will disable it on Java diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -268,7 +268,6 @@ android_library("chrome_java") { +@@ -270,7 +270,6 @@ android_library("chrome_java") { "$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_java", "$google_play_services_package:google_play_services_fido_java", @@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", "//base:base_java", -@@ -943,7 +942,6 @@ android_library("chrome_test_java") { +@@ -945,7 +944,6 @@ android_library("chrome_test_java") { "$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_java", "$google_play_services_package:google_play_services_fido_java", @@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", "//base:base_java", -@@ -1870,7 +1868,6 @@ android_library("browser_java_test_support") { +@@ -1872,7 +1870,6 @@ android_library("browser_java_test_support") { ] deps = [ ":chrome_java", diff --git a/build/patches/Remove-dependency-on-com.google.android.play.patch b/build/patches/Remove-dependency-on-com.google.android.play.patch index 3c6b2034..a5452bd9 100644 --- a/build/patches/Remove-dependency-on-com.google.android.play.patch +++ b/build/patches/Remove-dependency-on-com.google.android.play.patch @@ -14,7 +14,7 @@ Subject: Remove dependency on com.google.android.play diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -482,7 +482,6 @@ android_library("chrome_java") { +@@ -484,7 +484,6 @@ android_library("chrome_java") { "//third_party/blink/public/mojom:android_mojo_bindings_java", "//third_party/blink/public/mojom:mojom_platform_java", "//third_party/gif_player:gif_player_java", diff --git a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch index 72c35ec7..9f9ad67c 100644 --- a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch +++ b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch @@ -21,7 +21,7 @@ Subject: Remove dependency on fido, iid, instantapps, location diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -267,8 +267,6 @@ android_library("chrome_java") { +@@ -269,8 +269,6 @@ android_library("chrome_java") { "$google_play_services_package:google_play_services_basement_java", "$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_java", @@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "$google_play_services_package:google_play_services_tasks_java", "//base:base_java", "//base:jni_java", -@@ -748,7 +746,6 @@ junit_binary("chrome_junit_tests") { +@@ -750,7 +748,6 @@ junit_binary("chrome_junit_tests") { "$google_play_services_package:google_play_services_basement_java", "$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_java", @@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -940,8 +937,6 @@ android_library("chrome_test_java") { +@@ -942,8 +939,6 @@ android_library("chrome_test_java") { "$google_play_services_package:google_play_services_basement_java", "$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_java", diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index 9dda9b5f..d30ea8f1 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -36,7 +36,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -1426,8 +1426,7 @@ jinja_template_resources("chrome_public_apk_template_resources") { +@@ -1428,8 +1428,7 @@ jinja_template_resources("chrome_public_apk_template_resources") { resources = [ "java/res_template/xml/file_paths.xml", "java/res_template/xml/launchershortcuts.xml", diff --git a/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch b/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch deleted file mode 100644 index ade695d4..00000000 --- a/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sat, 15 Feb 2020 08:20:40 +0100 -Subject: Restore GPU bug blacklist for AImageReader on ARM CPUs - -Restore the AImageReader blacklist for ARM/ARM64 devices which causes -crashes on Android 9 and 10 (at different code locations). - -See discussion at https://github.com/bromite/bromite/issues/445 ---- - gpu/config/gpu_driver_bug_list.json | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json ---- a/gpu/config/gpu_driver_bug_list.json -+++ b/gpu/config/gpu_driver_bug_list.json -@@ -3286,6 +3286,22 @@ - "dont_delete_source_texture_for_egl_image" - ] - }, -+ { -+ "id":335, -+ "cr_bugs": [1051705], -+ "description": "Disable AImageReader on ARM GPUs", -+ "os": { -+ "type": "android", -+ "version": { -+ "op": "<", -+ "value": "10" -+ } -+ }, -+ "gl_vendor": "ARM.*", -+ "features": [ -+ "disable_aimagereader" -+ ] -+ }, - { - "id": 336, - "cr_bugs": [625785], --- -2.17.1 - diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 18ca50f8..2da78f21 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -109,7 +109,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -187,6 +187,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -188,6 +188,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &kReachedCodeProfiler, &kReaderModeInCCT, &kReengagementNotification, @@ -117,7 +117,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kRevampedContextMenu, &kSearchEnginePromoExistingDevice, -@@ -569,6 +570,9 @@ const base::Feature kRelatedSearches{"RelatedSearches", +@@ -573,6 +574,9 @@ const base::Feature kRelatedSearches{"RelatedSearches", const base::Feature kRevampedContextMenu{"RevampedContextMenu", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -130,7 +130,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -106,6 +106,7 @@ extern const base::Feature kRelatedSearches; +@@ -107,6 +107,7 @@ extern const base::Feature kRelatedSearches; extern const base::Feature kRevampedContextMenu; extern const base::Feature kSearchEnginePromoExistingDevice; extern const base::Feature kSearchEnginePromoNewDevice; @@ -141,7 +141,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -330,6 +330,7 @@ public abstract class ChromeFeatureList { +@@ -332,6 +332,7 @@ public abstract class ChromeFeatureList { public static final String OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT = "OmniboxAdaptiveSuggestionsCount"; public static final String OMNIBOX_ASSISTANT_VOICE_SEARCH = "OmniboxAssistantVoiceSearch"; diff --git a/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch b/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch deleted file mode 100644 index 3c9d9de5..00000000 --- a/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch +++ /dev/null @@ -1,151 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Tue, 5 May 2020 07:26:55 +0200 -Subject: Revert "Remove flags to enable/disable AImageReader." - -This reverts commit 463fa0f2e3b9e418bc26e2c8954463f0b0f76634. ---- - .../service/image_reader_gl_owner_unittest.cc | 5 +++++ - gpu/config/gpu_finch_features.cc | 4 ++++ - gpu/config/gpu_finch_features.h | 1 + - gpu/ipc/service/stream_texture_android.cc | 11 ++++++++++- - media/base/media_switches.cc | 4 ++++ - media/base/media_switches.h | 1 + - media/gpu/android/video_frame_factory_impl.cc | 5 ++++- - 7 files changed, 29 insertions(+), 2 deletions(-) - -diff --git a/gpu/command_buffer/service/image_reader_gl_owner_unittest.cc b/gpu/command_buffer/service/image_reader_gl_owner_unittest.cc ---- a/gpu/command_buffer/service/image_reader_gl_owner_unittest.cc -+++ b/gpu/command_buffer/service/image_reader_gl_owner_unittest.cc -@@ -8,10 +8,12 @@ - #include - #include - -+#include "base/test/scoped_feature_list.h" - #include "base/test/task_environment.h" - #include "gpu/command_buffer/service/abstract_texture.h" - #include "gpu/command_buffer/service/image_reader_gl_owner.h" - #include "gpu/command_buffer/service/mock_abstract_texture.h" -+#include "media/base/media_switches.h" - #include "media/base/android/media_codec_util.h" - #include "testing/gtest/include/gtest/gtest.h" - #include "ui/gl/gl_bindings.h" -@@ -31,6 +33,8 @@ class ImageReaderGLOwnerTest : public testing::Test { - if (!IsImageReaderSupported()) - return; - -+ scoped_feature_list_.InitAndEnableFeature(media::kAImageReaderVideoOutput); -+ - gl::init::InitializeStaticGLBindingsImplementation( - gl::kGLImplementationEGLGLES2, false); - gl::init::InitializeGLOneOffPlatformImplementation(false, false, true); -@@ -70,6 +74,7 @@ class ImageReaderGLOwnerTest : public testing::Test { - return base::android::AndroidImageReader::GetInstance().IsSupported(); - } - -+ base::test::ScopedFeatureList scoped_feature_list_; - scoped_refptr image_reader_; - GLuint texture_id_ = 0; - -diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc ---- a/gpu/config/gpu_finch_features.cc -+++ b/gpu/config/gpu_finch_features.cc -@@ -13,6 +13,10 @@ - - namespace features { - -+// Use android AImageReader when playing videos with MediaPlayer. -+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer", -+ base::FEATURE_ENABLED_BY_DEFAULT}; -+ - #if defined(OS_ANDROID) - // Used to limit GL version to 2.0 for skia raster on Android. - const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", -diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h ---- a/gpu/config/gpu_finch_features.h -+++ b/gpu/config/gpu_finch_features.h -@@ -17,6 +17,7 @@ namespace features { - // All features in alphabetical order. The features should be documented - // alongside the definition of their values in the .cc file. - #if defined(OS_ANDROID) -+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer; - GPU_EXPORT extern const base::Feature kUseGles2ForOopR; - GPU_EXPORT extern const base::Feature kAndroidSurfaceControl; - GPU_EXPORT extern const base::Feature kAImageReader; -diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc ---- a/gpu/ipc/service/stream_texture_android.cc -+++ b/gpu/ipc/service/stream_texture_android.cc -@@ -6,6 +6,7 @@ - - #include - -+#include "base/android/android_image_reader_compat.h" - #include "base/android/scoped_hardware_buffer_fence_sync.h" - #include "base/bind.h" - #include "base/feature_list.h" -@@ -47,7 +48,15 @@ std::unique_ptr MakeCurrent( - } - - TextureOwner::Mode GetTextureOwnerMode() { -- return features::IsAImageReaderEnabled() -+ const bool a_image_reader_supported = -+ base::android::AndroidImageReader::GetInstance().IsSupported(); -+ -+ // TODO(vikassoni) : Currently we have 2 different flags to enable/disable -+ // AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2 -+ // flags into a single flag. Keeping the 2 flags separate for now since finch -+ // experiment using this flag is in progress. -+ return a_image_reader_supported && features::IsAImageReaderEnabled() && -+ base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer) - ? TextureOwner::Mode::kAImageReaderInsecure - : TextureOwner::Mode::kSurfaceTextureInsecure; - } -diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc ---- a/media/base/media_switches.cc -+++ b/media/base/media_switches.cc -@@ -547,6 +547,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", - const base::Feature kMediaDrmPreprovisioningAtStartup{ - "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; - -+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD) -+const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput", -+ base::FEATURE_ENABLED_BY_DEFAULT}; -+ - // Prevents using SurfaceLayer for videos. This is meant to be used by embedders - // that cannot support SurfaceLayer at the moment. - const base::Feature kDisableSurfaceLayerForVideo{ -diff --git a/media/base/media_switches.h b/media/base/media_switches.h ---- a/media/base/media_switches.h -+++ b/media/base/media_switches.h -@@ -192,6 +192,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; - MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; - MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; - MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; -+MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput; - MEDIA_EXPORT extern const base::Feature kDisableSurfaceLayerForVideo; - MEDIA_EXPORT extern const base::Feature kCanPlayHls; - MEDIA_EXPORT extern const base::Feature kPictureInPictureAPI; -diff --git a/media/gpu/android/video_frame_factory_impl.cc b/media/gpu/android/video_frame_factory_impl.cc ---- a/media/gpu/android/video_frame_factory_impl.cc -+++ b/media/gpu/android/video_frame_factory_impl.cc -@@ -6,6 +6,7 @@ - - #include - -+#include "base/android/android_image_reader_compat.h" - #include "base/bind.h" - #include "base/bind_helpers.h" - #include "base/callback.h" -@@ -65,7 +66,9 @@ gpu::TextureOwner::Mode GetTextureOwnerMode( - switch (overlay_mode) { - case VideoFrameFactory::OverlayMode::kDontRequestPromotionHints: - case VideoFrameFactory::OverlayMode::kRequestPromotionHints: -- return features::IsAImageReaderEnabled() -+ return base::android::AndroidImageReader::GetInstance().IsSupported() && -+ features::IsAImageReaderEnabled() && -+ base::FeatureList::IsEnabled(media::kAImageReaderVideoOutput) - ? gpu::TextureOwner::Mode::kAImageReaderInsecure - : gpu::TextureOwner::Mode::kSurfaceTextureInsecure; - case VideoFrameFactory::OverlayMode::kSurfaceControlSecure: --- -2.17.1 - diff --git a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch b/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch deleted file mode 100644 index a503b22e..00000000 --- a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch +++ /dev/null @@ -1,127 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Tue, 5 May 2020 07:22:20 +0200 -Subject: Revert "gpu/android: Remove setup for disabling AImageReader." - -This reverts commit dcd5a39518246eb999f1cc63bf1ec95d93fd5b2f. ---- - base/android/android_image_reader_compat.cc | 8 +++++++- - base/android/android_image_reader_compat.h | 4 ++++ - gpu/config/gpu_util.cc | 8 ++++++++ - gpu/config/gpu_workaround_list.txt | 1 + - gpu/ipc/service/gpu_init.cc | 11 +++++++++++ - 5 files changed, 31 insertions(+), 1 deletion(-) - -diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc ---- a/base/android/android_image_reader_compat.cc -+++ b/base/android/android_image_reader_compat.cc -@@ -22,6 +22,8 @@ - namespace base { - namespace android { - -+bool AndroidImageReader::disable_support_ = false; -+ - AndroidImageReader& AndroidImageReader::GetInstance() { - // C++11 static local variable initialization is - // thread-safe. -@@ -29,8 +31,12 @@ AndroidImageReader& AndroidImageReader::GetInstance() { - return *instance; - } - -+void AndroidImageReader::DisableSupport() { -+ disable_support_ = true; -+} -+ - bool AndroidImageReader::IsSupported() { -- return is_supported_; -+ return !disable_support_ && is_supported_; - } - - AndroidImageReader::AndroidImageReader() { -diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h ---- a/base/android/android_image_reader_compat.h -+++ b/base/android/android_image_reader_compat.h -@@ -22,6 +22,9 @@ class BASE_EXPORT AndroidImageReader { - // Thread safe GetInstance. - static AndroidImageReader& GetInstance(); - -+ // Disable image reader support. -+ static void DisableSupport(); -+ - // Check if the image reader usage is supported. This function returns TRUE - // if android version is >=OREO, image reader support is not disabled and all - // the required functions are loaded. -@@ -64,6 +67,7 @@ class BASE_EXPORT AndroidImageReader { - AndroidImageReader(); - bool LoadFunctions(); - -+ static bool disable_support_; - bool is_supported_; - pAImage_delete AImage_delete_; - pAImage_deleteAsync AImage_deleteAsync_; -diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc ---- a/gpu/config/gpu_util.cc -+++ b/gpu/config/gpu_util.cc -@@ -111,6 +111,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( - #if !defined(OS_ANDROID) - return kGpuFeatureStatusDisabled; - #else -+ if (blocklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL)) -+ return kGpuFeatureStatusBlocklisted; -+ - if (!gpu_preferences.enable_android_surface_control) - return kGpuFeatureStatusDisabled; - -@@ -374,6 +377,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { - gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = - kGpuFeatureStatusBlocklisted; - } -+ -+ if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { -+ gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] = -+ kGpuFeatureStatusBlocklisted; -+ } - } - - // Estimates roughly user total disk space by counting in the drives where -diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt ---- a/gpu/config/gpu_workaround_list.txt -+++ b/gpu/config/gpu_workaround_list.txt -@@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap - depth_stencil_renderbuffer_resize_emulation - disable_2d_canvas_auto_flush - disable_accelerated_av1_decode -+disable_aimagereader - disable_accelerated_vp8_decode - disable_accelerated_vp8_encode - disable_accelerated_vp9_decode -diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc ---- a/gpu/ipc/service/gpu_init.cc -+++ b/gpu/ipc/service/gpu_init.cc -@@ -708,6 +708,12 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, - AdjustInfoToSwiftShader(); - } - -+#if defined(OS_ANDROID) -+ // Disable AImageReader if the workaround is enabled. -+ if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { -+ base::android::AndroidImageReader::DisableSupport(); -+ } -+#endif - #if defined(USE_OZONE) - if (features::IsUsingOzonePlatform()) { - const std::vector -@@ -727,6 +733,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, - gl::DirectCompositionSurfaceWin::DisableDecodeSwapChain(); - #endif - -+ // Disable AImageReader if the workaround is enabled. -+ if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { -+ base::android::AndroidImageReader::DisableSupport(); -+ } -+ - UMA_HISTOGRAM_ENUMERATION("GPU.GLImplementation", gl::GetGLImplementation()); - } - #endif // OS_ANDROID --- -2.17.1 - diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index 5145ab95..2e4feacd 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -1363,3 +1363,6 @@ diff --git a/weblayer/browser/java/org/chromium/weblayer_private/WebLayerSiteSet // WebappSettingsClient implementation: // A no-op since WebLayer doesn't support webapps. +-- +2.17.1 + diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch index 5c35b12c..834a01c1 100644 --- a/build/patches/kill-GCM.patch +++ b/build/patches/kill-GCM.patch @@ -45,7 +45,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest. diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -477,7 +477,6 @@ android_library("chrome_java") { +@@ -479,7 +479,6 @@ android_library("chrome_java") { "//third_party/android_deps:material_design_java", "//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/android_media:android_media_java", diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 8687770b..1794a155 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -14,7 +14,7 @@ Barcode, face and text detection APIs diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -272,8 +272,6 @@ android_library("chrome_java") { +@@ -274,8 +274,6 @@ android_library("chrome_java") { "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java",