mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
219 lines
7.4 KiB
Plaintext
219 lines
7.4 KiB
Plaintext
import("//build/config/locales.gni")
|
|
import("//electron/buildflags/buildflags.gni")
|
|
import("//printing/buildflags/buildflags.gni")
|
|
import("//tools/grit/repack.gni")
|
|
import("//ui/base/ui_features.gni")
|
|
|
|
# See: //chrome/chrome_paks.gni
|
|
template("electron_repack_percent") {
|
|
percent = invoker.percent
|
|
|
|
repack(target_name) {
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"repack_whitelist",
|
|
"visibility",
|
|
])
|
|
|
|
# All sources should also have deps for completeness.
|
|
sources = [
|
|
"$root_gen_dir/components/components_resources_${percent}_percent.pak",
|
|
"$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
|
|
"$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
|
|
"$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
|
|
]
|
|
|
|
deps = [
|
|
"//components/resources",
|
|
"//content/app/resources",
|
|
"//third_party/blink/public:scaled_resources_${percent}_percent",
|
|
"//ui/resources",
|
|
]
|
|
|
|
if (defined(invoker.deps)) {
|
|
deps += invoker.deps
|
|
}
|
|
|
|
if (toolkit_views) {
|
|
sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak" ]
|
|
deps += [ "//ui/views/resources" ]
|
|
}
|
|
|
|
output = "${invoker.output_dir}/chrome_${percent}_percent.pak"
|
|
}
|
|
}
|
|
|
|
template("electron_extra_paks") {
|
|
repack(target_name) {
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"repack_whitelist",
|
|
"visibility",
|
|
])
|
|
output = "${invoker.output_dir}/resources.pak"
|
|
sources = [
|
|
"$root_gen_dir/chrome/dev_ui_browser_resources.pak",
|
|
"$root_gen_dir/components/components_resources.pak",
|
|
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
|
|
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
|
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
|
|
"$root_gen_dir/content/content_resources.pak",
|
|
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
|
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
|
"$root_gen_dir/net/net_resources.pak",
|
|
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
|
"$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
|
|
"$root_gen_dir/ui/resources/webui_resources.pak",
|
|
"$target_gen_dir/electron_resources.pak",
|
|
]
|
|
deps = [
|
|
"//chrome/browser:dev_ui_browser_resources",
|
|
"//components/resources",
|
|
"//content:content_resources",
|
|
"//content:dev_ui_content_resources",
|
|
"//content/browser/resources/media:resources",
|
|
"//content/browser/tracing:resources",
|
|
"//content/browser/webrtc/resources",
|
|
"//electron:resources",
|
|
"//mojo/public/js:resources",
|
|
"//net:net_resources",
|
|
"//third_party/blink/public:devtools_inspector_resources",
|
|
"//third_party/blink/public:resources",
|
|
"//ui/resources",
|
|
]
|
|
if (defined(invoker.deps)) {
|
|
deps += invoker.deps
|
|
}
|
|
if (defined(invoker.additional_paks)) {
|
|
sources += invoker.additional_paks
|
|
}
|
|
|
|
# New paks should be added here by default.
|
|
sources += [
|
|
"$root_gen_dir/content/browser/devtools/devtools_resources.pak",
|
|
"$root_gen_dir/ui/resources/webui_generated_resources.pak",
|
|
]
|
|
deps += [ "//content/browser/devtools:devtools_resources" ]
|
|
if (enable_pdf_viewer) {
|
|
sources += [ "$root_gen_dir/chrome/pdf_resources.pak" ]
|
|
deps += [ "//chrome/browser/resources/pdf:resources" ]
|
|
}
|
|
if (enable_print_preview) {
|
|
sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
|
|
deps += [ "//chrome/browser/resources/print_preview:resources" ]
|
|
}
|
|
if (enable_electron_extensions) {
|
|
sources += [
|
|
"$root_gen_dir/chrome/component_extension_resources.pak",
|
|
"$root_gen_dir/extensions/extensions_renderer_resources.pak",
|
|
"$root_gen_dir/extensions/extensions_resources.pak",
|
|
]
|
|
deps += [
|
|
"//chrome/browser/resources:component_extension_resources",
|
|
"//extensions:extensions_resources",
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
template("electron_paks") {
|
|
electron_repack_percent("${target_name}_100_percent") {
|
|
percent = "100"
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"deps",
|
|
"output_dir",
|
|
"repack_whitelist",
|
|
"visibility",
|
|
])
|
|
}
|
|
|
|
if (enable_hidpi) {
|
|
electron_repack_percent("${target_name}_200_percent") {
|
|
percent = "200"
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"deps",
|
|
"output_dir",
|
|
"repack_whitelist",
|
|
"visibility",
|
|
])
|
|
}
|
|
}
|
|
|
|
electron_extra_paks("${target_name}_extra") {
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"deps",
|
|
"output_dir",
|
|
"repack_whitelist",
|
|
"visibility",
|
|
])
|
|
if (defined(invoker.additional_extra_paks)) {
|
|
additional_paks = invoker.additional_extra_paks
|
|
}
|
|
}
|
|
|
|
repack_locales("${target_name}_locales") {
|
|
forward_variables_from(invoker,
|
|
[
|
|
"copy_data_to_bundle",
|
|
"deps",
|
|
"visibility",
|
|
])
|
|
if (defined(invoker.locale_whitelist)) {
|
|
repack_whitelist = invoker.locale_whitelist
|
|
} else if (defined(invoker.repack_whitelist)) {
|
|
repack_whitelist = invoker.repack_whitelist
|
|
}
|
|
|
|
source_patterns = [
|
|
"${root_gen_dir}/chrome/platform_locale_settings_",
|
|
"${root_gen_dir}/components/strings/components_strings_",
|
|
"${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
|
|
"${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
|
|
"${root_gen_dir}/services/strings/services_strings_",
|
|
"${root_gen_dir}/ui/strings/app_locale_settings_",
|
|
"${root_gen_dir}/ui/strings/ui_strings_",
|
|
]
|
|
deps = [
|
|
"//chrome/app/resources:platform_locale_settings",
|
|
"//components/strings:components_strings",
|
|
"//device/bluetooth/strings",
|
|
"//services/strings",
|
|
"//third_party/blink/public/strings",
|
|
"//ui/strings:app_locale_settings",
|
|
"//ui/strings:ui_strings",
|
|
]
|
|
|
|
input_locales = locales
|
|
output_dir = "${invoker.output_dir}/locales"
|
|
|
|
if (is_mac) {
|
|
output_locales = locales_as_mac_outputs
|
|
} else {
|
|
output_locales = locales
|
|
}
|
|
}
|
|
|
|
group(target_name) {
|
|
forward_variables_from(invoker, [ "deps" ])
|
|
public_deps = [
|
|
":${target_name}_100_percent",
|
|
":${target_name}_extra",
|
|
":${target_name}_locales",
|
|
]
|
|
if (enable_hidpi) {
|
|
public_deps += [ ":${target_name}_200_percent" ]
|
|
}
|
|
if (defined(invoker.public_deps)) {
|
|
public_deps += invoker.public_deps
|
|
}
|
|
}
|
|
}
|