Skip to content
Permalink
Browse files

chore: bump chromium to f755b70e34659441e72c1a928a406 (master) (#21000)

  • Loading branch information
electron-bot authored and nornagon committed Dec 11, 2019
1 parent a5c9bd5 commit 49b47ee4edb6e90545ca56ed2d3c051437df9521
Showing with 1,118 additions and 1,787 deletions.
  1. +1 −3 BUILD.gn
  2. +1 −1 DEPS
  3. +2 −2 appveyor.yml
  4. +7 −0 build/args/all.gn
  5. +0 −2 build/args/testing.gn
  6. +1 −25 patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch
  7. +0 −1 patches/breakpad/.patches
  8. +0 −30 patches/breakpad/build_win_iwyu_for_breakpad.patch
  9. +0 −10 patches/chromium/.patches
  10. +7 −7 patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
  11. +7 −7 patches/chromium/add_realloc.patch
  12. +22 −22 patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch
  13. +2 −2 patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
  14. +0 −46 patches/chromium/backport_fix_msstl_compat_in_ui_events.patch
  15. +1 −1 patches/chromium/blink-worker-enable-csp-in-file-scheme.patch
  16. +3 −3 patches/chromium/blink_file_path.patch
  17. +2 −2 patches/chromium/blink_initialization_order.patch
  18. +3 −3 patches/chromium/blink_local_frame.patch
  19. +6 −6 patches/chromium/blink_world_context.patch
  20. +1 −1 patches/chromium/build_add_electron_tracing_category.patch
  21. +0 −31 patches/chromium/build_win_disable_zc_twophase.patch
  22. +0 −31 patches/chromium/build_win_fix_msstl_compatibility_for_pdf.patch
  23. +0 −19 patches/chromium/build_win_iwyu_for_smil_time.patch
  24. +16 −16 patches/chromium/can_create_window.patch
  25. +3 −3 patches/chromium/command-ismediakey.patch
  26. +2 −2 patches/chromium/content_browser_main_loop.patch
  27. +3 −3 patches/chromium/dcheck.patch
  28. +3 −3 patches/chromium/desktop_media_list.patch
  29. +3 −3 patches/chromium/disable-redraw-lock.patch
  30. +24 −24 patches/chromium/disable_color_correct_rendering.patch
  31. +2 −2 patches/chromium/disable_compositor_recycling.patch
  32. +0 −20 patches/chromium/disable_custom_libcxx_on_windows.patch
  33. +4 −4 patches/chromium/disable_hidden.patch
  34. +2 −2 patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
  35. +10 −9 patches/chromium/dom_storage_limits.patch
  36. +0 −21 patches/chromium/exclude-a-few-test-files-from-build.patch
  37. +7 −7 patches/chromium/expose_setuseragent_on_networkcontext.patch
  38. +6 −6 patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
  39. +42 −38 patches/chromium/feat_allow_disbaling_blink_scheduler_throttling_per_renderview.patch
  40. +0 −35 patches/chromium/feat_unset_window_aspect_ratio_on_linux.patch
  41. +0 −29 patches/chromium/fix_ambiguous_reference_to_data.patch
  42. +0 −13 patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
  43. +0 −109 patches/chromium/fix_focusowningwebcontents_to_handle_renderwidgethosts_for_oopifs.patch
  44. +0 −76 patches/chromium/fix_missing_algorithm_include.patch
  45. +41 −13 patches/chromium/frame_host_manager.patch
  46. +2 −2 patches/chromium/gin_enable_disable_v8_platform.patch
  47. +3 −3 patches/chromium/gritsettings_resource_ids.patch
  48. +3 −3 patches/chromium/isolate_holder.patch
  49. +1 −1 patches/chromium/libgtkui_export.patch
  50. +1 −1 patches/chromium/mas-cgdisplayusesforcetogray.patch
  51. +20 −20 patches/chromium/mas_no_private_api.patch
  52. +16 −16 patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
  53. +1 −1 patches/chromium/no_cache_storage_check.patch
  54. +14 −14 patches/chromium/notification_provenance.patch
  55. +9 −9 patches/chromium/pepper_plugin_support.patch
  56. +6 −6 patches/chromium/preconnect_feature.patch
  57. +28 −37 patches/chromium/printing.patch
  58. +16 −15 patches/chromium/put_back_deleted_colors_for_autofill.patch
  59. +6 −8 patches/chromium/render_widget_host_view_base.patch
  60. +2 −2 patches/chromium/render_widget_host_view_mac.patch
  61. +3 −3 patches/chromium/resource_file_conflict.patch
  62. +57 −105 patches/chromium/revert_cleanup_remove_menu_subtitles_sublabels.patch
  63. +6 −87 patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
  64. +2 −2 patches/chromium/scroll_bounce_flag.patch
  65. +25 −13 patches/chromium/ssl_security_state_tab_helper.patch
  66. +7 −7 patches/chromium/support_mixed_sandbox_with_zygote.patch
  67. +2 −2 patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
  68. +6 −68 patches/chromium/web_contents.patch
  69. +1 −1 patches/chromium/webview_cross_drag.patch
  70. +10 −10 patches/chromium/worker_context_will_destroy.patch
  71. +0 −6 patches/config.json
  72. +1 −1 patches/node/.patches
  73. +1 −1 patches/node/build_add_gn_build_files.patch
  74. +4 −4 patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
  75. +1 −1 patches/node/call_process_log_from_fallback_stream_on_windows.patch
  76. +0 −44 patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
  77. +1 −1 patches/node/chore_handle_default_configuration_not_being_set_in_the_electron_env.patch
  78. +39 −7 patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch
  79. +2 −2 patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
  80. +3 −3 patches/node/chore_split_createenvironment_into_createenvironment_and.patch
  81. +2 −2 patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch
  82. +6 −6 patches/node/feat_add_uv_loop_watcher_queue_code.patch
  83. +5 −5 patches/node/feat_initialize_asar_support.patch
  84. +1 −1 patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
  85. +2 −2 patches/node/fix_build_and_expose_inspector_agent.patch
  86. +2 −2 patches/node/fix_do_not_define_debugoptions_s_constructors_in_header.patch
  87. +1 −1 patches/node/fix_don_t_create_console_window_when_creating_process.patch
  88. +5 −5 patches/node/fix_export_debugoptions.patch
  89. +2 −2 patches/node/fix_expose_internalcallbackscope.patch
  90. +3 −3 patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
  91. +6 −6 patches/node/fix_key_gen_apis_are_not_available_in_boringssl.patch
  92. +2 −2 patches/node/fix_remove_uses_of_node_use_v8_platform.patch
  93. +1 −1 patches/node/fix_windows_compilation_on_libuv_setsockopt.patch
  94. +2 −2 patches/node/fixme_comment_trace_event_macro.patch
  95. +2 −2 patches/node/fixme_remove_async_id_assertion_check.patch
  96. +2 −2 patches/node/fixme_use_redefined_version_of_internalmodulestat.patch
  97. +7 −4 patches/node/fsevents-regression-in-watching.patch
  98. +7 −4 patches/node/fsevents-stop-using-fsevents-to-watch-files.patch
  99. +2 −2 patches/node/make_module_globalpaths_a_reference.patch
  100. +3 −3 patches/node/pass_all_globals_through_require.patch
  101. +6 −6 patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
  102. +79 −0 patches/node/refactor_transferrablemodule_is_deprecated_use_compiledwasmmodule.patch
  103. +3 −3 patches/node/revert_crypto_add_oaeplabel_option.patch
  104. +2 −2 patches/node/revert_tls_add_option_to_override_signature_algorithms.patch
  105. +1 −1 patches/node/src_disable_node_use_v8_platform_in_node_options.patch
  106. +0 −1 patches/perfetto/.patches
  107. +0 −58 patches/perfetto/build_win_fix_compilation_error_with_msstl.patch
  108. +0 −1 patches/skia/.patches
  109. +0 −39 patches/skia/build_fix_compilation_on_macos_with_10_14_sdk.patch
  110. +3 −3 patches/v8/add_realloc.patch
  111. +4 −4 patches/v8/build_gn.patch
  112. +4 −4 patches/v8/dcheck.patch
  113. +2 −2 patches/v8/do_not_export_private_v8_symbols_on_windows.patch
  114. +3 −3 patches/v8/export_symbols_needed_for_windows_build.patch
  115. +2 −2 patches/v8/expose_mksnapshot.patch
  116. +2 −2 patches/v8/workaround_an_undefined_symbol_error.patch
  117. +1 −1 script/zip_manifests/dist_zip.linux.arm.manifest
  118. +1 −1 script/zip_manifests/dist_zip.linux.arm64.manifest
  119. +1 −1 script/zip_manifests/dist_zip.linux.x64.manifest
  120. +1 −1 script/zip_manifests/dist_zip.linux.x86.manifest
  121. +1 −1 script/zip_manifests/dist_zip.win.arm64.manifest
  122. +1 −1 script/zip_manifests/dist_zip.win.ia32.manifest
  123. +1 −1 script/zip_manifests/dist_zip.win.x64.manifest
  124. +1 −1 shell/app/atom_main_delegate.cc
  125. +2 −3 shell/browser/api/atom_api_app.cc
  126. +2 −2 shell/browser/api/atom_api_app.h
  127. +1 −1 shell/browser/api/atom_api_browser_window.cc
  128. +7 −8 shell/browser/api/atom_api_power_save_blocker.cc
  129. +2 −1 shell/browser/api/atom_api_power_save_blocker.h
  130. +4 −3 shell/browser/api/atom_api_session.cc
  131. +3 −1 shell/browser/api/atom_api_url_loader.cc
  132. +2 −1 shell/browser/api/atom_api_web_contents.cc
  133. +1 −1 shell/browser/api/atom_api_web_contents.h
  134. +5 −0 shell/browser/api/gpu_info_enumerator.cc
  135. +2 −0 shell/browser/api/gpu_info_enumerator.h
  136. +47 −59 shell/browser/atom_browser_client.cc
  137. +17 −17 shell/browser/atom_browser_client.h
  138. +2 −1 shell/browser/atom_browser_context.cc
  139. +5 −8 shell/browser/atom_browser_main_parts.cc
  140. +2 −1 shell/browser/atom_browser_main_parts.h
  141. +0 −8 shell/browser/extensions/atom_extension_host_delegate.cc
  142. +0 −1 shell/browser/extensions/atom_extension_host_delegate.h
  143. +7 −2 shell/browser/extensions/atom_extensions_browser_client.cc
  144. +7 −2 shell/browser/extensions/atom_extensions_browser_client.h
  145. +2 −1 shell/browser/microtasks_runner.cc
  146. +2 −1 shell/browser/microtasks_runner.h
  147. +1 −1 shell/browser/native_window_views.cc
  148. +16 −12 shell/browser/net/asar/asar_url_loader.cc
  149. +2 −1 shell/browser/net/asar/asar_url_loader.h
  150. +54 −26 shell/browser/net/atom_url_loader_factory.cc
  151. +21 −16 shell/browser/net/atom_url_loader_factory.h
  152. +6 −6 shell/browser/net/node_stream_loader.cc
  153. +4 −2 shell/browser/net/node_stream_loader.h
  154. +30 −29 shell/browser/net/proxying_url_loader_factory.cc
  155. +7 −4 shell/browser/net/proxying_url_loader_factory.h
  156. +1 −0 shell/browser/net/resolve_proxy_helper.cc
  157. +4 −4 shell/browser/net/system_network_context_manager.cc
  158. +2 −1 shell/browser/net/url_pipe_loader.cc
  159. +4 −2 shell/browser/net/url_pipe_loader.h
  160. +9 −10 shell/browser/network_hints_handler_impl.cc
  161. +8 −6 shell/browser/network_hints_handler_impl.h
  162. +15 −18 shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
  163. +24 −38 shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h
  164. +1 −2 shell/browser/osr/osr_web_contents_view.cc
  165. +1 −2 shell/browser/osr/osr_web_contents_view.h
  166. +9 −10 shell/browser/ui/devtools_ui.cc
  167. +5 −9 shell/browser/ui/views/menu_bar.cc
  168. +4 −6 shell/browser/ui/views/menu_bar.h
  169. +2 −2 shell/browser/ui/views/submenu_button.cc
  170. +1 −1 shell/browser/ui/views/submenu_button.h
  171. +2 −3 shell/browser/web_view_guest_delegate.cc
  172. +7 −8 shell/renderer/content_settings_observer.cc
  173. +1 −1 shell/renderer/content_settings_observer.h
  174. +6 −7 shell/renderer/renderer_client_base.cc
  175. +2 −8 shell/renderer/renderer_client_base.h
  176. +11 −26 shell/utility/atom_content_utility_client.cc
  177. +4 −2 shell/utility/atom_content_utility_client.h
  178. +3 −1 spec-main/api-browser-window-spec.ts
  179. +9 −3 spec-main/api-debugger-spec.ts
  180. +3 −2 spec-main/api-web-contents-spec.ts
  181. +2 −1 spec/webview-spec.js
@@ -383,12 +383,10 @@ source_set("electron_lib") {
"//media/mojo/mojom",
"//net:extras",
"//net:net_resources",
"//net:net_with_v8",
"//ppapi/host",
"//ppapi/proxy",
"//ppapi/shared_impl",
"//printing/buildflags",
"//services/audio/public/mojom:constants",
"//services/device/public/cpp/geolocation",
"//services/device/public/mojom",
"//services/proxy_resolver:lib",
@@ -400,7 +398,7 @@ source_set("electron_lib") {
"//third_party/electron_node:node_lib",
"//third_party/leveldatabase",
"//third_party/libyuv",
"//third_party/webrtc_overrides:init_webrtc",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/widevine/cdm:headers",
"//ui/base/idle",
"//ui/events:dom_keycode_converter",
2 DEPS
@@ -11,7 +11,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'dc9525d251bf30828899e4cd7161f6dc6507023f',
'30522a00383f755b70e34659441e72c1a928a406',
'node_version':
'v12.13.0',
'nan_version':
@@ -78,7 +78,7 @@ build_script:
"https://github.com/electron/electron"
- ps: >-
if ($env:GN_CONFIG -eq 'release') {
gclient sync --with_branch_heads --with_tags --reset
gclient sync --with_branch_heads --with_tags --ignore_locks --break_repo_locks
} else {
cd src\electron
node script\generate-deps-hash.js
@@ -92,7 +92,7 @@ build_script:
python src/electron/script/update-external-binaries.py
} else {
# file does not exist, gclient sync, then zip
gclient sync --with_branch_heads --with_tags --reset
gclient sync --with_branch_heads --with_tags --ignore_locks --break_repo_locks
if ($env:TARGET_ARCH -ne 'ia32') {
# archive current source for future use
# only run on x64/woa to avoid contention saving
@@ -8,6 +8,12 @@ v8_promise_internal_field_count = 1
v8_typed_array_max_size_in_heap = 0
v8_embedder_string = "-electron.0"

# TODO: this breaks native modules. See e.g. https://www.github.com/nodejs/node/pull/30463
# We can probably enable this as long as we make sure node native modules
# also build with the relevant #defines (V8_COMPRESS_POINTERS etc.)
v8_enable_pointer_compression = false
v8_enable_31bit_smis_on_64bit_arch = false

# TODO: this breaks mksnapshot
v8_enable_snapshot_native_code_counters = false

@@ -17,6 +23,7 @@ ffmpeg_branding = "Chrome"

enable_basic_printing = true
angle_enable_vulkan_validation_layers = false
dawn_enable_vulkan_validation_layers = false

is_cfi = false

@@ -6,8 +6,6 @@ is_official_build = false
dcheck_always_on = true
symbol_level = 1

strip_absolute_paths_from_debug_symbols = false

# This may be guarded behind is_chrome_branded alongside
# proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
# explicitly override here to build OpenH264 encoder/FFmpeg decoder.
@@ -8,32 +8,8 @@ Refs https://github.com/nodejs/node/pull/26960.

Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/38524.

diff --git a/crypto/evp/p_rsa.c b/crypto/evp/p_rsa.c
index 865b36af9b830302fb1068c4965133213c1507dc..71b342f13db5f446aa15f070b6e4aef9b8c25939 100644
--- a/crypto/evp/p_rsa.c
+++ b/crypto/evp/p_rsa.c
@@ -569,6 +569,19 @@ int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *out_padding) {
0, out_padding);
}

+int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md) {
+ return 0;
+}
+
+int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
+ return 0;
+}
+
+int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx,
+ const EVP_MD *md) {
+ return 0;
+}
+
int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA,
(EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY),
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index ad9c05e052756715e3fe67bf9517863ede027d5b..d1729cfc8beefd2cb20abf05043fed43e566a312 100644
index 19baa64ddba84c3dd59e65aef77d1ebbf49e43df..37217c49f7e05eb25562023bf356fdadae1bc66f 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -723,6 +723,18 @@ OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int padding);

This file was deleted.

This file was deleted.

@@ -36,7 +36,6 @@ chrome_key_systems.patch
allow_nested_error_trackers.patch
blink_initialization_order.patch
ssl_security_state_tab_helper.patch
exclude-a-few-test-files-from-build.patch
desktop_media_list.patch
proxy_config_monitor.patch
gritsettings_resource_ids.patch
@@ -56,7 +55,6 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch
unsandboxed_ppapi_processes_skip_zygote.patch
patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
build_add_electron_tracing_category.patch
disable_custom_libcxx_on_windows.patch
worker_context_will_destroy.patch
fix_breakpad_symbol_generation_on_linux_arm.patch
frame_host_manager.patch
@@ -74,17 +72,9 @@ feat_add_set_theme_source_to_allow_apps_to.patch
revert_cleanup_remove_menu_subtitles_sublabels.patch
export_fetchapi_mojo_traits_to_fix_component_build.patch
revert_remove_contentrendererclient_shouldfork.patch
build_win_disable_zc_twophase.patch
ignore_rc_check.patch
build_win_iwyu_for_smil_time.patch
remove_usage_of_incognito_apis_in_the_spellchecker.patch
chore_use_electron_resources_not_chrome_for_spellchecker.patch
feat_unset_window_aspect_ratio_on_linux.patch
fix_ambiguous_reference_to_data.patch
backport_fix_msstl_compat_in_ui_events.patch
build_win_fix_msstl_compatibility_for_pdf.patch
fix_missing_algorithm_include.patch
add_trustedauthclient_to_urlloaderfactory.patch
fix_focusowningwebcontents_to_handle_renderwidgethosts_for_oopifs.patch
feat_allow_disbaling_blink_scheduler_throttling_per_renderview.patch
accessible_pane_view.patch
@@ -10,10 +10,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 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3ad7ba77a 100644
index 35b450a41a9a790aa166316a09f6439be7df08c6..39b1ac57f674777f398e72f565dc0c959f683ec7 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -228,6 +228,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -258,6 +258,10 @@ int GpuMain(const MainFunctionParams& parameters) {

logging::SetLogMessageHandler(GpuProcessLogMessageHandler);

@@ -24,7 +24,7 @@ index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3
// We are experiencing what appear to be memory-stomp issues in the GPU
// 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
@@ -336,7 +340,6 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -366,7 +370,6 @@ int GpuMain(const MainFunctionParams& parameters) {
GpuProcess gpu_process(io_thread_priority);
#endif

@@ -33,7 +33,7 @@ index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3
client->PostIOThreadCreated(gpu_process.io_task_runner());

diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
index 3331f7152da864712e1878b4d2a2f5e2fa34b4ed..38b14405b42813d51406671ce0c4655a85bd88d0 100644
index f68558bd2c4ff725443b0d6893ebe7da07c26a00..3dda58157f32dbc9c7d9001192c30a3a1c152437 100644
--- a/content/public/gpu/content_gpu_client.h
+++ b/content/public/gpu/content_gpu_client.h
@@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient {
@@ -44,6 +44,6 @@ index 3331f7152da864712e1878b4d2a2f5e2fa34b4ed..38b14405b42813d51406671ce0c4655a
+ // creating the message loop.
+ virtual void PreCreateMessageLoop() {}
+
// Initializes the registry. |registry| will be passed to a ConnectionFilter
// (which lives on the IO thread). Unlike other childthreads, the client must
// register additional interfaces on this registry rather than just creating
// Called during initialization once the GpuService has been initialized.
virtual void GpuServiceInitialized() {}

@@ -12,7 +12,7 @@ when we override ReallocateBufferMemory, so we therefore need to implement
Realloc on the v8 side and correspondingly in gin.

diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
index a02797e94f61e8c71428633a4585a625dc5aadbd..305b7d307d233af699e3f495f85de0f8097ff311 100644
index b94a71ef856f92404e16544e22ebbadf57cff363..b15685f6907bcafeb1acd62bfe76f0713dea27f3 100644
--- a/gin/array_buffer.cc
+++ b/gin/array_buffer.cc
@@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
@@ -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 7fb51da7c03f9bd6bfcb8724710edf72dc81c79e..138a6fca7e85db767dea0e06be735fff81fe9c49 100644
index c69cfebccd7d7bff35d2292e61bf6008f0ca7940..2cb5f5d3f89f2af13221e66b2277a28532d53deb 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -647,6 +647,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -654,6 +654,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, ArrayBufferContents::kDontInitialize);
}

@@ -54,7 +54,7 @@ index 7fb51da7c03f9bd6bfcb8724710edf72dc81c79e..138a6fca7e85db767dea0e06be735fff
ArrayBufferContents::FreeMemory(data);
}
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
index ac525b62a1282839bc906b1ee59837211a83476c..5e6c54b87e88ea2741bc7986bf76ddaa48723e56 100644
index 095ca3db051362319611976b9052725ab16c1b3a..13e802a5732f0b04832d6dd8031ae43e1240b79a 100644
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
@@ -126,6 +126,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@@ -70,14 +70,14 @@ index ac525b62a1282839bc906b1ee59837211a83476c..5e6c54b87e88ea2741bc7986bf76ddaa
WTF::Partitions::ArrayBufferPartition()->Free(data);
}
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
index 1adf4924657624059dcbe4e88cef684478787752..3b14d852b0654309cb53f933e396dc1e7b479790 100644
index 2e871b20c1e6fc3703178957fd03923f02ab1b47..8f2fd80130f1e7f957d642af4e5c22f9a5937ce4 100644
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
@@ -149,6 +149,7 @@ class CORE_EXPORT ArrayBufferContents {
@@ -106,6 +106,7 @@ class CORE_EXPORT ArrayBufferContents {
void CopyTo(ArrayBufferContents& other);

static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
+ static void* Realloc(void* data, size_t);
static void FreeMemory(void*);
static DataHandle CreateDataHandle(size_t, InitializationPolicy);

private:
@@ -10,11 +10,11 @@ WebContents, and cancels the authentication if there's no WebContents
available, which there isn't in the case of the 'net' module.

diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 6b14d8354375377526e141ee499a7583be3f22b0..eeb9e19c0ecdf4631e596e7c0927693f2239f293 100644
index 691f9b0f6f658cc259cc9c4e8bb3abb15592e8a3..09ecb3f3406da54440cdd977556f602496ec39a6 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -181,6 +181,25 @@ interface TrustedURLLoaderHeaderClient {
pending_receiver<TrustedHeaderClient> header_client);
@@ -190,6 +190,25 @@ struct HttpAuthStaticNetworkContextParams {
= DefaultCredentials.ALLOW_DEFAULT_CREDENTIALS;
};

+interface TrustedAuthClient {
@@ -39,40 +39,40 @@ index 6b14d8354375377526e141ee499a7583be3f22b0..eeb9e19c0ecdf4631e596e7c0927693f
interface CertVerifierClient {
Verify(
int32 default_error,
@@ -559,6 +578,8 @@ struct URLLoaderFactoryParams {
// impact because of the extra process hops, so use should be minimized.
pending_remote<TrustedURLLoaderHeaderClient>? header_client;
@@ -597,6 +616,8 @@ struct URLLoaderFactoryParams {
// interface. This still respects the per-context block lists.
CorsOriginAccessPatterns? factory_bound_access_patterns;

+ pending_remote<TrustedURLLoaderAuthClient>? auth_client;
+
// If non-empty array is given, |factory_bound_allow_patterns| is used for
// CORS checks in addition to the per-context allow patterns that is managed
// via NetworkContext interface. This still respects the per-context block
// Key used to isolate shared network resources like the cache.
NetworkIsolationKey? network_isolation_key;

diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5bccd754a 100644
index 486c92182695958a0c97d48d55ebd23e0bd5f3de..acd6c63eff1f94cc9fa8490610e571a73764369a 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -335,6 +335,7 @@ URLLoader::URLLoader(
@@ -333,6 +333,7 @@ URLLoader::URLLoader(
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
+ mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
mojom::OriginPolicyManager* origin_policy_manager)
: url_request_context_(url_request_context),
network_service_client_(network_service_client),
@@ -391,6 +392,11 @@ URLLoader::URLLoader(
@@ -390,6 +391,11 @@ URLLoader::URLLoader(
header_client_.set_disconnect_handler(
base::BindOnce(&URLLoader::OnConnectionError, base::Unretained(this)));
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
}
+ if (url_loader_auth_client) {
+ url_loader_auth_client->OnLoaderCreated(request_id_, auth_client_.BindNewPipeAndPassReceiver());
+ auth_client_.set_disconnect_handler(
+ base::BindOnce(&URLLoader::OnConnectionError, base::Unretained(this)));
+ base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
+ }
if (want_raw_headers_) {
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
@@ -818,7 +824,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
@@ -824,7 +830,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,

void URLLoader::OnAuthRequired(net::URLRequest* url_request,
const net::AuthChallengeInfo& auth_info) {
@@ -81,7 +81,7 @@ index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5
OnAuthCredentials(base::nullopt);
return;
}
@@ -834,10 +840,18 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -840,10 +846,18 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
if (url_request->response_headers())
head.headers = url_request->response_headers();
head.auth_challenge_info = auth_info;
@@ -105,7 +105,7 @@ index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5
auth_challenge_responder_receiver_.set_disconnect_handler(
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a755b93cc09 100644
index 564851586d2ad5fe0ae6acd4457257ce8ed665b3..3291fe28deb20b9630589e8ea11ea1366583081c 100644
--- a/services/network/url_loader.h
+++ b/services/network/url_loader.h
@@ -85,6 +85,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -116,7 +116,7 @@ index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a75
mojom::OriginPolicyManager* origin_policy_manager);
~URLLoader() override;

@@ -362,6 +363,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -378,6 +379,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
base::Optional<base::UnguessableToken> fetch_window_id_;

mojo::Remote<mojom::TrustedHeaderClient> header_client_;
@@ -125,7 +125,7 @@ index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a75
std::unique_ptr<FileOpenerForUpload> file_opener_for_upload_;

diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f897ac364f 100644
index 9e9baaf8ecd33e6416027014361edc332ab71e3c..cc2c59828f56988d43b680588d4625d9864aa9b6 100644
--- a/services/network/url_loader_factory.cc
+++ b/services/network/url_loader_factory.cc
@@ -65,6 +65,7 @@ URLLoaderFactory::URLLoaderFactory(
@@ -136,7 +136,7 @@ index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f8
cors_url_loader_factory_(cors_url_loader_factory) {
DCHECK(context);
DCHECK_NE(mojom::kInvalidProcessId, params_->process_id);
@@ -209,6 +210,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
@@ -207,6 +208,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
resource_scheduler_client_, std::move(keepalive_statistics_recorder),
std::move(network_usage_accumulator),
header_client_.is_bound() ? header_client_.get() : nullptr,
@@ -145,10 +145,10 @@ index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f8
cors_url_loader_factory_->OnLoaderCreated(std::move(loader));
}
diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
index 7b143aa49be833ddf05b7b99bea19ee0b674b79c..6d1fbca87e3827c953fdac2cfb96806114d8aea9 100644
index 7d13494649c43be52b06774f2cf5763ebe9129c0..d4b19342c44f86c685f700e4260475ff2235b298 100644
--- a/services/network/url_loader_factory.h
+++ b/services/network/url_loader_factory.h
@@ -71,6 +71,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
@@ -72,6 +72,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
mojom::URLLoaderFactoryParamsPtr params_;
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
mojo::Remote<mojom::TrustedURLLoaderHeaderClient> header_client_;

0 comments on commit 49b47ee

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