Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb4f95c authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO] Patches auto-rebase

parent 90c3c80a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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 };
 
+1 −1
Original line number Diff line number Diff line
@@ -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();
+2 −2
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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());
+10 −10
Original line number Diff line number Diff line
@@ -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 {
Loading