Release 81.0.4044.76

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 81.0.4044.76
+
+# 81.0.4044.70
+* backport surface control fix (fixes https://github.com/bromite/bromite/issues/445)
+
 # 81.0.4044.63
 * use upstream fix for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485)
 * do not compile QR code sharing

build/bromite_patches_list.txt

@@ -137,5 +137,5 @@ Disable-smart-selection-by-default.patch
 Enable-user-agent-freeze-by-default.patch
 Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch
 Upstream-internal-DownloadCollectionBridge-code.patch
-Automated-domain-substitution.patch
 Add-missing-android_provider.patch
+Automated-domain-substitution.patch

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -3,12 +3,12 @@ Date: Wed, 29 Aug 2018 11:03:44 +0200
 Subject: Add custom tab intents privacy option
 
 ---
- chrome/android/java/res/values/values.xml           |  3 +++
- chrome/android/java/res/xml/privacy_preferences.xml |  5 +++++
- .../chrome/browser/LaunchIntentDispatcher.java      |  3 +++
- .../browser/settings/privacy/PrivacySettings.java   | 13 ++++++++++++-
- .../ui/android/strings/android_chrome_strings.grd   |  7 +++++++
- 5 files changed, 30 insertions(+), 1 deletion(-)
+ chrome/android/java/res/values/values.xml             |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml   |  5 +++++
+ .../chrome/browser/LaunchIntentDispatcher.java        |  3 +++
+ .../browser/settings/privacy/PrivacySettings.java     | 11 +++++++++++
+ .../ui/android/strings/android_chrome_strings.grd     |  7 +++++++
+ 5 files changed, 29 insertions(+)
 
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
@@ -61,15 +61,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-@@ -15,7 +15,7 @@ import android.view.MenuItem;
- 
- import org.chromium.base.BuildInfo;
- import org.chromium.chrome.R;
--import org.chromium.chrome.browser.ChromeFeatureList;
-+import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.help.HelpAndFeedback;
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 @@ -41,6 +41,8 @@ public class PrivacySettings
  
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2370,6 +2370,10 @@ const char kContextualSearchRankerQueryDescription[] =
+@@ -2376,6 +2376,10 @@ const char kContextualSearchRankerQueryDescription[] =
  
  const char kContextualSearchSecondTapName[] =
      "Contextual Search second tap triggering";

build/patches/Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch

@@ -5,8 +5,9 @@ Subject: Disable AImageReader for ARM64/P and ARM64/Q
 ---
  chrome/browser/android/chrome_startup_flags.cc | 9 +++++++++
  gpu/config/gpu_finch_features.cc               | 4 ++++
+ gpu/config/gpu_util.cc                         | 8 ++++++++
  media/base/media_switches.cc                   | 4 ++++
- 3 files changed, 17 insertions(+)
+ 4 files changed, 25 insertions(+)
 
 diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
 --- a/chrome/browser/android/chrome_startup_flags.cc
@@ -56,6 +57,31 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
  
  // Used only by webview to disable SurfaceControl.
  const base::Feature kDisableSurfaceControlForWebview{
+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
+@@ -47,6 +47,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+ #if !defined(OS_ANDROID)
+   return kGpuFeatureStatusDisabled;
+ #else
++  if (blacklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
++    return kGpuFeatureStatusBlacklisted;
++
+   if (!gpu_preferences.enable_android_surface_control)
+     return kGpuFeatureStatusDisabled;
+ 
+@@ -288,6 +291,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+     gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
+         kGpuFeatureStatusBlacklisted;
+   }
++
++  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
++    gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
++        kGpuFeatureStatusBlacklisted;
++  }
+ }
+ 
+ GPUInfo* g_gpu_info_cache = nullptr;
 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

build/patches/Disable-password-reuse-detection-on-android.patch

@@ -3,9 +3,99 @@ Date: Sun, 15 Dec 2019 22:39:56 +0100
 Subject: Disable password reuse detection on android
 
 ---
- components/password_manager/core/browser/BUILD.gn | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ .../android/password_reuse_controller_android.cc     | 12 ++++++++++++
+ .../password_reuse_dialog_view_android.cc            | 11 +++++++++--
+ components/password_manager/core/browser/BUILD.gn    |  6 +++---
+ 3 files changed, 24 insertions(+), 5 deletions(-)
 
+diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
+--- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
++++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
+@@ -17,17 +17,25 @@ PasswordReuseControllerAndroid::PasswordReuseControllerAndroid(
+     ChromePasswordProtectionService* service,
+     ReusedPasswordAccountType password_type,
+     OnWarningDone done_callback)
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+     : service_(service),
++#else
++    :
++#endif
+       url_(web_contents->GetLastCommittedURL()),
+       password_type_(password_type),
+       window_android_(web_contents->GetTopLevelNativeWindow()),
+       done_callback_(std::move(done_callback)) {
+   modal_construction_start_time_ = base::TimeTicks::Now();
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   service_->AddObserver(this);
++#endif
+ }
+ 
+ PasswordReuseControllerAndroid::~PasswordReuseControllerAndroid() {
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   service_->RemoveObserver(this);
++#endif
+   dialog_view_.reset();
+   LogModalWarningDialogLifetime(modal_construction_start_time_);
+ }
+@@ -48,20 +56,24 @@ base::string16 PasswordReuseControllerAndroid::GetButtonText() const {
+   return l10n_util::GetStringUTF16(IDS_CLOSE);
+ }
+ 
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+ base::string16 PasswordReuseControllerAndroid::GetWarningDetailText(
+     std::vector<size_t>* placeholder_offsets) const {
+   return service_->GetWarningDetailText(password_type_, placeholder_offsets);
+ }
++#endif
+ 
+ base::string16 PasswordReuseControllerAndroid::GetTitle() const {
+   return l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY);
+ }
+ 
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+ const std::vector<base::string16>
+ PasswordReuseControllerAndroid::GetPlaceholdersForSavedPasswordWarningText()
+     const {
+   return service_->GetPlaceholdersForSavedPasswordWarningText();
+ }
++#endif
+ 
+ void PasswordReuseControllerAndroid::OnGaiaPasswordChanged() {
+   delete this;
+diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+--- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
++++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+@@ -29,6 +29,7 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
+   java_object_.Reset(Java_SafeBrowsingPasswordReuseDialogBridge_create(
+       env, window_android->GetJavaObject(), reinterpret_cast<intptr_t>(this)));
+ 
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   std::vector<size_t> placeholder_offsets;
+   base::string16 warning_detail_text =
+       controller_->GetWarningDetailText(&placeholder_offsets);
+@@ -50,14 +51,20 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
+       base::android::ToJavaIntArray(env, start_ranges, len);
+   base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
+       base::android::ToJavaIntArray(env, end_ranges, len);
+-
++#else
++  int start_ranges[0], end_ranges[0];
++  base::android::ScopedJavaLocalRef<jintArray> j_start_ranges =
++      base::android::ToJavaIntArray(env, start_ranges, 0);
++  base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
++      base::android::ToJavaIntArray(env, end_ranges, 0);
+   Java_SafeBrowsingPasswordReuseDialogBridge_showDialog(
+       env, java_object_,
+       base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
+-      base::android::ConvertUTF16ToJavaString(env, warning_detail_text),
++      base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
+       base::android::ConvertUTF16ToJavaString(env,
+                                               controller_->GetButtonText()),
+       j_start_ranges, j_end_ranges);
++#endif
+ }
+ 
+ void PasswordReuseDialogViewAndroid::Close(
 diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
 --- a/components/password_manager/core/browser/BUILD.gn
 +++ b/components/password_manager/core/browser/BUILD.gn

build/patches/Disable-safe-browsing.patch

@@ -47,14 +47,12 @@ Disable CrowdDeny feature
  ...hrome_browser_main_extra_parts_profiles.cc |  1 -
  chrome/browser/profiles/profile_impl.cc       |  4 +-
  chrome/browser/safe_browsing/BUILD.gn         |  3 +-
- .../password_reuse_controller_android.cc      | 12 +++
  .../password_reuse_controller_android.h       |  6 ++
  .../download_protection_service.cc            |  6 --
  .../download_protection_service.h             |  5 --
  .../browser/ssl/security_state_tab_helper.cc  |  2 +
  .../chrome_subresource_filter_client.cc       | 10 ---
  chrome/browser/ui/BUILD.gn                    |  1 -
- .../password_reuse_dialog_view_android.cc     | 11 ++-
  .../strings/android_chrome_strings.grd        | 33 --------
  chrome/browser/ui/tab_helpers.cc              |  8 --
  .../ui/webui/interstitials/interstitial_ui.cc | 13 +---
@@ -67,7 +65,7 @@ Disable CrowdDeny feature
  .../native_file_system_file_writer_impl.cc    | 48 +-----------
  .../native_file_system_file_writer_impl.h     | 15 +---
  .../native_file_system_permission_context.h   |  7 --
- 61 files changed, 189 insertions(+), 647 deletions(-)
+ 59 files changed, 168 insertions(+), 645 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
@@ -1863,60 +1861,6 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
  
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
---- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
-+++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
-@@ -17,17 +17,25 @@ PasswordReuseControllerAndroid::PasswordReuseControllerAndroid(
-     ChromePasswordProtectionService* service,
-     ReusedPasswordAccountType password_type,
-     OnWarningDone done_callback)
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
-     : service_(service),
-+#else
-+    :
-+#endif
-       url_(web_contents->GetLastCommittedURL()),
-       password_type_(password_type),
-       window_android_(web_contents->GetTopLevelNativeWindow()),
-       done_callback_(std::move(done_callback)) {
-   modal_construction_start_time_ = base::TimeTicks::Now();
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
-   service_->AddObserver(this);
-+#endif
- }
- 
- PasswordReuseControllerAndroid::~PasswordReuseControllerAndroid() {
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
-   service_->RemoveObserver(this);
-+#endif
-   dialog_view_.reset();
-   LogModalWarningDialogLifetime(modal_construction_start_time_);
- }
-@@ -48,20 +56,24 @@ base::string16 PasswordReuseControllerAndroid::GetButtonText() const {
-   return l10n_util::GetStringUTF16(IDS_CLOSE);
- }
- 
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
- base::string16 PasswordReuseControllerAndroid::GetWarningDetailText(
-     std::vector<size_t>* placeholder_offsets) const {
-   return service_->GetWarningDetailText(password_type_, placeholder_offsets);
- }
-+#endif
- 
- base::string16 PasswordReuseControllerAndroid::GetTitle() const {
-   return l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY);
- }
- 
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
- const std::vector<base::string16>
- PasswordReuseControllerAndroid::GetPlaceholdersForSavedPasswordWarningText()
-     const {
-   return service_->GetPlaceholdersForSavedPasswordWarningText();
- }
-+#endif
- 
- void PasswordReuseControllerAndroid::OnGaiaPasswordChanged() {
-   delete this;
 diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
 --- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
 +++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
@@ -2042,40 +1986,6 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
        "views/download/download_in_progress_dialog_view.cc",
        "views/download/download_in_progress_dialog_view.h",
        "views/download/download_item_view.cc",
-diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
---- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
-+++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
-@@ -29,6 +29,7 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
-   java_object_.Reset(Java_SafeBrowsingPasswordReuseDialogBridge_create(
-       env, window_android->GetJavaObject(), reinterpret_cast<intptr_t>(this)));
- 
-+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
-   std::vector<size_t> placeholder_offsets;
-   base::string16 warning_detail_text =
-       controller_->GetWarningDetailText(&placeholder_offsets);
-@@ -50,14 +51,20 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
-       base::android::ToJavaIntArray(env, start_ranges, len);
-   base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
-       base::android::ToJavaIntArray(env, end_ranges, len);
--
-+#else
-+  int start_ranges[0], end_ranges[0];
-+  base::android::ScopedJavaLocalRef<jintArray> j_start_ranges =
-+      base::android::ToJavaIntArray(env, start_ranges, 0);
-+  base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
-+      base::android::ToJavaIntArray(env, end_ranges, 0);
-   Java_SafeBrowsingPasswordReuseDialogBridge_showDialog(
-       env, java_object_,
-       base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
--      base::android::ConvertUTF16ToJavaString(env, warning_detail_text),
-+      base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
-       base::android::ConvertUTF16ToJavaString(env,
-                                               controller_->GetButtonText()),
-       j_start_ranges, j_end_ranges);
-+#endif
- }
- 
- void PasswordReuseDialogViewAndroid::Close(
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch

@@ -62,7 +62,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2620,6 +2620,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
+@@ -2626,6 +2626,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
      "process to check the Safe Browsing reputation of URLs without calling "
      "into GmsCore for every URL.";
  
@@ -77,7 +77,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1518,6 +1518,9 @@ extern const char kRecoverFromNeverSaveAndroidDescription[];
+@@ -1521,6 +1521,9 @@ extern const char kRecoverFromNeverSaveAndroidDescription[];
  extern const char kSafeBrowsingUseLocalBlacklistsV2Name[];
  extern const char kSafeBrowsingUseLocalBlacklistsV2Description[];
  

build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch

@@ -154,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
  
  import org.chromium.base.BuildInfo;
  import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.ChromeFeatureList;
++import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.help.HelpAndFeedback;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.preferences.PrefServiceBridge;

build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch

@@ -42,7 +42,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2598,6 +2598,10 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] =
+@@ -2604,6 +2604,10 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] =
      "separated like strict site isolation, but process selection puts multiple "
      "site instances in a single process.";
  
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1504,6 +1504,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
+@@ -1507,6 +1507,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
  extern const char kProcessSharingWithStrictSiteInstancesName[];
  extern const char kProcessSharingWithStrictSiteInstancesDescription[];