[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
d306ffe4ae
commit
f6863b03cd
@@ -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
|
||||
@@ -6001,6 +6001,10 @@
|
||||
@@ -5998,6 +5998,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",
|
||||
|
||||
@@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
|
||||
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
@@ -1120,6 +1120,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
|
||||
@@ -1122,6 +1122,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
|
||||
return should_block_request;
|
||||
}
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
|
||||
// For subresource requests, sending the hint in the fetch request based on
|
||||
// the permissions policy.
|
||||
if (!policy.IsFeatureEnabledForOrigin(
|
||||
@@ -713,7 +715,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
@@ -715,7 +717,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
}
|
||||
|
||||
// Only send User Agent hints if the info is available
|
||||
|
||||
@@ -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
|
||||
@@ -2137,7 +2137,7 @@
|
||||
@@ -2143,7 +2143,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
|
||||
@@ -2880,9 +2880,8 @@
|
||||
@@ -2886,9 +2886,8 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -14,7 +14,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
|
||||
@@ -4803,8 +4803,8 @@
|
||||
@@ -4800,8 +4800,8 @@
|
||||
{
|
||||
// Preserves the sticky user activation state after a page navigates to
|
||||
// another same-origin page. https://crbug.com/433729626
|
||||
|
||||
@@ -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
|
||||
@@ -5478,8 +5478,7 @@
|
||||
@@ -5475,8 +5475,7 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1444,7 +1444,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
|
||||
@@ -3845,7 +3845,7 @@
|
||||
@@ -3851,7 +3851,7 @@
|
||||
//
|
||||
// It also has some feature params defined throughout the codebase.
|
||||
name: "Prerender2",
|
||||
|
||||
@@ -1114,7 +1114,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
base_feature: "none",
|
||||
public: true,
|
||||
},
|
||||
@@ -3887,8 +3887,8 @@
|
||||
@@ -3893,8 +3893,8 @@
|
||||
base_feature: "none",
|
||||
},
|
||||
{
|
||||
@@ -1125,7 +1125,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
base_feature: "none",
|
||||
public: true,
|
||||
},
|
||||
@@ -5152,16 +5152,16 @@
|
||||
@@ -5149,16 +5149,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 @@
|
||||
@@ -1484,8 +1484,7 @@
|
||||
status: "test",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -4089,14 +4089,10 @@
|
||||
@@ -4095,14 +4095,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
|
||||
@@ -3835,6 +3835,10 @@
|
||||
@@ -3841,6 +3841,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
|
||||
@@ -5080,10 +5080,9 @@
|
||||
@@ -5077,10 +5077,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
|
||||
@@ -1949,7 +1949,6 @@
|
||||
@@ -1955,7 +1955,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
|
||||
@@ -3214,6 +3214,11 @@
|
||||
@@ -3220,6 +3220,11 @@
|
||||
status: "stable",
|
||||
base_feature: "none",
|
||||
},
|
||||
|
||||
@@ -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
|
||||
@@ -4031,9 +4031,9 @@
|
||||
@@ -4037,9 +4037,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.
|
||||
@@ -4045,15 +4045,15 @@
|
||||
@@ -4051,15 +4051,15 @@
|
||||
// This User-Agent Reduction feature has been enabled starting from M101,
|
||||
// but we still keep this flag for future phase tests.
|
||||
{
|
||||
|
||||
@@ -202,7 +202,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
|
||||
@@ -2227,8 +2227,8 @@
|
||||
@@ -2233,8 +2233,8 @@
|
||||
{
|
||||
// The Blink runtime-enabled feature name for the API's IDL.
|
||||
// https://chromestatus.com/feature/4654499737632768
|
||||
|
||||
@@ -334,7 +334,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
|
||||
@@ -3092,6 +3092,12 @@
|
||||
@@ -3098,6 +3098,12 @@
|
||||
name: "MacDisableCtrlHomeEnd",
|
||||
status: "stable",
|
||||
},
|
||||
|
||||
@@ -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
|
||||
@@ -3406,6 +3406,12 @@
|
||||
@@ -3412,6 +3412,12 @@
|
||||
status: {"Mac": "test", "default": "stable"},
|
||||
base_feature: "none",
|
||||
},
|
||||
|
||||
@@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.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
|
||||
@@ -4895,7 +4895,7 @@
|
||||
@@ -4892,7 +4892,7 @@
|
||||
},
|
||||
{
|
||||
name: "SvgPartitionSVGDocumentResourcesInMemoryCache",
|
||||
|
||||
@@ -288,7 +288,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
|
||||
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
|
||||
@@ -623,7 +623,8 @@ void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
@@ -625,7 +625,8 @@ void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
|
||||
// Check if |url| is allowed to run JavaScript. If not, client hints are not
|
||||
// attached to the requests that initiate on the render side.
|
||||
@@ -298,7 +298,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1086,15 +1087,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) {
|
||||
@@ -1088,15 +1089,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -390,7 +390,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
|
||||
fetcher->SetAutoLoadImages(
|
||||
frame->GetSettings()->GetLoadsImagesAutomatically());
|
||||
fetcher->SetEarlyHintsPreloadedResources(
|
||||
@@ -505,16 +506,13 @@ void FrameFetchContext::AddResourceTiming(
|
||||
@@ -507,16 +508,13 @@ void FrameFetchContext::AddResourceTiming(
|
||||
->AddResourceTiming(std::move(info), initiator_type);
|
||||
}
|
||||
|
||||
|
||||
@@ -4006,7 +4006,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
"../browser/after_startup_task_utils_unittest.cc",
|
||||
"../browser/apps/icon_standardizer_unittest.cc",
|
||||
"../browser/apps/user_type_filter_unittest.cc",
|
||||
@@ -10867,6 +10878,7 @@ if (!is_android) {
|
||||
@@ -10868,6 +10879,7 @@ if (!is_android) {
|
||||
"//chrome/browser/ui/views/frame:toolbar_button_provider",
|
||||
"//chrome/browser/ui/views/interaction",
|
||||
"//chrome/browser/ui/views/side_panel",
|
||||
|
||||
Reference in New Issue
Block a user