mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
1254a684dd
* chore: bump chromium in DEPS to 114.0.5733.2
* chore: bump chromium in DEPS to 114.0.5735.6
* chore: bump chromium in DEPS to 114.0.5735.9
* chore: update patches
* 4450570: Clean up content shell
https://chromium-review.googlesource.com/c/chromium/src/+/4450570
(cherry picked from commit d89b76e6857a332dc779bdb0a04913f3e7541524)
* 4262527: geolocation: Introduce mojom::GeopositionResult
https://chromium-review.googlesource.com/c/chromium/src/+/4262527
(cherry picked from commit 9b350a60c234653109520b407d16d0ad71ea3ed7)
* 4450327: Android/Nav: Stop taking content timeout timer from old host.
https://chromium-review.googlesource.com/c/chromium/src/+/4450327
Also, see:
4451366: Reland "Prerender: Fix prerender new content timeout start timing"
https://chromium-review.googlesource.com/c/chromium/src/+/4451366
(cherry picked from commit 7039603714cbfac7ebb20cb1ab0135c8249a89fd)
* chore: bump CircleCI xcode version
this will hopefully get us the necessary macOS sdk 13.3 on CI.
(cherry picked from commit b3283351cdd0a079d5fe65fe46b642c7def74f38)
* test: fix geolocation test
(cherry picked from commit bddbc573ada91511d07dbc6b4622ac95358f0993)
* fixup patch
* chore: bump chromium in DEPS to 114.0.5735.16
* chore: update patches
* 4336172: Include client-drawn window decorations in aspect ratio. |
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4336172
* build: bump appveyor image to fix windows cache
* spec: fix race condition in alwaysOnTop test
* build: use xcode 14.2 not 14.3
* build: use macOS 12 to run tests
The new macOS 13 VMs appear to have different screen / display behavior
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
50 lines
2.1 KiB
Diff
50 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 a399e1ba0e6728aa8d2869864d3c328ba61e779b..b7dd5e0e48af2a88aad11139f5951d917d8d4f9d 100644
|
|
--- a/content/gpu/gpu_main.cc
|
|
+++ b/content/gpu/gpu_main.cc
|
|
@@ -258,6 +258,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
|
|
@@ -342,7 +346,6 @@ int GpuMain(MainFunctionParams parameters) {
|
|
const_cast<base::CommandLine*>(&command_line), gpu_preferences);
|
|
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 3020e59f491f95740983b01c16e2a5be01d60f67..b25140275ce636717ca60a3cb17eb2f35f50d8be 100644
|
|
--- a/content/public/gpu/content_gpu_client.h
|
|
+++ b/content/public/gpu/content_gpu_client.h
|
|
@@ -30,6 +30,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() {}
|
|
|