mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
ba26a5d4d3
* chore: bump chromium in DEPS to 144.0.7559.59 * chore: update patches * [InputVizard] Fix missing touch cancel in InputTransferHandlerAndroid using InputEventSource Refs https://chromium-review.googlesource.com/c/chromium/src/+/7302368 (cherry picked from commitf31f9e06db) * 7264893: update postMessage tests for file: origin serialization change Cherry-picked from4ef78d3ee7Chromium now serializes file: origins as 'null' in MessageEvent per spec. This is a security improvement aligning with the HTML spec behavior. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7264893 Co-Authored-By: Alice Zhao <66543449+alicelovescake@users.noreply.github.com> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Alice Zhao <66543449+alicelovescake@users.noreply.github.com>
24 lines
790 B
Diff
24 lines
790 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 aaf7050604d4968c8eb1b9a42decdadfec527e20..edf5090f0a30c888efcfe750a66a7f5082a84df4 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1629,6 +1629,11 @@
|
|
"messages": [10120],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|