Skip to content

Commit

Permalink
[AUTO] Patches auto-rebase for 127.0.6533.73 (#1301)
Browse files Browse the repository at this point in the history
[AUTO] Patches auto-rebase for 127.0.6533.73
  • Loading branch information
uazo authored Jul 24, 2024
2 parents 75a75e9 + 4ae140d commit 2f43464
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build/patches/AImageReader-CFI-crash-mitigations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
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
@@ -3281,9 +3281,9 @@
@@ -3286,9 +3286,9 @@
"expiry_milestone": 135
},
{
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-a-flag-to-disable-GamePad-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
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
@@ -7689,9 +7689,9 @@
@@ -7694,9 +7694,9 @@
"expiry_milestone": 130
},
{
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-support-to-jxl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2648,7 +2648,7 @@ new file mode 100644
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -20873,6 +20873,7 @@ from previous Chrome versions.
@@ -20875,6 +20875,7 @@ from previous Chrome versions.
<int value="188610022" label="NewMessageListView:enabled"/>
<int value="189728101" label="FasterLocationReload:disabled"/>
<int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-fetching-of-all-field-trials.patch
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
}

// Returns the already downloaded first run seed, and clear the seed from the
@@ -623,7 +614,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
@@ -625,7 +616,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
// debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
// had a chance to run yet from the previous request. In this case, don't
// start a new request and just let the previous one finish.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -1845,9 +1845,9 @@
@@ -1850,9 +1850,9 @@
"expiry_milestone": -1
},
{
Expand Down
12 changes: 6 additions & 6 deletions build/patches/Enable-native-Android-autofill.patch
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
/**
* Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This
* class is not intended to be extended.
@@ -970,6 +977,11 @@ class TabImpl implements Tab {
@@ -984,6 +991,11 @@ class TabImpl implements Tab {
for (TabObserver observer : mObservers) observer.onDestroyed(this);
mObservers.clear();

Expand All @@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
mUserDataHost.destroy();
mTabViewManager.destroy();
hideNativePage(false, null);
@@ -1242,8 +1254,7 @@ class TabImpl implements Tab {
@@ -1256,8 +1268,7 @@ class TabImpl implements Tab {
*/
boolean providesAutofillStructure() {
// TODO(b/326231439): Check pref and AutofillService!
Expand All @@ -236,7 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
}

// Forwarded from TabWebContentsDelegateAndroid.
@@ -1958,15 +1969,20 @@ class TabImpl implements Tab {
@@ -1972,15 +1983,20 @@ class TabImpl implements Tab {
* @return true if the the provider is available for the given WebContents.
*/
private boolean prepareAutofillProvider(WebContents newWebContents) {
Expand All @@ -263,7 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
mAutofillProvider =
new AutofillProvider(
getContext(),
@@ -1975,7 +1991,16 @@ class TabImpl implements Tab {
@@ -1989,7 +2005,16 @@ class TabImpl implements Tab {
getContext().getString(R.string.app_name));
TabImplJni.get().initializeAutofillIfNecessary(mNativeTabAndroid);
}
Expand Down Expand Up @@ -860,7 +860,7 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -774,7 +774,7 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
@@ -779,7 +779,7 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
BASE_FEATURE(kAutofillVirtualViewStructureAndroid,
"AutofillVirtualViewStructureAndroid",
base::FEATURE_DISABLED_BY_DEFAULT);
Expand All @@ -872,7 +872,7 @@ diff --git a/components/autofill/core/common/autofill_features.cc b/components/a
diff --git a/components/autofill/core/common/autofill_features.h b/components/autofill/core/common/autofill_features.h
--- a/components/autofill/core/common/autofill_features.h
+++ b/components/autofill/core/common/autofill_features.h
@@ -240,10 +240,6 @@ BASE_DECLARE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid);
@@ -242,10 +242,6 @@ BASE_DECLARE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid);

COMPONENT_EXPORT(AUTOFILL)
BASE_DECLARE_FEATURE(kAutofillVirtualViewStructureAndroid);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -5112,9 +5112,9 @@
@@ -5117,9 +5117,9 @@
"expiry_milestone": 120
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -2064,6 +2064,10 @@
@@ -2069,6 +2069,10 @@
"[email protected]", "[email protected]", "[email protected]" ],
"expiry_milestone": 140
},
Expand Down
6 changes: 3 additions & 3 deletions build/patches/User-agent-customization.patch
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
/**
* Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This
* class is not intended to be extended.
@@ -1909,9 +1915,6 @@ class TabImpl implements Tab {
@@ -1923,9 +1929,6 @@ class TabImpl implements Tab {
}

if (mWebContents != null) {
Expand All @@ -581,7 +581,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
mWebContents.getNavigationController().loadIfNecessary();
}
mIsBeingRestored = true;
@@ -2225,6 +2228,11 @@ class TabImpl implements Tab {
@@ -2239,6 +2242,11 @@ class TabImpl implements Tab {
url = webContents.getVisibleUrl();
}

Expand All @@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
// Do not override UA if there is a tab level setting.
if (tabUserAgent != TabUserAgent.DEFAULT) {
recordHistogramUseDesktopUserAgent(currentRequestDesktopSite);
@@ -2304,6 +2312,54 @@ class TabImpl implements Tab {
@@ -2318,6 +2326,54 @@ class TabImpl implements Tab {
}
}

Expand Down
2 changes: 1 addition & 1 deletion build/patches/autofill-miscellaneous.patch
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -879,6 +879,8 @@ BASE_FEATURE(kAutofillUploadThrottling,
@@ -884,6 +884,8 @@ BASE_FEATURE(kAutofillUploadThrottling,
"AutofillUploadThrottling",
base::FEATURE_ENABLED_BY_DEFAULT);

Expand Down

0 comments on commit 2f43464

Please sign in to comment.