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

Unverified Commit bbcb812c authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for master branch (#1485) 

[AUTO] Patches auto-rebase for master branch
parents 34d6ed15 b804fceb

build/patches/Disable-media-router-and-remoting-by-default.patch

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc

--- a/chrome/browser/media/router/media_router_feature.cc

+++ b/chrome/browser/media/router/media_router_feature.cc

@@ -119,6 +119,7 @@ void ClearMediaRouterStoredPrefsForTesting() {

@@ -123,6 +123,7 @@ void ClearMediaRouterStoredPrefsForTesting() {

 }

 

 bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse 
 #if !BUILDFLAG(IS_ANDROID)

   if (!base::FeatureList::IsEnabled(kMediaRouter))

     return false;

@@ -161,7 +162,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

@@ -165,7 +166,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

   registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",

                                PrefRegistry::PUBLIC);

   registry->RegisterBooleanPref(
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse 
   registry->RegisterBooleanPref(

       media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,

       true);

@@ -232,4 +233,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {

@@ -236,4 +237,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {

 

 #endif  // !BUILDFLAG(IS_ANDROID)

build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b 
diff --git a/third_party/blink/renderer/core/html/html_meta_element.cc b/third_party/blink/renderer/core/html/html_meta_element.cc

--- a/third_party/blink/renderer/core/html/html_meta_element.cc

+++ b/third_party/blink/renderer/core/html/html_meta_element.cc

@@ -788,7 +788,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document,

@@ -790,7 +790,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document,

     return;

   }