chore: bump chromium to 62327c655093c821aa0fcfc6db53f5fd943e08c7 (master) (#19792)
* chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch1600387
* update desktop_media_list.patch1729156
* update notification_provenance.patch1742779
* update printing.patch1646772
* update verbose_generate_bpad_syms.patch1745986
* update patch metadata * remove printing_compositor manifests1742734
* update for URLLoaderFactoryType enum1754716
* remove gin string16 converter1750093
* ClearCompositorFrame() has been removed1746301
* message_loop -> message_loop_current1738552
* include resource_response header * pdf compositor no longer uses service manager1742734
* chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore1708767
* fix: make std::hash value-non-const broken by1711202
* update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback1753006
* chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to1678182
and update for1678182
* convert CookieChangeListener to new Mojo types1753371
* rename ui::ClipboardType -> ui::ClipboardBuffer1758730
* logging::LoggingSettings log_file -> log_file_path1699477
* roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch1759149
* update printing patch * update cookie usage and fn signatures1758437
* chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch1762335
* Convert enum to enum class for FocusManager::FocusChangeReason1767281
* roll DEPS to latest lkgr * update dom_storage_limits.patch1767556
This commit is contained in:
parent
c89debd19a
commit
b7d25ccb77
85 changed files with 314 additions and 444 deletions
|
@ -20,7 +20,7 @@
|
|||
#include "services/service_manager/sandbox/switches.h"
|
||||
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
#include "components/services/pdf_compositor/public/cpp/pdf_compositor_service_factory.h"
|
||||
#include "components/services/pdf_compositor/pdf_compositor_impl.h"
|
||||
#include "components/services/pdf_compositor/public/mojom/pdf_compositor.mojom.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
|
@ -36,13 +36,6 @@ namespace electron {
|
|||
|
||||
namespace {
|
||||
|
||||
void RunServiceAsyncThenTerminateProcess(
|
||||
std::unique_ptr<service_manager::Service> service) {
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
std::move(service),
|
||||
base::BindOnce([] { content::UtilityThread::Get()->ReleaseProcess(); }));
|
||||
}
|
||||
|
||||
#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
|
||||
auto RunPrintingService(
|
||||
mojo::PendingReceiver<printing::mojom::PrintingService> receiver) {
|
||||
|
@ -50,6 +43,15 @@ auto RunPrintingService(
|
|||
}
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
auto RunPdfCompositor(
|
||||
mojo::PendingReceiver<printing::mojom::PdfCompositor> receiver) {
|
||||
return std::make_unique<printing::PdfCompositorImpl>(
|
||||
std::move(receiver), true /* initialize_environment */,
|
||||
content::UtilityThread::Get()->GetIOTaskRunner());
|
||||
}
|
||||
#endif
|
||||
|
||||
auto RunProxyResolver(
|
||||
mojo::PendingReceiver<proxy_resolver::mojom::ProxyResolverFactory>
|
||||
receiver) {
|
||||
|
@ -114,22 +116,13 @@ bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
|
|||
return false;
|
||||
}
|
||||
|
||||
bool AtomContentUtilityClient::HandleServiceRequest(
|
||||
const std::string& service_name,
|
||||
service_manager::mojom::ServiceRequest request) {
|
||||
auto service = MaybeCreateMainThreadService(service_name, std::move(request));
|
||||
if (service) {
|
||||
RunServiceAsyncThenTerminateProcess(std::move(service));
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
mojo::ServiceFactory* AtomContentUtilityClient::GetMainThreadServiceFactory() {
|
||||
static base::NoDestructor<mojo::ServiceFactory> factory {
|
||||
#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
|
||||
RunPrintingService
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
RunPdfCompositor,
|
||||
#if defined(OS_WIN)
|
||||
RunPrintingService
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
return factory.get();
|
||||
|
@ -140,17 +133,4 @@ mojo::ServiceFactory* AtomContentUtilityClient::GetIOThreadServiceFactory() {
|
|||
return factory.get();
|
||||
}
|
||||
|
||||
std::unique_ptr<service_manager::Service>
|
||||
AtomContentUtilityClient::MaybeCreateMainThreadService(
|
||||
const std::string& service_name,
|
||||
service_manager::mojom::ServiceRequest request) {
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
if (service_name == printing::mojom::kServiceName) {
|
||||
return printing::CreatePdfCompositorService(std::move(request));
|
||||
}
|
||||
#endif
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
} // namespace electron
|
||||
|
|
|
@ -26,16 +26,10 @@ class AtomContentUtilityClient : public content::ContentUtilityClient {
|
|||
|
||||
void UtilityThreadStarted() override;
|
||||
bool OnMessageReceived(const IPC::Message& message) override;
|
||||
bool HandleServiceRequest(
|
||||
const std::string& service_name,
|
||||
service_manager::mojom::ServiceRequest request) override;
|
||||
mojo::ServiceFactory* GetMainThreadServiceFactory() override;
|
||||
mojo::ServiceFactory* GetIOThreadServiceFactory() override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<service_manager::Service> MaybeCreateMainThreadService(
|
||||
const std::string& service_name,
|
||||
service_manager::mojom::ServiceRequest request);
|
||||
#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
|
||||
std::unique_ptr<printing::PrintingHandler> printing_handler_;
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue