mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388 Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792 * 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593 * 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451 * 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818 * chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286 * 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590 * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388 Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600 * fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826 * 3509531: Make some public Blink media files private Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531 * 3497377: bluetooth: Add BluetoothDevice.forget() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377 * chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804 * 3502592: Delete PPAPI init/shutdown code in //pdf. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592 * chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded() https://chromium-review.googlesource.com/c/chromium/src/+/3457645 * chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672 * 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375 * chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189 * 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815 * chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914 * fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090 chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433 * 3111565: Relocated Page.printToPDF implementation to //components Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565 refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025 build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774 refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commitfe9ccf49ec. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8cXref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h https://chromium-review.googlesource.com/c/chromium/src/+/3511268 use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
221 lines
7.5 KiB
Plaintext
221 lines
7.5 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/ax_strings_",
|
|
"${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:ax_strings",
|
|
"//ui/strings:ui_strings",
|
|
]
|
|
|
|
input_locales = platform_pak_locales
|
|
output_dir = "${invoker.output_dir}/locales"
|
|
|
|
if (is_mac) {
|
|
output_locales = locales_as_apple_outputs
|
|
} else {
|
|
output_locales = platform_pak_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
|
|
}
|
|
}
|
|
}
|