03aad28412* chore: bump chromium in DEPS to 140.0.7324.0 * chore: bump chromium in DEPS to 140.0.7325.0 * chore: remove @dsanders11's unused include patch CL: https://chromium-review.googlesource.com/c/chromium/src/+/6782507 * fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 * chore: update chromium patches * chore: update other patches * chore: bump chromium in DEPS to 140.0.7327.0 * fix: mistake in reapplied patch * fixup! fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 * chore: update patches * fix: remove OnPrivateNetworkAccessPermissionRequired override CL: https://chromium-review.googlesource.com/c/chromium/src/+/6769208 * fix: update colorSpace property to use new unified value CL: https://chromium-review.googlesource.com/c/chromium/src/+/6795085 * fix: include OverlayWindowLiveCaptionButton CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787420 * fixup! fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 * fix: format chromium_src/BUILD.gn CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787427 * fix: format BUILD.gn CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787427 * chore: include script/ in logged path * fix: update filenames.libcxx.gni CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787279 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
49 lines
2.1 KiB
Diff
49 lines
2.1 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 f9e15ddeeb022b77607ae7880a5a7121abc7a111..954a4966c73a74816131217756f17c04483bb1fe 100644
|
|
--- a/content/gpu/gpu_main.cc
|
|
+++ b/content/gpu/gpu_main.cc
|
|
@@ -271,6 +271,10 @@ int GpuMain(MainFunctionParams parameters) {
|
|
// to the GpuProcessHost once the GpuServiceImpl has started.
|
|
viz::GpuLogMessageManager::GetInstance()->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
|
|
@@ -380,7 +384,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 e5389b44df98ab1a5c976524a66a26c763e5c436..4a183b4959fae18e6875440e6570b8ada6823d81 100644
|
|
--- a/content/public/gpu/content_gpu_client.h
|
|
+++ b/content/public/gpu/content_gpu_client.h
|
|
@@ -36,6 +36,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() {}
|
|
|