Patches for 136.0.7103.125

This commit is contained in:
Carmelo Messina
2025-05-15 12:13:10 +02:00
parent 9743d7cdf3
commit 4ba8bcfc94
8 changed files with 17 additions and 29 deletions
+7 -19
View File
@@ -58,7 +58,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
components/permissions/features.cc | 2 +
...nthetic_trials_active_group_id_provider.cc | 4 +-
...ynthetic_trials_active_group_id_provider.h | 4 +-
components/webui/flags/flags_state.cc | 64 +++++++
components/webui/flags/flags_state.cc | 59 ++++++
components/webui/flags/resources/app.css | 24 +++
components/webui/flags/resources/app.html.ts | 28 +++
components/webui/flags/resources/app.ts | 24 +++
@@ -107,7 +107,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
third_party/blink/public/common/features.h | 1 +
ui/base/ui_base_features.cc | 1 +
ui/base/ui_base_features.h | 1 +
94 files changed, 831 insertions(+), 30 deletions(-)
94 files changed, 826 insertions(+), 30 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -1331,10 +1331,10 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
for (const auto& entry : feature_entries_) {
DCHECK(entry.IsValid());
if (!(entry.supported_platforms & platform_mask)) {
@@ -1129,6 +1183,11 @@ void FlagsState::SetFlags(
std::string feature_internal_name = flag.substr(0, at_index);
const flags_ui::FeatureEntry* entry =
@@ -1131,6 +1185,11 @@ void FlagsState::SetFlags(
FindFeatureEntryByName(feature_internal_name);
// Since this flag is currently enabled, we know for sure that we can find
// its feature entry using its internal name.
+ if (!entry) {
+ if (base::FeatureList::IsCromiteFlag(feature_internal_name)) {
+ continue;
@@ -1343,18 +1343,6 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
CHECK(entry);
if (entry->type == FeatureEntry::FEATURE_VALUE ||
@@ -1186,6 +1245,11 @@ void FlagsState::SetFlags(
std::string feature_internal_name = flag.substr(0, at_index);
const flags_ui::FeatureEntry* entry =
FindFeatureEntryByName(feature_internal_name);
+ if (!entry) {
+ if (base::FeatureList::IsCromiteFlag(feature_internal_name)) {
+ continue;
+ }
+ }
CHECK(entry);
if (entry->type == FeatureEntry::FEATURE_VALUE ||
diff --git a/components/webui/flags/resources/app.css b/components/webui/flags/resources/app.css
--- a/components/webui/flags/resources/app.css
+++ b/components/webui/flags/resources/app.css
@@ -2064,7 +2052,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2897,4 +2897,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
@@ -2901,4 +2901,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
//
// DO NOT ADD NEW FEATURES HERE.
@@ -2073,7 +2061,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -1897,6 +1897,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
@@ -1900,6 +1900,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
//
// DO NOT ADD NEW FEATURES HERE.
@@ -144,13 +144,13 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
@@ -27,7 +27,6 @@ namespace {
const base::Feature* const kFeaturesExposedToJava[] = {
&kExternalNavigationDebugLogs, &kBlockFrameRenavigations,
&kBlockIntentsToSelf, &kLowerCaseIntentSchemes};
&kBlockIntentsToSelf};
-
} // namespace
// Alphabetical:
@@ -49,7 +48,13 @@ BASE_FEATURE(kLowerCaseIntentSchemes,
"LowerCaseIntentSchemes",
@@ -44,7 +43,13 @@ BASE_FEATURE(kBlockIntentsToSelf,
"BlockIntentsToSelf",
base::FEATURE_ENABLED_BY_DEFAULT);
+CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
--- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
+++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
@@ -39,6 +39,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate
@@ -40,6 +40,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
private final Supplier<Boolean> mPersistentFullscreenMode;
private long mCurrentShowingStartTime;
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
/**
* Constructs a BrowserControlsVisibilityDelegate designed to deal with overrides driven by
@@ -64,7 +65,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate
@@ -65,7 +66,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
long currentShowingTime = SystemClock.uptimeMillis() - mCurrentShowingStartTime;
if (currentShowingTime >= MINIMUM_SHOW_DURATION_MS) return;
+1 -1
View File
@@ -1723,7 +1723,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
@@ -883,6 +883,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
@@ -876,6 +876,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
/*post_data=*/request_string,
/*headers=*/request_headers,
/*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(),
@@ -1134,7 +1134,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
base_feature: "none",
public: true,
},
@@ -4499,16 +4499,16 @@
@@ -4498,16 +4498,16 @@
status: "experimental",
},
{
+1 -1
View File
@@ -401,7 +401,7 @@ new file mode 100644
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2841,6 +2841,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
@@ -2845,6 +2845,7 @@ BASE_FEATURE(kNoReferrerForPreloadFromSubresource,
// constants for features in the section above.
bool IsAllowURNsInIframeEnabled() {
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4459,10 +4459,9 @@
@@ -4458,10 +4458,9 @@
},
{
name: "TextFragmentIdentifiers",
@@ -1020,7 +1020,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
@@ -2568,14 +2568,6 @@ public class ExternalNavigationHandler {
@@ -2562,14 +2562,6 @@ public class ExternalNavigationHandler {
* @return Whether the given intent is going to open an Instant App.
*/
private static boolean isIntentToInstantApp(Intent intent) {