From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Thu, 11 Apr 2019 14:49:20 +0200 Subject: add_contentgpuclient_precreatemessageloop_callback.patch This adds a ContentGpuClient::PreCreateMessageLoop() callback. Invoke in GpuMain after SetErrorMode, before starting the message loop. Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3ad7ba77a 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -228,6 +228,10 @@ int GpuMain(const MainFunctionParams& parameters) { logging::SetLogMessageHandler(GpuProcessLogMessageHandler); + auto* client = GetContentClient()->gpu(); + if (client) + client->PreCreateMessageLoop(); + // We are experiencing what appear to be memory-stomp issues in the GPU // process. These issues seem to be impacting the task executor and listeners // registered to it. Create the task executor on the heap to guard against @@ -336,7 +340,6 @@ int GpuMain(const MainFunctionParams& parameters) { GpuProcess gpu_process(io_thread_priority); #endif - auto* client = GetContentClient()->gpu(); if (client) client->PostIOThreadCreated(gpu_process.io_task_runner()); diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h index 3331f7152da864712e1878b4d2a2f5e2fa34b4ed..38b14405b42813d51406671ce0c4655a85bd88d0 100644 --- a/content/public/gpu/content_gpu_client.h +++ b/content/public/gpu/content_gpu_client.h @@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient { public: virtual ~ContentGpuClient() {} + // Allows the embedder to perform platform-specific initialization before + // creating the message loop. + virtual void PreCreateMessageLoop() {} + // Initializes the registry. |registry| will be passed to a ConnectionFilter // (which lives on the IO thread). Unlike other childthreads, the client must // register additional interfaces on this registry rather than just creating