e3e647d21e
* chore: bump chromium in DEPS to 138.0.7166.0 * chore: bump chromium in DEPS to 138.0.7166.2 * 6508373: Add WebContents, Tab getters for future Clank navigation capture rework6508373* 6470924: Introduce auto-populated Search Engine icons.6470924* 6502977: Force same tab navigation while actor coordinator is acting on a tab6502977* chore: bump chromium in DEPS to 138.0.7168.0 * chore: update patches * fix grit patch * chore: bump Chromium to 138.0.7169.2 * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework * 6493688: NavigationThrottleRunner2: void CreateThrottlesForNavigation6493688* 6488755: Reland "WebSQL: Remove WebPreference"6488755* 6428707: FSA: Only normalize the hardcoded rules once during initialization6428707* chore: fixup patch indices * chore: bump chromium in DEPS to 138.0.7170.0 * 6514121: Remove origin calculation debug info and related methods6514121* chore: bump chromium in DEPS to 138.0.7172.0 * chore: bump chromium in DEPS to 138.0.7173.0 * chore: bump chromium in DEPS to 138.0.7175.0 * fixup! 6514121: Remove origin calculation debug info and related methods Refs6514121* 6531585: Don't retry LayerTreeSink creation on the high priority queue Refs6531585* 6512253: Modernize base::apple's base bundle ID Refs6512253* fixup! 6428707: FSA: Only normalize the hardcoded rules once during initialization Refs6428707* fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Refs6508373* chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
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
|
|
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 73be6273b320574c22fd12e07b93dc3cffaa1be9..58a34cc5b583a7111decf14b755afbb82ba94765 100644
|
|
--- a/content/gpu/gpu_main.cc
|
|
+++ b/content/gpu/gpu_main.cc
|
|
@@ -268,6 +268,10 @@ int GpuMain(MainFunctionParams parameters) {
|
|
// to the GpuProcessHost once the GpuServiceImpl has started.
|
|
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
|
|
|
|
+ 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
|
|
@@ -377,7 +381,6 @@ int GpuMain(MainFunctionParams parameters) {
|
|
#endif
|
|
const bool dead_on_arrival = !init_success;
|
|
|
|
- auto* client = GetContentClient()->gpu();
|
|
if (client) {
|
|
client->PostSandboxInitialized();
|
|
}
|
|
diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
|
|
index c89b010e7ac78e2a7246ee54fe302cd6b9299710..46fd522fb2ac2793a3a073a4f833a4425dcee941 100644
|
|
--- a/content/public/gpu/content_gpu_client.h
|
|
+++ b/content/public/gpu/content_gpu_client.h
|
|
@@ -32,6 +32,10 @@ class CONTENT_EXPORT ContentGpuClient {
|
|
public:
|
|
virtual ~ContentGpuClient() {}
|
|
|
|
+ // Allows the embedder to perform platform-specific initialization before
|
|
+ // creating the message loop.
|
|
+ virtual void PreCreateMessageLoop() {}
|
|
+
|
|
// Called during initialization once the GpuService has been initialized.
|
|
virtual void GpuServiceInitialized() {}
|
|
|