Skip to content

Commit

Permalink
Update/port patches for 129.0.6668.70.0
Browse files Browse the repository at this point in the history
  • Loading branch information
quh4gko8 authored and thestinger committed Sep 24, 2024
1 parent 61d6b8e commit 0c95b58
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 63 deletions.
50 changes: 25 additions & 25 deletions patches/0001-Vanadium-string-rebranding.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/0012-Checkout-PGO-profiles.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index b662772587702..b7280a631ca5b 100644
index 5321f73f5e55e..07adad1a32cdd 100644
--- a/DEPS
+++ b/DEPS
@@ -149,7 +149,7 @@ vars = {
Expand Down
2 changes: 1 addition & 1 deletion patches/0013-disable-checkout_nacl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index b7280a631ca5b..858824617a95b 100644
index 07adad1a32cdd..d4d6ccada0ba8 100644
--- a/DEPS
+++ b/DEPS
@@ -118,7 +118,7 @@ vars = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ for adblocking.
1 file changed, 11 insertions(+)

diff --git a/DEPS b/DEPS
index 858824617a95b..6a00a15a8b3af 100644
index d4d6ccada0ba8..e85b9c975246c 100644
--- a/DEPS
+++ b/DEPS
@@ -5910,6 +5910,17 @@ hooks = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,60 @@ Subject: [PATCH] Match skipping compatibility check default value checks in
java as well

---
.../autofill/AutofillClientProviderUtils.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
.../autofill/options/AutofillOptionsMediator.java | 13 +++++++++++++
.../browser/ui/autofill/autofill_client_provider.cc | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java
index 26da288805229..c330a205cc277 100644
--- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java
+++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java
@@ -55,6 +55,16 @@ public class AutofillClientProviderUtils {
// Technically correct. Not a useful status since the feature must be set.
return AndroidAutofillAvailabilityStatus.SETTING_TURNED_OFF;
diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsMediator.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsMediator.java
index 7099a5681a2f1..31e18e81941ef 100644
--- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsMediator.java
+++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsMediator.java
@@ -127,6 +127,13 @@ class AutofillOptionsMediator implements ModalDialogProperties.Controller {
if (prefs().getBoolean(Pref.AUTOFILL_USING_VIRTUAL_VIEW_STRUCTURE)) {
return false; // Always allow to flip back to built-in password management.
}
+ final String SKIP_COMPATIBILITY_CHECK_PARAM_NAME = "skip_compatibility_check";
+ final String SKIP_ALL_CHECKS_PARAM_VALUE = "skip_all_checks";
+ boolean skipAllChecks = !SKIP_ALL_CHECKS_PARAM_VALUE.equals(
+ final String skipCompatCheckParamValue =
+ ChromeFeatureList.getFieldTrialParamByFeature(
+ ChromeFeatureList.AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID,
+ SKIP_COMPATIBILITY_CHECK_PARAM_NAME));
+ if (skipAllChecks) {
+ return getAndroidAutofillFrameworkAvailabilityUnchecked(prefs);
+ }
+
if (!prefs.getBoolean(Pref.AUTOFILL_THIRD_PARTY_PASSWORD_MANAGERS_ALLOWED)) {
return AndroidAutofillAvailabilityStatus.NOT_ALLOWED_BY_POLICY;
}
@@ -80,6 +90,11 @@ public class AutofillClientProviderUtils {
if (AWG_COMPONENT_NAME.equals(componentName.flattenToString())) {
return AndroidAutofillAvailabilityStatus.ANDROID_AUTOFILL_SERVICE_IS_GOOGLE;
}
+
+ return getAndroidAutofillFrameworkAvailabilityUnchecked(prefs);
+ }
+
+ private static int getAndroidAutofillFrameworkAvailabilityUnchecked(PrefService prefs) {
if (!prefs.getBoolean(Pref.AUTOFILL_USING_VIRTUAL_VIEW_STRUCTURE)) {
return AndroidAutofillAvailabilityStatus.SETTING_TURNED_OFF;
}
+ SKIP_COMPATIBILITY_CHECK_PARAM_NAME);
+ final boolean skipCompatCheckParamValueIsEmpty = skipCompatCheckParamValue == null
+ || skipCompatCheckParamValue.isEmpty() || skipCompatCheckParamValue.isBlank();
+ final boolean isReadOnlyByDefault = false;
switch (AutofillClientProviderUtils.getAndroidAutofillFrameworkAvailability(prefs())) {
case AndroidAutofillAvailabilityStatus.NOT_ALLOWED_BY_POLICY:
return true;
@@ -137,11 +144,17 @@ class AutofillOptionsMediator implements ModalDialogProperties.Controller {
case AndroidAutofillAvailabilityStatus.ANDROID_AUTOFILL_MANAGER_NOT_AVAILABLE:
case AndroidAutofillAvailabilityStatus.ANDROID_AUTOFILL_NOT_SUPPORTED:
case AndroidAutofillAvailabilityStatus.UNKNOWN_ANDROID_AUTOFILL_SERVICE:
+ if (skipCompatCheckParamValueIsEmpty) {
+ return isReadOnlyByDefault;
+ }
return !SKIP_ALL_CHECKS_PARAM_VALUE.equals(
ChromeFeatureList.getFieldTrialParamByFeature(
ChromeFeatureList.AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID,
SKIP_COMPATIBILITY_CHECK_PARAM_NAME));
case AndroidAutofillAvailabilityStatus.ANDROID_AUTOFILL_SERVICE_IS_GOOGLE:
+ if (skipCompatCheckParamValueIsEmpty) {
+ return isReadOnlyByDefault;
+ }
return !SKIP_ALL_CHECKS_PARAM_VALUE.equals(
ChromeFeatureList.getFieldTrialParamByFeature(
ChromeFeatureList.AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID,
diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/browser/ui/autofill/autofill_client_provider.cc
index 621e91e56e40d..bfaadbe935b56 100644
--- a/chrome/browser/ui/autofill/autofill_client_provider.cc
+++ b/chrome/browser/ui/autofill/autofill_client_provider.cc
@@ -86,7 +86,11 @@ bool UsesVirtualViewStructureForAutofill(PrefService& prefs) {
} // namespace

AutofillClientProvider::AutofillClientProvider(PrefService* prefs)
- : uses_platform_autofill_(UsesVirtualViewStructureForAutofill(*prefs)) {
+ : uses_platform_autofill_(UsesVirtualViewStructureForAutofill(*prefs)
+#if BUILDFLAG(IS_ANDROID)
+ && prefs->GetBoolean(prefs::kAutofillUsingVirtualViewStructure)
+#endif // BUILDFLAG(IS_ANDROID)
+ ) {
#if BUILDFLAG(IS_ANDROID)
RecordWhetherAndroidPrefResets(*prefs, uses_platform_autofill_);
// Ensure the pref is reset if platform autofill is restricted.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This reverts commit 64e756725e85add6b67b3c9d90698d4c547fe231.
1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 5624843d3e153..35890c3ad281c 100644
index b7cd629be14c5..ba9f41f010a37 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1692,12 +1692,9 @@ bool RenderProcessHostImpl::Init() {
Expand All @@ -27,7 +27,7 @@ index 5624843d3e153..35890c3ad281c 100644
#else
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegate>();
@@ -3188,14 +3185,8 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
@@ -3190,14 +3187,8 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
}

if (IsJitDisabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Subject: [PATCH] add support for german-specific language content filtering
4 files changed, 26 insertions(+)

diff --git a/DEPS b/DEPS
index 6a00a15a8b3af..4767f30f54749 100644
index e85b9c975246c..acfaa0ce33136 100644
--- a/DEPS
+++ b/DEPS
@@ -5921,6 +5921,16 @@ hooks = [
Expand Down

0 comments on commit 0c95b58

Please sign in to comment.