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>
24 lines
784 B
Diff
24 lines
784 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 18 Oct 2018 17:07:17 -0700
|
|
Subject: gritsettings_resource_ids.patch
|
|
|
|
Add electron resources file to the list of resource ids generation.
|
|
|
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
|
index e929bcf5899140d4ac3b8b75b4cd9a60174431d7..548fe6b12db2f5b4b07a4cab522dea150456c6ed 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1131,6 +1131,11 @@
|
|
"includes": [4960],
|
|
},
|
|
|
|
+ "electron/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ },
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|