2019-04-30 16:45:48 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Milan Burda <milan.burda@gmail.com>
|
|
|
|
Date: Thu, 11 Apr 2019 14:49:20 +0200
|
2019-08-24 01:14:23 +00:00
|
|
|
Subject: add_contentgpuclient_precreatemessageloop_callback.patch
|
2019-04-30 16:45:48 +00:00
|
|
|
|
2019-08-24 01:14:23 +00:00
|
|
|
This adds a ContentGpuClient::PreCreateMessageLoop() callback.
|
2019-04-30 16:45:48 +00:00
|
|
|
Invoke in GpuMain after SetErrorMode, before starting the message loop.
|
|
|
|
Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
|
|
|
|
|
2019-08-24 01:14:23 +00:00
|
|
|
This should be upstreamed.
|
2019-04-30 16:45:48 +00:00
|
|
|
|
|
|
|
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
2020-03-03 21:35:05 +00:00
|
|
|
index 24f9e8efd14ea8e4bb739655c662d01c8c4b80c5..c354891df92db510291ba351ee3bc88b07b4d990 100644
|
2019-04-30 16:45:48 +00:00
|
|
|
--- a/content/gpu/gpu_main.cc
|
|
|
|
+++ b/content/gpu/gpu_main.cc
|
2020-03-03 21:35:05 +00:00
|
|
|
@@ -262,6 +262,10 @@ int GpuMain(const MainFunctionParams& parameters) {
|
2019-04-30 16:45:48 +00:00
|
|
|
|
|
|
|
logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
|
|
|
|
|
|
|
|
+ auto* client = GetContentClient()->gpu();
|
|
|
|
+ if (client)
|
|
|
|
+ client->PreCreateMessageLoop();
|
|
|
|
+
|
|
|
|
// We are experiencing what appear to be memory-stomp issues in the GPU
|
2019-07-03 01:22:09 +00:00
|
|
|
// 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
|
2020-03-03 21:35:05 +00:00
|
|
|
@@ -384,7 +388,6 @@ int GpuMain(const MainFunctionParams& parameters) {
|
2020-01-31 18:36:00 +00:00
|
|
|
}));
|
2019-07-24 22:58:51 +00:00
|
|
|
#endif
|
2019-04-30 16:45:48 +00:00
|
|
|
|
|
|
|
- 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
|
2019-12-11 00:22:35 +00:00
|
|
|
index f68558bd2c4ff725443b0d6893ebe7da07c26a00..3dda58157f32dbc9c7d9001192c30a3a1c152437 100644
|
2019-04-30 16:45:48 +00:00
|
|
|
--- a/content/public/gpu/content_gpu_client.h
|
|
|
|
+++ b/content/public/gpu/content_gpu_client.h
|
2019-08-15 20:50:58 +00:00
|
|
|
@@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient {
|
2019-04-30 16:45:48 +00:00
|
|
|
public:
|
|
|
|
virtual ~ContentGpuClient() {}
|
|
|
|
|
|
|
|
+ // Allows the embedder to perform platform-specific initialization before
|
|
|
|
+ // creating the message loop.
|
|
|
|
+ virtual void PreCreateMessageLoop() {}
|
|
|
|
+
|
2019-12-11 00:22:35 +00:00
|
|
|
// Called during initialization once the GpuService has been initialized.
|
|
|
|
virtual void GpuServiceInitialized() {}
|
|
|
|
|