[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
8e1e69162a
commit
54be9ddb29
@@ -2029,7 +2029,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
|
||||
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
|
||||
@@ -5877,6 +5877,10 @@
|
||||
@@ -5868,6 +5868,10 @@
|
||||
// If enabled, the `getDisplayMedia()` family of APIs will ask for NV12
|
||||
// frames, which should trigger a zero-copy path in the tab capture code.
|
||||
name: "ZeroCopyTabCapture",
|
||||
|
||||
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
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
|
||||
@@ -1316,7 +1316,7 @@
|
||||
@@ -1306,7 +1306,7 @@
|
||||
},
|
||||
{
|
||||
name: "CSSDynamicRangeLimit",
|
||||
|
||||
@@ -39,7 +39,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -2118,7 +2118,7 @@
|
||||
@@ -2108,7 +2108,7 @@
|
||||
{
|
||||
name: "FedCm",
|
||||
public: true,
|
||||
|
||||
@@ -58,7 +58,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -2844,9 +2844,8 @@
|
||||
@@ -2834,9 +2834,8 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -5335,8 +5335,7 @@
|
||||
@@ -5325,8 +5325,7 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1388,7 +1388,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
|
||||
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
|
||||
@@ -3762,7 +3762,7 @@
|
||||
@@ -3752,7 +3752,7 @@
|
||||
//
|
||||
// It also has some feature params defined throughout the codebase.
|
||||
name: "Prerender2",
|
||||
|
||||
@@ -1111,7 +1111,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
base_feature: "none",
|
||||
public: true,
|
||||
},
|
||||
@@ -3804,8 +3804,8 @@
|
||||
@@ -3794,8 +3794,8 @@
|
||||
base_feature: "none",
|
||||
},
|
||||
{
|
||||
@@ -1122,7 +1122,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
base_feature: "none",
|
||||
public: true,
|
||||
},
|
||||
@@ -5019,16 +5019,16 @@
|
||||
@@ -5009,16 +5009,16 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -20,7 +20,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -1478,8 +1478,7 @@
|
||||
@@ -1468,8 +1468,7 @@
|
||||
status: "test",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
|
||||
--- a/android_webview/browser/aw_browser_context.cc
|
||||
+++ b/android_webview/browser/aw_browser_context.cc
|
||||
@@ -515,6 +515,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
|
||||
@@ -514,6 +514,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
|
||||
|
||||
content::OriginTrialsControllerDelegate*
|
||||
AwBrowserContext::GetOriginTrialsControllerDelegate() {
|
||||
|
||||
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
|
||||
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
|
||||
@@ -4006,14 +4006,10 @@
|
||||
@@ -3996,14 +3996,10 @@
|
||||
base_feature: "none",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
|
||||
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
|
||||
@@ -3754,6 +3754,10 @@
|
||||
@@ -3744,6 +3744,10 @@
|
||||
name: "PrefersReducedData",
|
||||
status: "experimental",
|
||||
},
|
||||
|
||||
@@ -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
|
||||
@@ -4947,10 +4947,9 @@
|
||||
@@ -4937,10 +4937,9 @@
|
||||
},
|
||||
{
|
||||
name: "TextFragmentIdentifiers",
|
||||
|
||||
@@ -85,7 +85,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
|
||||
@@ -1922,7 +1922,6 @@
|
||||
@@ -1912,7 +1912,6 @@
|
||||
{
|
||||
name: "DocumentOpenSandboxInheritanceRemoval",
|
||||
status: "stable",
|
||||
|
||||
@@ -826,7 +826,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicat
|
||||
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
|
||||
@@ -3162,6 +3162,11 @@
|
||||
@@ -3152,6 +3152,11 @@
|
||||
status: "stable",
|
||||
base_feature: "none",
|
||||
},
|
||||
|
||||
@@ -433,7 +433,7 @@ new file mode 100644
|
||||
diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
|
||||
--- a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
|
||||
+++ b/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
|
||||
@@ -59,12 +59,35 @@
|
||||
@@ -60,12 +60,35 @@
|
||||
#error This file should not be used by MacOS.
|
||||
#endif
|
||||
|
||||
@@ -469,7 +469,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
// This function is called on android or when we are emulating android fonts on
|
||||
// linux and the embedder has overriden the default fontManager with
|
||||
@@ -215,7 +238,7 @@ const SimpleFontData* FontCache::GetLastResortFallbackFont(
|
||||
@@ -218,7 +241,7 @@ const SimpleFontData* FontCache::GetLastResortFallbackFont(
|
||||
sk_sp<SkTypeface> FontCache::CreateTypeface(
|
||||
const FontDescription& font_description,
|
||||
const FontFaceCreationParams& creation_params,
|
||||
@@ -478,7 +478,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b
|
||||
#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
|
||||
// TODO(fuchsia): Revisit this and other font code for Fuchsia.
|
||||
|
||||
@@ -233,6 +256,16 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
|
||||
@@ -236,6 +259,16 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
|
||||
DCHECK_NE(family, font_family_names::kSystemUi);
|
||||
// convert the name to utf8
|
||||
name = family.Utf8();
|
||||
@@ -495,7 +495,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
// If this is a locale-specific family, try looking up locale-specific
|
||||
@@ -240,11 +273,11 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
|
||||
@@ -243,11 +276,11 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
|
||||
if (const char* locale_family = GetLocaleSpecificFamilyName(family)) {
|
||||
if (sk_sp<SkTypeface> typeface =
|
||||
CreateLocaleSpecificTypeface(font_description, locale_family))
|
||||
@@ -510,7 +510,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b
|
||||
}
|
||||
|
||||
#if !BUILDFLAG(IS_WIN)
|
||||
@@ -254,6 +287,7 @@ const FontPlatformData* FontCache::CreateFontPlatformData(
|
||||
@@ -257,6 +290,7 @@ const FontPlatformData* FontCache::CreateFontPlatformData(
|
||||
float font_size,
|
||||
AlternateFontName alternate_name) {
|
||||
std::string name;
|
||||
@@ -518,7 +518,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc b
|
||||
|
||||
sk_sp<SkTypeface> typeface;
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -274,7 +308,7 @@ const FontPlatformData* FontCache::CreateFontPlatformData(
|
||||
@@ -277,7 +311,7 @@ const FontPlatformData* FontCache::CreateFontPlatformData(
|
||||
noto_color_emoji_from_gmscore)) {
|
||||
typeface = CreateTypefaceFromUniqueName(creation_params);
|
||||
} else {
|
||||
|
||||
@@ -46,7 +46,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
|
||||
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
|
||||
@@ -3948,9 +3948,9 @@
|
||||
@@ -3938,9 +3938,9 @@
|
||||
// If enabled, the deviceModel will be reduced to "K" and the
|
||||
// androidVersion will be reduced to a static "10" string in android
|
||||
// User-Agent string.
|
||||
@@ -59,7 +59,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
},
|
||||
// If enabled, the platform version in User-Agent Data will be removed.
|
||||
// This feature is limited to Linux only.
|
||||
@@ -3962,15 +3962,15 @@
|
||||
@@ -3952,15 +3952,15 @@
|
||||
// This User-Agent Reduction feature has been enabled starting from M101,
|
||||
// but we still keep this flag for future phase tests.
|
||||
{
|
||||
|
||||
@@ -205,7 +205,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
|
||||
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
|
||||
@@ -2204,8 +2204,8 @@
|
||||
@@ -2194,8 +2194,8 @@
|
||||
{
|
||||
// The Blink runtime-enabled feature name for the API's IDL.
|
||||
// https://chromestatus.com/feature/4654499737632768
|
||||
|
||||
@@ -331,7 +331,7 @@ diff --git a/third_party/blink/renderer/core/page/frame_tree.cc b/third_party/bl
|
||||
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
|
||||
@@ -2049,8 +2049,8 @@
|
||||
@@ -2039,8 +2039,8 @@
|
||||
// Escapes "<" and ">" in attribute values. This was launched
|
||||
// in M139, and this flag can be removed in M141.
|
||||
// See: crbug.com/1175016
|
||||
@@ -342,7 +342,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
},
|
||||
{
|
||||
name: "EventTimingInteractionCount",
|
||||
@@ -3034,6 +3034,12 @@
|
||||
@@ -3024,6 +3024,12 @@
|
||||
name: "MacDisableCtrlHomeEnd",
|
||||
status: "stable",
|
||||
},
|
||||
|
||||
@@ -2133,7 +2133,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x
|
||||
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -2395,7 +2395,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2402,7 +2402,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
|
||||
|
||||
@@ -685,7 +685,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
|
||||
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
|
||||
@@ -3341,6 +3341,12 @@
|
||||
@@ -3331,6 +3331,12 @@
|
||||
status: {"Mac": "test", "default": "stable"},
|
||||
base_feature: "none",
|
||||
},
|
||||
|
||||
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
@@ -1156,7 +1156,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity {
|
||||
@@ -1151,7 +1151,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity {
|
||||
// Disable creating new tabs, bookmark, print, help, focus_url, etc.
|
||||
if (id == R.id.focus_url_bar
|
||||
|| id == R.id.all_bookmarks_menu_id
|
||||
|
||||
@@ -963,7 +963,7 @@ diff --git a/chrome/renderer/google_accounts_private_api_util.cc b/chrome/render
|
||||
diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/renderer/url_loader_throttle_provider_impl.cc
|
||||
--- a/chrome/renderer/url_loader_throttle_provider_impl.cc
|
||||
+++ b/chrome/renderer/url_loader_throttle_provider_impl.cc
|
||||
@@ -293,17 +293,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles(
|
||||
@@ -288,17 +288,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles(
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user