From 3c356c438e6c83ee7eeccea0ab5c62629eb4befa Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:33:31 +0100 Subject: [PATCH] Minor changes for latest v107 patches --- build/bromite_patches_list.txt | 2 +- ...resolution-in-requestAnimationFrame.patch} | 4 +-- .../Remove-signin-and-sync-integrations.patch | 29 +++++-------------- 3 files changed, 10 insertions(+), 25 deletions(-) rename build/patches/{Clamp-time-resolution-in-WebWorker-requestAnimationFrame.patch => Clamp-time-resolution-in-requestAnimationFrame.patch} (93%) diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 725852c8..406f6f86 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -203,5 +203,5 @@ Disable-add-to-home-screen-prompt.patch Remove-HTTP-referrals-in-cross-origin-navigation.patch Enable-ECH-by-default.patch Disable-StartSurface-feature.patch -Clamp-time-resolution-in-WebWorker-requestAnimationFrame.patch +Clamp-time-resolution-in-requestAnimationFrame.patch Automated-domain-substitution.patch diff --git a/build/patches/Clamp-time-resolution-in-WebWorker-requestAnimationFrame.patch b/build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch similarity index 93% rename from build/patches/Clamp-time-resolution-in-WebWorker-requestAnimationFrame.patch rename to build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch index d08c4400..cc8e1486 100644 --- a/build/patches/Clamp-time-resolution-in-WebWorker-requestAnimationFrame.patch +++ b/build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch @@ -1,8 +1,8 @@ From: uazo Date: Mon, 3 Oct 2022 09:39:07 +0000 -Subject: Clamp time resolution in WebWorker requestAnimationFrame +Subject: Clamp time resolution in requestAnimationFrame -Aligns requestAnimationFrame's callback to the w3c specification +Aligns requestAnimationFrame's WebWorker callback to the W3C specification See https://bugs.chromium.org/p/chromium/issues/detail?id=1236113 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index f3036c8b..05f03f4d 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -87,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/firstrun/MobileFreProgress.java | 4 +- .../router/discovery/access_code/BUILD.gn | 1 - .../browser/password_manager/android/BUILD.gn | 4 - - ...sswordManagerErrorMessageHelperBridge.java | 41 +--- + ...sswordManagerErrorMessageHelperBridge.java | 26 -- .../PasswordManagerHelper.java | 121 +--------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - chrome/browser/privacy/BUILD.gn | 1 - @@ -127,7 +127,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ProfileOAuth2TokenServiceDelegate.java | 52 ---- .../net/HttpNegotiateAuthenticator.java | 88 +------ .../chromoting/base/OAuthTokenFetcher.java | 2 - - 108 files changed, 102 insertions(+), 2669 deletions(-) + 108 files changed, 101 insertions(+), 2655 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3719,7 +3719,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.base.WindowAndroid; -@@ -49,29 +45,7 @@ public class PasswordManagerErrorMessageHelperBridge { +@@ -49,15 +45,6 @@ public class PasswordManagerErrorMessageHelperBridge { */ @CalledByNative static boolean shouldShowErrorUi() { @@ -3732,25 +3732,10 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom - // case, the error is no longer relevant/fixable. - if (primaryAccountInfo == null) return false; - -- if (ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( -- ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES, -- "ignore_auth_error_message_timeouts", false)) { -- return true; -- } -- -- PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile()); -- long lastShownTimestamp = -- Long.valueOf(prefService.getString(Pref.UPM_ERROR_UI_SHOWN_TIMESTAMP)); -- long lastShownSyncErrorTimestamp = SharedPreferencesManager.getInstance().readLong( -- ChromePreferenceKeys.SYNC_ERROR_PROMPT_SHOWN_AT_TIME, 0); -- long currentTime = TimeUtils.currentTimeMillis(); -- return (currentTime - lastShownTimestamp > MINIMAL_INTERVAL_BETWEEN_PROMPTS_MS) -- && (currentTime - lastShownSyncErrorTimestamp) > MINIMAL_INTERVAL_TO_SYNC_ERROR_MS; -+ return false; - } - - /** -@@ -91,18 +65,5 @@ public class PasswordManagerErrorMessageHelperBridge { + if (ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( + ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES, + "ignore_auth_error_message_timeouts", false)) { +@@ -91,18 +78,5 @@ public class PasswordManagerErrorMessageHelperBridge { */ @CalledByNative static void startUpdateAccountCredentialsFlow(WindowAndroid windowAndroid) {