chore: bump chromium to 134.0.6998.10 (35-x-y) (#45585)
* chore: bump chromium to 134.0.6992.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: add BrowserProcessImpl::CreateGlobalFeaturesForTesting() stub Xref:6216193
Remove GlobalFeatures from TestingBrowserProcess::Init Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium to 134.0.6994.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6208630: Mac sandbox: don't use protobuf for policy serialization |6208630
Co-authored-by: alice <alice@makenotion.com> * Remove HasUnsupportedFeature Mojo interface Xref:6220800
Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6217444: Remove scoped_gdi_object.h type aliases. |6217444
Co-authored-by: alice <alice@makenotion.com> * chore: bump chromium to 134.0.6998.10 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6221378: Revert [OBC] Exclude Aliasing Cookies in FilterCookiesWithOptions() |6221378
Co-authored-by: alice <alice@makenotion.com> * Update ExtensionPrefs::GetDisableReasons to return DisableReasonSet Xref:6218840
change copied from 6218840 extensions/shell/browser/shell_extension_loader.cc Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6218402: Typemap ui.gfx.DXGIHandle <=> gfx::DXGIHandle |6218402
Co-authored-by: alice <alice@makenotion.com> * chore: disable flaky contentTracing test not new to this roll; it is happening in main as well Co-authored-by: Charles Kerr <charles@charleskerr.com> * fixup! chore: disable flaky contentTracing test Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update patches * chore: disable flaky content tracing tests on Linux (#45612) (cherry picked from commita1e4550c9e
) --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
74c71dbb2d
commit
c92a02ea17
71 changed files with 246 additions and 272 deletions
|
@ -8,10 +8,10 @@ Allow registering custom protocols to handle service worker main script fetching
|
|||
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
|
||||
|
||||
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||
index 5d096402b44d0684ed861fee090f87177fa1ffb5..6feb46048f45271e72ff1137c33c4073d101f646 100644
|
||||
index ff25eb3670d2391c6fb41b7c612c30ee8798983f..116763b520713a5c61462b2e048a7358486831a2 100644
|
||||
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||
@@ -1964,6 +1964,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
@@ -1969,6 +1969,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
loader_factory_bundle_info =
|
||||
context()->loader_factory_bundle_for_update_check()->Clone();
|
||||
|
||||
|
@ -38,7 +38,7 @@ index 5d096402b44d0684ed861fee090f87177fa1ffb5..6feb46048f45271e72ff1137c33c4073
|
|||
if (auto* config = content::WebUIConfigMap::GetInstance().GetConfig(
|
||||
browser_context(), scope)) {
|
||||
// If this is a Service Worker for a WebUI, the WebUI's URLDataSource
|
||||
@@ -1983,9 +2003,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
@@ -1988,9 +2008,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
features::kEnableServiceWorkersForChromeScheme) &&
|
||||
scope.scheme_piece() == kChromeUIScheme) {
|
||||
config->RegisterURLDataSource(browser_context());
|
||||
|
@ -49,7 +49,7 @@ index 5d096402b44d0684ed861fee090f87177fa1ffb5..6feb46048f45271e72ff1137c33c4073
|
|||
.emplace(kChromeUIScheme, CreateWebUIServiceWorkerLoaderFactory(
|
||||
browser_context(), kChromeUIScheme,
|
||||
base::flat_set<std::string>()));
|
||||
@@ -1993,9 +2011,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
@@ -1998,9 +2016,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||
features::kEnableServiceWorkersForChromeUntrusted) &&
|
||||
scope.scheme_piece() == kChromeUIUntrustedScheme) {
|
||||
config->RegisterURLDataSource(browser_context());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue