Skip to content
Permalink
Browse files

chore: bump chromium to f1d9522c04ca8fa0a906f88ababe9 (master) (#18648)

* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e

* chore: update patches

* chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1

* chore: const interfaces are being removed from //content

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1631749
Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139

* chore: update patches

* chore: blink::MediaStreamType is now consistent and deduplicated

* chore: update patches and printing code for ref -> uniq

* chore: bridge_impl() --> GetInProcessNSWindowBridge

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1642988

* fixme: TotalMarkedObjectSize has been removed

* chore: fix linting

* chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3

* chore: fix slightly broken printing patch

* chore: update patches for SiteInstanceImpl changes

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1612025

* chore: update patches for SiteInstanceImpl changes

* chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7

* chore: update patches

* chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b

* chore: remove system_request_context

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1647172

* chore: creation of FtpProtocolHandler needs an auth cache

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1639683

* fixme: disable marked spec

* chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471

* chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c

* chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228

* update patches

* remove TotalMarkedObjectSize

https://chromium-review.googlesource.com/c/chromium/src/+/1631708

* add libvulkan.so to dist zip manifest on linux

* chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443

* update patches

* add angle features to gpuinfo

https://chromium-review.googlesource.com/c/chromium/src/+/1638658

* mark 'marked' property as deprecated

* disable webview resize test

* FIXME: disable vulkan on 32-bit arm

* chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56

* Revert "FIXME: disable vulkan on 32-bit arm"

This reverts commit 5c1e0ef.

* backport from upstream: fix swiftshader build on arm

https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/

* update patches

* viz: update OutputDeviceWin to new shared memory api

https://chromium-review.googlesource.com/c/chromium/src/+/1649574

* base::Contains{Key,Value} => base::Contains

https://chromium-review.googlesource.com/c/chromium/src/+/1649478

* fixup! viz: update OutputDeviceWin to new shared memory api

* stub out StatusIconLinuxDbus-related delegate methods

https://chromium-review.googlesource.com/c/chromium/src/+/1638180

* chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1

* Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified

https://chromium-review.googlesource.com/c/chromium/src/+/1655087

* fixup! stub out StatusIconLinuxDbus-related delegate methods

* add remote_cocoa to chromium_src deps

https://chromium-review.googlesource.com/c/chromium/src/+/1657068

* fixup! stub out StatusIconLinuxDbus-related delegate methods

* attempt at fix linux-debug build

* add swiftshader/libvulkan.so to arm manifest

* chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22

* update patches

* chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90

* chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb

* chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c

* Update patches

* Remove no longer needed WOA patch

* Put back IOThread in BrowserProcess

We need this until we enable the network service.

* move atom.ico to inputs

* Update to latest LKGR to fix no template named 'bitset' in namespace 'std'

* fixup! Put back IOThread in BrowserProcess

* chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3

* Update patches

content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via https://chromium-review.googlesource.com/c/chromium/src/+/1637040

* Fix renamed enum

* Use newer docker container

Contains updated dependencies

* Try to track down arm test failures

* Fix arm tests

* chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d

* Update patches

* Add needed dependencies for testing 32-bit linux

* Remove arm debugging.

* Remove additional debugging

* Fix compiler errors

* Handle new macOS helper

* Fix compile error on Linux

* chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860

* Add new helper files to manifests

* fix BUILD.gn for macOS

* Fix compile errors

* Add patch to put back colors needed for autofill/datalist

* chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b

* Updated patches

* Remove no longer needed patch

* Remove no longer needed patch

* Fix compile error with patch

* Really fix the patch

* chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4

* chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5

* chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab

* Update patches

* Fix compiler errors

* Fix removed ChromeNetLog

* Revert "Fix removed ChromeNetLog"

This reverts commit 426dfd9.

* Remove ChromeNetLog.

https://chromium-review.googlesource.com/c/chromium/src/+/1663846

* chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29

* Update patches

* Update v8 patches

* Fix lint error

* Fix compile errors

* chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9

* Use custom protocol to test baseURLForDataURL

* Use newer SDK (10.0.18362) for Windows

* Update patches

* Update arm manifest since swiftshader reenabled.

* Don't delete dir that isn't ever there.

* Fix compile errors.

* Need src dir created

* Update for removed InspectorFrontendAPI.addExtensions

* Revert "Use newer SDK (10.0.18362) for Windows"

This reverts commit 68763a0.

* Revert "Need src dir created"

This reverts commit 7daedc2.

* Revert "Don't delete dir that isn't ever there."

This reverts commit bf424bc.

* chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7

* chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b

* chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15

* chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b

* chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57

* Update patches

* Update node to fix build error

* Fix compile errors

* chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9

* chore: update node ref for pushed tags

* chore: update patches for new chromium

* chore: fix printing patches

* Use new (10.0.18362) Windows SDK

* roll node to fix v8 build issues in debug build

* Add support for plugin helper

* fix: add patch to fix gpu info enumeration

Can be removed once CL lands upstream.

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1685993

* spec: navigator.requestMIDIAccess now requires a secure origin

This test requires a secure origin so we fake one.

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1657952

* FIXME: temporarily disable SharedWorker tests

* use released version of node-abstractsocket

* fix abstract-socket
  • Loading branch information...
electron-bot authored and MarshallOfSound committed Jul 3, 2019
1 parent 9bef482 commit 50b9c7051ef482bb53ff5227d4e1a94d62442363
Showing with 1,037 additions and 923 deletions.
  1. +1 −1 .circleci/config.yml
  2. +45 −25 BUILD.gn
  3. +2 −2 DEPS
  4. +3 −0 Dockerfile
  5. +2 −2 appveyor.yml
  6. +4 −0 chromium_src/BUILD.gn
  7. +4 −0 docs/api/breaking-changes.md
  8. +4 −1 lib/browser/chrome-extension.js
  9. +2 −3 patches/chromium/.patches
  10. +3 −3 patches/chromium/accelerator.patch
  11. +6 −6 patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
  12. +3 −3 patches/chromium/add_realloc.patch
  13. +1 −1 patches/chromium/allow_webview_file_url.patch
  14. +1 −1 patches/chromium/blink-worker-enable-csp-in-file-scheme.patch
  15. +3 −3 patches/chromium/blink_local_frame.patch
  16. +6 −6 patches/chromium/blink_world_context.patch
  17. +12 −12 patches/chromium/can_create_window.patch
  18. +1 −1 patches/chromium/chrome_key_systems.patch
  19. +2 −2 patches/chromium/command-ismediakey.patch
  20. +0 −55 patches/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch
  21. +4 −4 patches/chromium/content_browser_main_loop.patch
  22. +4 −4 patches/chromium/cross_site_document_resource_handler.patch
  23. +4 −4 patches/chromium/dcheck.patch
  24. +4 −4 patches/chromium/disable-redraw-lock.patch
  25. +31 −31 patches/chromium/disable_color_correct_rendering.patch
  26. +1 −1 patches/chromium/disable_detach_webview_frame.patch
  27. +3 −3 patches/chromium/disable_hidden.patch
  28. +8 −8 patches/chromium/disable_network_services_by_default.patch
  29. +2 −2 patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
  30. +2 −2 patches/chromium/dom_storage_limits.patch
  31. +2 −2 patches/chromium/exclude-a-few-test-files-from-build.patch
  32. +44 −56 patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch
  33. +1 −1 patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
  34. +18 −0 patches/chromium/fix_re-add_endauxattributes_to_fix_gpu_info_enumeration.patch
  35. +17 −16 patches/chromium/frame_host_manager.patch
  36. +1 −1 patches/chromium/gin_enable_disable_v8_platform.patch
  37. +2 −2 patches/chromium/gritsettings_resource_ids.patch
  38. +1 −1 patches/chromium/mas-audiodeviceduck.patch
  39. +4 −4 patches/chromium/mas-cgdisplayusesforcetogray.patch
  40. +2 −2 patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
  41. +29 −28 patches/chromium/mas_no_private_api.patch
  42. +10 −10 patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
  43. +2 −2 patches/chromium/no_cache_storage_check.patch
  44. +2 −2 patches/chromium/notification_provenance.patch
  45. +2 −2 patches/chromium/out_of_process_instance.patch
  46. +7 −7 patches/chromium/pepper_flash.patch
  47. +57 −58 patches/chromium/printing.patch
  48. +117 −0 patches/chromium/put_back_deleted_colors_for_autofill.patch
  49. +4 −5 patches/chromium/render_widget_host_view_base.patch
  50. +8 −8 patches/chromium/render_widget_host_view_mac.patch
  51. +3 −3 patches/chromium/resource_file_conflict.patch
  52. +0 −22 patches/chromium/revert_build_swiftshader_for_arm32.patch
  53. +2 −2 patches/chromium/scroll_bounce_flag.patch
  54. +9 −23 patches/chromium/ssl_security_state_tab_helper.patch
  55. +5 −5 patches/chromium/support_mixed_sandbox_with_zygote.patch
  56. +1 −1 patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
  57. +4 −4 patches/chromium/web_contents.patch
  58. +0 −30 patches/chromium/woa_compiler_workaround.patch
  59. +9 −9 patches/chromium/worker_context_will_destroy.patch
  60. +2 −0 patches/config.json
  61. 0 patches/swiftshader/.patches
  62. +4 −4 patches/v8/add_realloc.patch
  63. +3 −3 patches/v8/build_gn.patch
  64. +4 −4 patches/v8/dcheck.patch
  65. +17 −17 patches/v8/deps_provide_more_v8_backwards_compatibility.patch
  66. +6 −6 patches/v8/do_not_export_private_v8_symbols_on_windows.patch
  67. +2 −2 patches/v8/export_symbols_needed_for_windows_build.patch
  68. +4 −5 patches/v8/expose_mksnapshot.patch
  69. +5 −5 patches/v8/workaround_an_undefined_symbol_error.patch
  70. +3 −0 script/zip_manifests/dist_zip.linux.arm.manifest
  71. +1 −0 script/zip_manifests/dist_zip.linux.arm64.manifest
  72. +1 −0 script/zip_manifests/dist_zip.linux.x64.manifest
  73. +1 −0 script/zip_manifests/dist_zip.linux.x86.manifest
  74. +12 −0 script/zip_manifests/dist_zip.mac.x64.manifest
  75. +12 −0 script/zip_manifests/dist_zip.mac_mas.x64.manifest
  76. +5 −5 shell/app/atom_content_client.cc
  77. +5 −6 shell/app/atom_content_client.h
  78. +16 −2 shell/app/atom_main_delegate_mac.mm
  79. +1 −1 shell/app/uv_task_runner.cc
  80. +2 −1 shell/browser/api/atom_api_app.cc
  81. +1 −1 shell/browser/api/atom_api_app.h
  82. +2 −2 shell/browser/api/atom_api_global_shortcut.cc
  83. +3 −3 shell/browser/api/atom_api_net_log.cc
  84. +2 −2 shell/browser/api/atom_api_power_monitor.cc
  85. +7 −7 shell/browser/api/atom_api_protocol_ns.cc
  86. +2 −2 shell/browser/api/atom_api_top_level_window.cc
  87. +3 −3 shell/browser/api/atom_api_web_contents.cc
  88. +2 −2 shell/browser/api/atom_api_web_contents.h
  89. +2 −2 shell/browser/api/views/atom_api_box_layout.cc
  90. +21 −9 shell/browser/atom_browser_client.cc
  91. +3 −4 shell/browser/atom_browser_client.h
  92. +2 −20 shell/browser/atom_browser_context.cc
  93. +2 −10 shell/browser/atom_browser_context.h
  94. +2 −3 shell/browser/atom_browser_main_parts.cc
  95. +1 −2 shell/browser/atom_browser_main_parts.h
  96. +4 −4 shell/browser/atom_web_ui_controller_factory.cc
  97. +4 −4 shell/browser/atom_web_ui_controller_factory.h
  98. +3 −37 shell/browser/browser_process_impl.cc
  99. +3 −9 shell/browser/browser_process_impl.h
  100. +2 −2 shell/browser/common_web_contents_delegate.cc
  101. +2 −3 shell/browser/common_web_contents_delegate.h
  102. +53 −6 shell/browser/io_thread.cc
  103. +0 −9 shell/browser/io_thread.h
  104. +2 −2 shell/browser/media/media_capture_devices_dispatcher.cc
  105. +2 −2 shell/browser/media/media_capture_devices_dispatcher.h
  106. +33 −20 shell/browser/media/media_stream_devices_controller.cc
  107. +9 −9 shell/browser/net/atom_network_delegate.cc
  108. +4 −4 shell/browser/net/atom_url_request_job_factory.cc
  109. +4 −13 shell/browser/net/system_network_context_manager.cc
  110. +0 −6 shell/browser/net/system_network_context_manager.h
  111. +19 −6 shell/browser/net/url_request_context_getter.cc
  112. +7 −24 shell/browser/osr/osr_host_display_client.cc
  113. +2 −3 shell/browser/osr/osr_host_display_client.h
  114. +5 −5 shell/browser/printing/print_preview_message_handler.cc
  115. +1 −1 shell/browser/ui/accelerator_util.cc
  116. +1 −1 shell/browser/ui/atom_menu_model.cc
  117. +2 −2 shell/browser/ui/cocoa/atom_ns_window_delegate.mm
  118. +5 −5 shell/browser/ui/devtools_ui.cc
  119. +19 −2 shell/browser/ui/tray_icon_gtk.cc
  120. +11 −2 shell/browser/ui/tray_icon_gtk.h
  121. +2 −2 shell/browser/ui/views/menu_bar.cc
  122. +1 −1 shell/browser/ui/win/taskbar_host.cc
  123. +6 −6 shell/browser/web_contents_permission_helper.cc
  124. +1 −1 shell/browser/web_contents_permission_helper.h
  125. +1 −1 shell/browser/web_view_guest_delegate.cc
  126. +1 −1 shell/browser/web_view_guest_delegate.h
  127. +4 −4 shell/browser/web_view_manager.cc
  128. +2 −2 shell/common/api/atom_api_clipboard.cc
  129. +0 −2 shell/common/api/electron_bindings.cc
  130. +1 −1 shell/common/asar/asar_util.cc
  131. +6 −1 shell/common/mac/main_application_bundle.mm
  132. +45 −45 shell/common/mouse_util.cc
  133. +1 −1 shell/common/native_mate_converters/blink_converter.cc
  134. +14 −2 spec-main/api-browser-window-spec.ts
  135. +14 −1 spec-main/api-session-spec.js
  136. +0 −1 spec/api-process-spec.js
  137. +31 −28 spec/chromium-spec.js
  138. +1 −1 spec/node-spec.js
  139. +3 −1 spec/webview-spec.js
  140. +11 −11 spec/yarn.lock
  141. +1 −0 vsts-arm-test-steps.yml
  142. +1 −0 vsts-arm32v7.yml
  143. +1 −0 vsts-arm64v8.yml
@@ -10,7 +10,7 @@
# Build machines configs.
docker-image: &docker-image
docker:
- image: electronbuilds/electron:0.0.9
- image: electronbuilds/electron:0.0.10

machine-linux-medium: &machine-linux-medium
<<: *docker-image
@@ -1,6 +1,7 @@
import("//build/config/locales.gni")
import("//build/config/ui.gni")
import("//build/config/win/manifest.gni")
import("//content/public/app/mac_helpers.gni")
import("//pdf/features.gni")
import("//printing/buildflags/buildflags.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -474,6 +475,7 @@ static_library("electron_lib") {
if (is_mac) {
deps += [
"//components/remote_cocoa/app_shim",
"//content/common:mac_helpers",
"//ui/accelerated_widget_mac",
]
sources += [
@@ -518,6 +520,7 @@ static_library("electron_lib") {
]
configs += [ ":gio_unix" ]
include_dirs += [ "//third_party/breakpad" ]
configs += [ "//build/config/linux:x11" ]
defines += [
# Disable warnings for g_settings_list_schemas.
"GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -800,37 +803,49 @@ if (is_mac) {
}
}

mac_app_bundle("electron_helper_app") {
output_name = electron_helper_name
deps = [
":electron_framework+link",
]
if (!is_mas_build) {
deps += [ "//sandbox/mac:seatbelt" ]
}
defines = [ "HELPER_EXECUTABLE" ]
sources = filenames.app_sources
sources += [ "shell/common/atom_constants.cc" ]
include_dirs = [ "." ]
info_plist = "shell/renderer/resources/mac/Info.plist"
extra_substitutions =
[ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
ldflags = [
"-rpath",
"@executable_path/../../..",
]
if (is_component_build) {
ldflags += [
template("electron_helper_app") {
mac_app_bundle(target_name) {
assert(defined(invoker.helper_name_suffix))

output_name = electron_helper_name + invoker.helper_name_suffix
deps = [
":electron_framework+link",
]
if (!is_mas_build) {
deps += [ "//sandbox/mac:seatbelt" ]
}
defines = [ "HELPER_EXECUTABLE" ]
sources = filenames.app_sources
sources += [ "shell/common/atom_constants.cc" ]
include_dirs = [ "." ]
info_plist = "shell/renderer/resources/mac/Info.plist"
extra_substitutions =
[ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
ldflags = [
"-rpath",
"@executable_path/../../../../../..",
"@executable_path/../../..",
]
if (is_component_build) {
ldflags += [
"-rpath",
"@executable_path/../../../../../..",
]
}
}
}

foreach(helper_params, content_mac_helpers) {
_helper_target = helper_params[0]
_helper_bundle_id = helper_params[1]
_helper_suffix = helper_params[2]
electron_helper_app("electron_helper_app_${_helper_target}") {
helper_name_suffix = _helper_suffix
}
}

bundle_data("electron_app_framework_bundle_data") {
sources = [
"$root_out_dir/$electron_framework_name.framework",
"$root_out_dir/$electron_helper_name.app",
]
if (!is_mas_build) {
sources += [
@@ -844,8 +859,13 @@ if (is_mac) {
]
public_deps = [
":electron_framework+link",
":electron_helper_app",
]

foreach(helper_params, content_mac_helpers) {
sources +=
[ "$root_out_dir/${electron_helper_name}${helper_params[2]}.app" ]
public_deps += [ ":electron_helper_app_${helper_params[0]}" ]
}
}

mac_app_bundle("electron_login_helper") {
@@ -984,7 +1004,6 @@ if (is_mac) {
if (is_win) {
sources += [
# TODO: we should be generating our .rc files more like how chrome does
"shell/browser/resources/win/atom.ico",
"shell/browser/resources/win/atom.rc",
"shell/browser/resources/win/resource.h",
]
@@ -1012,6 +1031,7 @@ if (is_mac) {
# See https://github.com/nodejs/node-gyp/commit/52ceec3a6d15de3a8f385f43dbe5ecf5456ad07a
ldflags += [ "/DEF:" + rebase_path("build/electron.def", root_build_dir) ]
inputs = [
"shell/browser/resources/win/atom.ico",
"build/electron.def",
]
}
4 DEPS
@@ -10,9 +10,9 @@ gclient_gn_args = [

vars = {
'chromium_version':
'f200986dfaabd6aad6a4b37dad7aae42fec349e9',
'3062b7cf090f1d9522c04ca8fa0a906f88ababe9',
'node_version':
'0a300f60bce0c8f0cb3d846fcb0e1f55f26013ee',
'f4a3ef181f7e52663034aff129d6b91230a318bd',
'nan_version':
'2ee313aaca52e2b478965ac50eb5082520380d1b',

@@ -10,6 +10,7 @@ RUN chmod a+rwx /tmp
# Install Linux packages
ADD build/install-build-deps.sh /setup/install-build-deps.sh
RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
RUN dpkg --add-architecture i386
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \
libnotify-bin \
@@ -22,6 +23,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
sudo \
vim-nox \
wget \
g++-multilib \
libgl1:i386 \
&& /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
&& rm -rf /var/lib/apt/lists/*

@@ -29,7 +29,7 @@

version: 1.0.{build}
build_cloud: libcc-20
image: libcc-20-vs2017-15.9
image: vs2017-15.9-10.0.18362
environment:
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
ELECTRON_OUT_DIR: Default
@@ -52,7 +52,7 @@ build_script:
- echo "Building $env:GN_CONFIG build"
- git config --global core.longpaths true
- cd ..
- ps: if (Test-Path src\electron) { Remove-Item src\electron -Recurse }
- mkdir src
- ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
- ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
- ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
@@ -102,6 +102,10 @@ static_library("chrome") {
"//chrome/browser/ui/cocoa/color_chooser_mac.h",
"//chrome/browser/ui/cocoa/color_chooser_mac.mm",
]
deps += [
"//components/remote_cocoa/app_shim",
"//components/remote_cocoa/browser",
]
}

if (is_win) {
@@ -64,6 +64,10 @@ webFrame.setIsolatedWorldInfo(
})
```

### Removal of deprecated `marked` property on getBlinkMemoryInfo

This property was removed in Chromium 77, and as such is no longer available.

## Planned Breaking API Changes (6.0)

### `win.setMenu(null)`
@@ -382,7 +382,10 @@ const loadDevToolsExtensions = function (win, manifests) {
extensionInfoArray.forEach((extension) => {
win.devToolsWebContents._grantOriginAccess(extension.startPage)
})
win.devToolsWebContents.executeJavaScript(`InspectorFrontendAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)

extensionInfoArray.forEach((extensionInfo) => {
win.devToolsWebContents.executeJavaScript(`Extensions.extensionServer._addExtension(${JSON.stringify(extensionInfo)})`)
})
}

app.on('web-contents-created', function (event, webContents) {
@@ -56,11 +56,9 @@ command-ismediakey.patch
tts.patch
printing.patch
verbose_generate_breakpad_symbols.patch
content_allow_embedder_to_prevent_locking_scheme_registry.patch
support_mixed_sandbox_with_zygote.patch
disable_color_correct_rendering.patch
autofill_size_calculation.patch
revert_build_swiftshader_for_arm32.patch
fix_disable_usage_of_abort_report_np_in_mas_builds.patch
fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
fix_disable_usage_of_setapplicationisdaemon_and.patch
@@ -75,7 +73,8 @@ worker_context_will_destroy.patch
fix_breakpad_symbol_generation_on_linux_arm.patch
frame_host_manager.patch
cross_site_document_resource_handler.patch
woa_compiler_workaround.patch
crashpad_pid_check.patch
chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch
network_service_allow_remote_certificate_verification_logic.patch
put_back_deleted_colors_for_autofill.patch
fix_re-add_endauxattributes_to_fix_gpu_info_enumeration.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
3. Ctrl-Shift-= should show as Ctrl-+

diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index dadc140e9429c166ecd4c653c9ef5d0d4c4db2a4..bc93a9ecb28ff6973fc4d15f67a17d545c169a89 100644
index 841a8ccd1f0ca5073cf0f0621f81561ed6425e0d..ac4c04b74b0a3b8e6d6c375fef021abbd8789a14 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@
@@ -32,7 +32,7 @@ index dadc140e9429c166ecd4c653c9ef5d0d4c4db2a4..bc93a9ecb28ff6973fc4d15f67a17d54
namespace ui {

@@ -150,7 +149,15 @@ base::string16 Accelerator::GetShortcutText() const {
shortcut = KeyCodeToName(key_code_);
shortcut = KeyCodeToName();
#endif

+ unsigned int flags = 0;
@@ -75,7 +75,7 @@ index dadc140e9429c166ecd4c653c9ef5d0d4c4db2a4..bc93a9ecb28ff6973fc4d15f67a17d54
}

// Checking whether the character used for the accelerator is alphanumeric.
@@ -237,7 +237,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
@@ -356,7 +356,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
// more information.
if (IsCtrlDown())
shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);
@@ -9,10 +9,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
This should be upstreamed

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 82f0c4f62be2f210db2c3ed1169c2a816c59cf1f..20dcb7dd1ee1172cfbf263f14724dd4701fa6eae 100644
index ad0d612eb6b87cb320047ebaaff5220f46d8fb8c..9f1fc3a3f1b98d90c5aea07d30616e5180cfa8d5 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -234,6 +234,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {

logging::SetLogMessageHandler(GpuProcessLogMessageHandler);

@@ -21,10 +21,10 @@ index 82f0c4f62be2f210db2c3ed1169c2a816c59cf1f..20dcb7dd1ee1172cfbf263f14724dd47
+ client->PreCreateMessageLoop();
+
// We are experiencing what appear to be memory-stomp issues in the GPU
// process. These issues seem to be impacting the message loop and listeners
// registered to it. Create the message loop on the heap to guard against
@@ -335,7 +339,6 @@ int GpuMain(const MainFunctionParams& parameters) {

// process. These issues seem to be impacting the task executor and listeners
// registered to it. Create the task executor on the heap to guard against
@@ -337,7 +341,6 @@ int GpuMain(const MainFunctionParams& parameters) {
: base::ThreadPriority::NORMAL;
GpuProcess gpu_process(io_thread_priority);

- auto* client = GetContentClient()->gpu();
@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f

GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 1f3f5e263585fbec3844b45116797084483006cb..8e13c4edbf98f380ddacad6447c4e0656fcb0bb2 100644
index 82bfcb5d1d98772fda0e8c5692e8fdc2626fd1c9..ea29d4e0404344be09e9098920d175e7bb80d000 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -553,6 +553,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -582,6 +582,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}

@@ -70,7 +70,7 @@ index 0031242152ce5190b0dfc77b53af2d984e5fad82..a6370ec793ce6c38eb7dab189583ea11
Partitions::ArrayBufferPartition()->Free(data);
}
diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
index 98bda6647e7b1516ab6114ebc63f5c60da3ebbb7..37dacadc262e15714f8e3e090b780c8abf22283e 100644
index 601046eca671613693d3fc083cf48a0d530c8fd3..a94b7ea29bbd6d5e6cc6fb3a850be7e1ef00c5ad 100644
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
@@ -135,6 +135,7 @@ class WTF_EXPORT ArrayBufferContents {
@@ -6,7 +6,7 @@ Subject: allow_webview_file_url.patch
Allow webview to load non-web URLs.

diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 89e10f6eba87d08a9e2c6f921aab7d30ed6c4b2b..4cae5745aca6993c82a4a331107bf4d820a6c0a7 100644
index c4db9c98e4e909cea8ba000402afdb32ff57cb4e..28325e6f6f64922c4ba0daf2c94dcae34d5b4855 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1429,6 +1429,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
@@ -5,7 +5,7 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch


diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
index c51ae1141e62ec69a3d3da8e285d89c3b0e04722..57bfcd4c22347f0f4bb9a59598414d50410666a2 100644
index 873bf34f0f6fff5ee955f84a5019ddf9c6aefc9c..8fca091c4a430f7109aa59400e1ffbea533938d9 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -308,7 +308,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
@@ -14,10 +14,10 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron.

diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index d1922a486fb0143d688a26f954462e3a915af2b5..b1e800f51e44a7a5d3fabd66563d5bdb6a7aa280 100644
index 2bf09644bdd6bf6f8dd49557f9e707f7bf77c2b4..bc36e8bc9fc1a973c89d52e60bd62e753ef17f15 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -393,10 +393,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -331,10 +331,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
}
CHECK(!view_ || !view_->IsAttached());

@@ -28,7 +28,7 @@ index d1922a486fb0143d688a26f954462e3a915af2b5..b1e800f51e44a7a5d3fabd66563d5bdb
if (!Client())
return;

@@ -414,6 +410,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -352,6 +348,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
// Notify ScriptController that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy.
GetScriptController().ClearForClose();
@@ -5,10 +5,10 @@ Subject: blink_world_context.patch


diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 82fb3fdfe6bfa8c8d885ee133270b6f2564325a8..f3bad71eab608d3b9ac0e08446c9e520f47e9b10 100644
index c41afd046ee882cdb4c9f706c4d08cd05bd133ec..a52f1a86e6aeecb0d704b01746de550125e4358f 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -355,6 +355,9 @@ class WebLocalFrame : public WebFrame {
@@ -357,6 +357,9 @@ class WebLocalFrame : public WebFrame {
// be calling this API.
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;

@@ -19,10 +19,10 @@ index 82fb3fdfe6bfa8c8d885ee133270b6f2564325a8..f3bad71eab608d3b9ac0e08446c9e520
// that the script evaluated to with callback. Script execution can be
// suspend.
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index e12642b4703474840a490f426b90c61141f9881e..2610245d88af53e116faa825df264fd9d9babc05 100644
index e9fda5584f7b0ce69c8ca031f34e9b181a704868..a444ec89dbfd6395e2b182a73572555563861e1d 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -873,6 +873,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -867,6 +867,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}

@@ -37,10 +37,10 @@ index e12642b4703474840a490f426b90c61141f9881e..2610245d88af53e116faa825df264fd9
return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index b503bf7cef554dfb35c2123cba51c0fba7402c7e..2d38c4cebcd4040bbd417d4ae9189da954d9cfce 100644
index 15ed90d550941c58ceb375afa9feadc57e4b46c4..8c18516e6957206a4c9ae9365fdf06870c2d3094 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -146,6 +146,8 @@ class CORE_EXPORT WebLocalFrameImpl final
@@ -148,6 +148,8 @@ class CORE_EXPORT WebLocalFrameImpl final
int argc,
v8::Local<v8::Value> argv[]) override;
v8::Local<v8::Context> MainWorldScriptContext() const override;

0 comments on commit 50b9c70

Please sign in to comment.
You can’t perform that action at this time.