mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
227cc02aee
* chore: bump chromium in DEPS to 147.0.7702.0 * chore: update patches (trivial only) Co-Authored-By: Claude (claude-3-5-sonnet, Anthropic) * chore: bump chromium in DEPS to 147.0.7703.0 * 7582039: [Extensions] Use dependency injection for ManifestHandlerRegistry Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7582039 Co-Authored-By: Claude (claude-3-5-sonnet, Anthropic) * 7582477: spanification: migrate base::ReadUnicodeCharacter usage to string_view Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7582477 Co-Authored-By: Claude (claude-3-5-sonnet, Anthropic) * chore: update patches (trivial only) Co-Authored-By: Claude (claude-3-5-sonnet, Anthropic) * 7590029: Remove 5 unused deprecated sync methods in ui::Clipboard Migrate clipboard API calls from synchronous methods to async callback-based methods with RunLoop pattern. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7590029 * 7599553: [rust png] Chromium: Update `png` to version `0.18.1`. https://chromium-review.googlesource.com/c/chromium/src/+/7599553 Chromium updated their to Rust PNG implementation which produces different (but valid) PNG output. Update tests to compare raw bitmap data instead of encoded PNG data URLs. * test: fixup clipboard tests to properly handle urls Needed after migrating clipboard API calls from synchronous methods to async callback-based methods with RunLoop pattern. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7590029 * fixup "7599553: [rust png] Chromium: Update `png` to version `0.18.1`." https://chromium-review.googlesource.com/c/chromium/src/+/7599553 Chromium updated their Rust PNG implementation which produces different (but valid) PNG data URLs. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
80 lines
2.9 KiB
Diff
80 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Thu, 20 Sep 2018 17:48:59 -0700
|
|
Subject: resource_file_conflict.patch
|
|
|
|
Resolve conflict between //chrome's .pak files and //electron's. The paths
|
|
that chrome code hardcodes require that we generate resources at these
|
|
paths, but GN throws errors if there are multiple targets that generate the
|
|
same files.
|
|
|
|
This is due to the hardcoded names here:
|
|
https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/ui/base/resource/resource_bundle.cc#780
|
|
and here:
|
|
https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/ui/base/resource/resource_bundle_mac.mm#50
|
|
|
|
This isn't needed on Mac because resource files are copied into the app bundle,
|
|
and are built in `$root_out_dir/electron_repack` (while Chromium's resources
|
|
target `$root_out_dir/repack`), but on Windows and Linux, the resource files go
|
|
directly in `$root_out_dir`, and so they conflict.
|
|
|
|
We don't actually ever generate Chromium's resource paks, but without this
|
|
patch, GN refuses to generate the ninja files:
|
|
|
|
ERROR at //tools/grit/repack.gni:35:3: Duplicate output file.
|
|
action(_repack_target_name) {
|
|
^----------------------------
|
|
Two or more targets generate the same output:
|
|
chrome_100_percent.pak
|
|
|
|
This is can often be fixed by changing one of the target names, or by
|
|
setting an output_name on one of them.
|
|
|
|
Collisions:
|
|
//chrome:packed_resources_100_percent
|
|
//electron:packed_resources_100_percent
|
|
|
|
See //tools/grit/repack.gni:35:3: Collision.
|
|
action(_repack_target_name) {
|
|
^----------------------------
|
|
|
|
Some alternatives to this patch:
|
|
|
|
1. Refactor upstream in such a way that the "chrome" pak names were
|
|
configurable, for instance by adding a method to ResourceBundle::Delegate that
|
|
LoadChromeResources would check.
|
|
2. Pass a Delegate that overrides `GetPathForResourcePack`, check for the
|
|
`chrome_{100,200}_percent.pak` filenames, and rewrite them to
|
|
`electron_{100,200}_percent.pak`.
|
|
3. Initialize the resource bundle with DO_NOT_LOAD_COMMON_RESOURCES and load
|
|
the paks ourselves.
|
|
|
|
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
|
|
|
|
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
|
index c8c10cdab040d39f69fa56aad12fc8b1c67854f3..4b1fd316496e33f9e805aec89a91062587e6ee16 100644
|
|
--- a/chrome/BUILD.gn
|
|
+++ b/chrome/BUILD.gn
|
|
@@ -1548,7 +1548,7 @@ if (is_chrome_branded && !is_android) {
|
|
}
|
|
}
|
|
|
|
-if (!is_android) {
|
|
+if (!is_android && !is_electron_build) {
|
|
chrome_paks("packed_resources") {
|
|
if (is_mac) {
|
|
output_dir = "$root_gen_dir/repack"
|
|
@@ -1594,6 +1594,12 @@ repack("browser_tests_pak") {
|
|
deps = [ "//chrome/test/data/webui:resources" ]
|
|
}
|
|
|
|
+if (is_electron_build) {
|
|
+ group("packed_resources") {
|
|
+ public_deps = [ "//electron:packed_resources" ]
|
|
+ }
|
|
+}
|
|
+
|
|
group("strings") {
|
|
public_deps = [
|
|
"//chrome/app:branded_strings",
|