[AUTO] Patches auto-rebase

This commit is contained in:
uazo
2026-01-19 13:26:00 +00:00
committed by github-actions[bot]
parent 90c3c80a4e
commit 6cb4f95cb0
8 changed files with 24 additions and 24 deletions
+2 -2
View File
@@ -189,7 +189,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -93,6 +93,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
@@ -94,6 +94,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
return settings;
}
@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -148,6 +148,8 @@ enum ReasonForCallingCanExecuteScripts {
@@ -149,6 +149,8 @@ enum ReasonForCallingCanExecuteScripts {
enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -424,6 +424,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
@@ -425,6 +425,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -3589,7 +3589,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -77,6 +77,22 @@
@@ -78,6 +78,22 @@
namespace blink {
@@ -3623,7 +3623,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
#include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/execution_context/security_context.h"
@@ -135,6 +136,10 @@ class TrustedTypePolicyFactory;
@@ -136,6 +137,10 @@ class TrustedTypePolicyFactory;
class WebCodecsLogger;
class WebPrintingManager;
class WebViewAndroid;
@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -9793,7 +9793,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
@@ -9798,7 +9798,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
void NavigationRequest::ForceEnableOriginTrials(
const std::vector<std::string>& trials) {
DCHECK(!HasCommitted());
@@ -42,16 +42,16 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc
--- a/third_party/blink/renderer/core/frame/cached_permission_status.cc
+++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc
@@ -32,9 +32,9 @@ CachedPermissionStatus::CachedPermissionStatus(LocalDOMWindow* local_dom_window)
permission_service_(local_dom_window),
permission_observer_receivers_(this, local_dom_window) {
CHECK(local_dom_window);
- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) ||
- RuntimeEnabledFeatures::GeolocationElementEnabled(local_dom_window) ||
- RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window));
+ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) ||
+ // RuntimeEnabledFeatures::GeolocationElementEnabled(local_dom_window) ||
+ // RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee
@@ -33,9 +33,9 @@ CachedPermissionStatus::CachedPermissionStatus(ExecutionContext* context)
permission_service_(context),
permission_observer_receivers_(this, context) {
CHECK(context);
- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(context) ||
- RuntimeEnabledFeatures::GeolocationElementEnabled(context) ||
- RuntimeEnabledFeatures::UserMediaElementEnabled(context));
+ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(context) ||
+ // RuntimeEnabledFeatures::GeolocationElementEnabled(context) ||
+ // RuntimeEnabledFeatures::UserMediaElementEnabled(context)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee
}
void CachedPermissionStatus::Trace(Visitor* visitor) const {
@@ -65,7 +65,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -522,6 +522,15 @@ void ExecutionContext::SetReferrerPolicy(
@@ -523,6 +523,15 @@ void ExecutionContext::SetReferrerPolicy(
policy_container_->UpdateReferrerPolicy(referrer_policy);
}
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
#include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h"
#include "third_party/blink/public/common/fingerprinting_protection/noise_token.h"
#include "third_party/blink/public/common/tokens/tokens.h"
@@ -419,6 +420,9 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
@@ -420,6 +421,9 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
const String& message = g_empty_string,
const String& source_file = g_empty_string) const {}
@@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
#include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
#include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h"
#include "third_party/blink/renderer/bindings/core/v8/isolated_world_csp.h"
@@ -510,7 +511,10 @@ bool LocalDOMWindow::CanExecuteScripts(
@@ -509,7 +510,10 @@ bool LocalDOMWindow::CanExecuteScripts(
}
return false;
}
+5 -5
View File
@@ -411,7 +411,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1615,7 +1615,12 @@ int LocalDOMWindow::outerHeight() const {
@@ -1614,7 +1614,12 @@ int LocalDOMWindow::outerHeight() const {
if (frame->IsInFencedFrameTree()) {
return innerHeight();
}
@@ -425,7 +425,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
Page* page = frame->GetPage();
if (!page)
return 0;
@@ -1640,7 +1645,12 @@ int LocalDOMWindow::outerWidth() const {
@@ -1639,7 +1644,12 @@ int LocalDOMWindow::outerWidth() const {
if (frame->IsInFencedFrameTree()) {
return innerWidth();
}
@@ -439,7 +439,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
Page* page = frame->GetPage();
if (!page)
return 0;
@@ -1836,7 +1846,8 @@ double LocalDOMWindow::devicePixelRatio() const {
@@ -1835,7 +1845,8 @@ double LocalDOMWindow::devicePixelRatio() const {
if (!GetFrame())
return 0.0;
@@ -449,7 +449,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
}
ScriptPromise<IDLUndefined> LocalDOMWindow::scrollBy(ScriptState* script_state,
@@ -2446,6 +2457,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -2445,6 +2456,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
if (!completed_url.IsEmpty() || result.new_window)
result.frame->Navigate(frame_request, WebFrameLoadType::kStandard);
@@ -473,7 +473,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
// TODO(japhet): window-open-noopener.html?_top and several tests in
// html/browsers/windows/browsing-context-names/ appear to require that
// the special case target names (_top, _parent, _self) ignore opener
@@ -2497,6 +2525,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow(
@@ -2496,6 +2524,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow(
DCHECK(result.new_window);
result.frame->Navigate(frame_request, WebFrameLoadType::kStandard);