Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3036d4557
Branches Tags
electron
/
patches
/
chromium
/
custom_protocols_plzserviceworker.patch

custom_protocols_plzserviceworker.patch 3.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: deepak1556 <[email protected]>
    3. 

  3. Date: Fri, 20 May 2022 00:29:34 +0900
    4. 

  4. Subject: custom_protocols_plzserviceworker.patch
    5. 

  5. 

  6. Allow registering custom protocols to handle service worker main script fetching with PlzServiceWorker.
    7. 

  7. 

  8. Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
    9. 

  9. 

  10. diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
    11. 

  11. index 0d1a5e0874546d1ead5e84a3fa7b4cbac943d1b7..54a9ca8e45b2f935463f41b68617c959b88f1247 100644
    12. 

  12. --- a/content/browser/service_worker/service_worker_context_wrapper.cc
    13. 

  13. +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
    14. 

  14. @@ -1852,6 +1852,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
    15. 

  15.        loader_factory_bundle_info =
    16. 

  16.            context()->loader_factory_bundle_for_update_check()->Clone();
    17. 

  17.  
    18. 

  18. +  // Give the embedder a chance to register custom schemes that can
    19. 

  19. +  // handle loading the service worker main script.
    20. 

  20. +  // Previous registration triggered by
    21. 

  21. +  // ServiceWorkerContextWrapper::CreateNonNetworkPendingURLLoaderFactoryBundleForUpdateCheck
    22. 

  22. +  // happens early on browser startup before the JS in the main process
    23. 

  23. +  // is run by the embedder.
    24. 

  24. +  auto& pending_scheme_specific_factories =
    25. 

  25. +      static_cast<blink::PendingURLLoaderFactoryBundle*>(
    26. 

  26. +      loader_factory_bundle_info.get())
    27. 

  27. +      ->pending_scheme_specific_factories();
    28. 

  28. +  ContentBrowserClient::NonNetworkURLLoaderFactoryMap non_network_factories;
    29. 

  29. +  GetContentClient()
    30. 

  30. +      ->browser()
    31. 

  31. +      ->RegisterNonNetworkServiceWorkerUpdateURLLoaderFactories(
    32. 

  32. +          storage_partition_->browser_context(), &non_network_factories);
    33. 

  33. +  for (auto& [scheme, factory_remote] : non_network_factories) {
    34. 

  34. +    pending_scheme_specific_factories.emplace(
    35. 

  35. +        scheme, std::move(factory_remote));
    36. 

  36. +  }
    37. 

  37. +
    38. 

  38.    if (auto* config = content::WebUIConfigMap::GetInstance().GetConfig(
    39. 

  39.            browser_context(), scope)) {
    40. 

  40.      // If this is a Service Worker for a WebUI, the WebUI's URLDataSource
    41. 

  41. @@ -1871,9 +1891,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
    42. 

  42.              features::kEnableServiceWorkersForChromeScheme) &&
    43. 

  43.          scope.scheme_piece() == kChromeUIScheme) {
    44. 

  44.        config->RegisterURLDataSource(browser_context());
    45. 

  45. -      static_cast<blink::PendingURLLoaderFactoryBundle*>(
    46. 

  46. -          loader_factory_bundle_info.get())
    47. 

  47. -          ->pending_scheme_specific_factories()
    48. 

  48. +      pending_scheme_specific_factories
    49. 

  49.            .emplace(kChromeUIScheme, CreateWebUIServiceWorkerLoaderFactory(
    50. 

  50.                                          browser_context(), kChromeUIScheme,
    51. 

  51.                                          base::flat_set<std::string>()));
    52. 

  52. @@ -1881,9 +1899,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
    53. 

  53.                     features::kEnableServiceWorkersForChromeUntrusted) &&
    54. 

  54.                 scope.scheme_piece() == kChromeUIUntrustedScheme) {
    55. 

  55.        config->RegisterURLDataSource(browser_context());
    56. 

  56. -      static_cast<blink::PendingURLLoaderFactoryBundle*>(
    57. 

  57. -          loader_factory_bundle_info.get())
    58. 

  58. -          ->pending_scheme_specific_factories()
    59. 

  59. +      pending_scheme_specific_factories
    60. 

  60.            .emplace(kChromeUIUntrustedScheme,
    61. 

  61.                     CreateWebUIServiceWorkerLoaderFactory(
    62. 

  62.                         browser_context(), kChromeUIUntrustedScheme,
    63.