Skip to content
Permalink
Browse files

chore: bump chromium to 63be48daea281d4f8c834c2e707a7 (master) (#19923)

  • Loading branch information...
electron-bot authored and nornagon committed Sep 18, 2019
1 parent 104088b commit eb2d2264d02abd7f34df36809d44752aaf93da93
Showing with 1,736 additions and 1,410 deletions.
  1. +5 −2 DEPS
  2. +3 −0 build/args/all.gn
  3. +0 −6 chromium_src/BUILD.gn
  4. +2 −2 chromium_src/chrome/browser/certificate_manager_model.cc
  5. +4 −5 chromium_src/chrome/browser/process_singleton_posix.cc
  6. +1 −0 components/pepper_flash/BUILD.gn
  7. +2 −2 patches/chromium/.patches
  8. +1 −1 patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
  9. +3 −3 patches/chromium/add_realloc.patch
  10. +2 −2 patches/chromium/blink_initialization_order.patch
  11. +3 −3 patches/chromium/blink_local_frame.patch
  12. +2 −2 patches/chromium/blink_world_context.patch
  13. +2 −2 patches/chromium/build_add_electron_tracing_category.patch
  14. +3 −3 patches/chromium/build_gn.patch
  15. +16 −16 patches/chromium/can_create_window.patch
  16. +2 −2 patches/chromium/content_browser_main_loop.patch
  17. +5 −5 patches/chromium/dcheck.patch
  18. +5 −5 patches/chromium/disable-redraw-lock.patch
  19. +23 −23 patches/chromium/disable_color_correct_rendering.patch
  20. +3 −3 patches/chromium/disable_hidden.patch
  21. +2 −2 patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
  22. +4 −4 patches/chromium/dom_storage_limits.patch
  23. +2 −2 patches/chromium/dump_syms.patch
  24. +0 −22 patches/chromium/enable_widevine.patch
  25. +2 −2 patches/chromium/exclude-a-few-test-files-from-build.patch
  26. +8 −8 patches/chromium/expose_setuseragent_on_networkcontext.patch
  27. +3 −3 patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
  28. +0 −636 patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch
  29. +1 −1 patches/chromium/fix_breakpad_symbol_generation_on_linux_arm.patch
  30. +3 −3 patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
  31. +10 −10 patches/chromium/frame_host_manager.patch
  32. +2 −2 patches/chromium/ignore_rc_check.patch
  33. +1 −1 patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
  34. +16 −16 patches/chromium/mas_no_private_api.patch
  35. +33 −27 patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
  36. +5 −5 patches/chromium/notification_provenance.patch
  37. +2 −2 patches/chromium/out_of_process_instance.patch
  38. +6 −6 patches/chromium/pepper_flash.patch
  39. +13 −26 patches/chromium/picture-in-picture.patch
  40. +5 −5 patches/chromium/preconnect_feature.patch
  41. +36 −36 patches/chromium/printing.patch
  42. +5 −5 patches/chromium/put_back_deleted_colors_for_autofill.patch
  43. +5 −5 patches/chromium/render_widget_host_view_base.patch
  44. +7 −7 patches/chromium/render_widget_host_view_mac.patch
  45. +3 −3 patches/chromium/resource_file_conflict.patch
  46. +531 −0 patches/chromium/revert_cleanup_remove_menu_subtitles_sublabels.patch
  47. +2 −2 patches/chromium/scroll_bounce_flag.patch
  48. +9 −21 patches/chromium/ssl_security_state_tab_helper.patch
  49. +16 −12 patches/chromium/support_mixed_sandbox_with_zygote.patch
  50. +1 −1 patches/chromium/sysroot.patch
  51. +1 −143 patches/chromium/tts.patch
  52. +29 −0 patches/chromium/ui_views_fix_jumbo_build.patch
  53. +1 −1 patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
  54. +5 −5 patches/chromium/verbose_generate_breakpad_symbols.patch
  55. +7 −7 patches/chromium/web_contents.patch
  56. +1 −1 patches/chromium/webview_cross_drag.patch
  57. +10 −10 patches/chromium/worker_context_will_destroy.patch
  58. +2 −0 patches/config.json
  59. +2 −0 patches/perfetto/.patches
  60. +134 −0 patches/perfetto/revert_fix_chrome_roll_update_protoc_host_toolchain_rules.patch
  61. +389 −0 patches/perfetto/revert_make_trace_processor_a_host-only_target.patch
  62. +1 −0 patches/v8/.patches
  63. +4 −4 patches/v8/add_realloc.patch
  64. +4 −4 patches/v8/build_gn.patch
  65. +4 −4 patches/v8/dcheck.patch
  66. +25 −25 patches/v8/deps_provide_more_v8_backwards_compatibility.patch
  67. +4 −4 patches/v8/do_not_export_private_v8_symbols_on_windows.patch
  68. +3 −3 patches/v8/export_symbols_needed_for_windows_build.patch
  69. +2 −2 patches/v8/expose_mksnapshot.patch
  70. +44 −0 patches/v8/revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch
  71. +5 −5 patches/v8/workaround_an_undefined_symbol_error.patch
  72. +1 −1 shell/app/node_main.cc
  73. +2 −2 shell/browser/api/atom_api_browser_window.cc
  74. +1 −1 shell/browser/api/atom_api_browser_window_mac.mm
  75. +4 −2 shell/browser/api/atom_api_content_tracing.cc
  76. +33 −28 shell/browser/api/atom_api_cookies.cc
  77. +6 −5 shell/browser/api/atom_api_data_pipe_holder.cc
  78. +2 −1 shell/browser/api/atom_api_data_pipe_holder.h
  79. +3 −4 shell/browser/api/atom_api_native_theme.cc
  80. +2 −2 shell/browser/api/atom_api_net_log.cc
  81. +9 −6 shell/browser/api/atom_api_session.cc
  82. +1 −1 shell/browser/api/atom_api_top_level_window.h
  83. +15 −10 shell/browser/api/atom_api_url_request_ns.cc
  84. +2 −1 shell/browser/api/gpuinfo_manager.cc
  85. +17 −20 shell/browser/atom_browser_client.cc
  86. +7 −4 shell/browser/atom_browser_client.h
  87. +2 −1 shell/browser/atom_browser_context.cc
  88. +1 −1 shell/browser/atom_browser_main_parts_posix.cc
  89. +2 −2 shell/browser/atom_download_manager_delegate.cc
  90. +2 −2 shell/browser/common_web_contents_delegate.cc
  91. +1 −1 shell/browser/extensions/atom_extension_system.cc
  92. +1 −1 shell/browser/extensions/atom_extensions_browser_client.cc
  93. +10 −6 shell/browser/login_handler.cc
  94. +2 −2 shell/browser/login_handler.h
  95. +2 −3 shell/browser/mac/in_app_purchase.mm
  96. +2 −2 shell/browser/mac/in_app_purchase_observer.mm
  97. +2 −2 shell/browser/mac/in_app_purchase_product.mm
  98. +1 −1 shell/browser/native_window_views.cc
  99. +3 −2 shell/browser/net/asar/asar_url_loader.cc
  100. +3 −3 shell/browser/net/network_context_service.cc
  101. +2 −1 shell/browser/net/network_context_service.h
  102. +1 −0 shell/browser/net/node_stream_loader.h
  103. +28 −21 shell/browser/net/proxying_url_loader_factory.cc
  104. +19 −9 shell/browser/net/proxying_url_loader_factory.h
  105. +5 −3 shell/browser/net/system_network_context_manager.cc
  106. +2 −1 shell/browser/net/system_network_context_manager.h
  107. +3 −3 shell/browser/notifications/win/windows_toast_notification.cc
  108. +8 −17 shell/browser/osr/osr_render_widget_host_view.cc
  109. +1 −6 shell/browser/osr/osr_render_widget_host_view.h
  110. +1 −2 shell/browser/osr/osr_web_contents_view.cc
  111. +1 −2 shell/browser/osr/osr_web_contents_view.h
  112. +3 −3 shell/browser/printing/print_preview_message_handler.cc
  113. +2 −0 shell/browser/session_preferences.cc
  114. +2 −2 shell/browser/ui/cocoa/atom_menu_controller.mm
  115. +1 −1 shell/browser/ui/message_box_win.cc
  116. +1 −1 shell/browser/ui/tray_icon_cocoa.mm
  117. +3 −4 shell/browser/ui/views/menu_delegate.cc
  118. +0 −2 shell/browser/web_view_guest_delegate.cc
  119. +4 −4 shell/common/platform_util_win.cc
  120. +11 −13 shell/common/promise_util.h
  121. +1 −1 shell/renderer/api/atom_api_renderer_ipc.cc
  122. +0 −14 shell/renderer/renderer_client_base.cc
  123. +0 −2 shell/renderer/renderer_client_base.h
  124. +1 −1 spec-main/api-net-spec.ts
7 DEPS
@@ -5,12 +5,13 @@ gclient_gn_args = [
'checkout_android_native_support',
'checkout_libaom',
'checkout_nacl',
'checkout_oculus_sdk'
'checkout_oculus_sdk',
'checkout_openxr'
]

vars = {
'chromium_version':
'62327c655093c821aa0fcfc6db53f5fd943e08c7',
'af5e1805f244bb71328690460ddd3d48ef3b1eca',
'node_version':
'v12.9.1',
'nan_version':
@@ -60,6 +61,8 @@ vars = {
True,
'checkout_oculus_sdk':
False,
'checkout_openxr':
False,
'build_with_chromium':
True,
'checkout_android':
@@ -24,3 +24,6 @@ is_cfi = false
# TODO: Remove this and update CI to contain 10.14 SDK once
# crbug.com/986701 is fixed.
mac_sdk_min = "10.13"

# TODO: disabled due to crashes. re-enable.
enable_osr = false
@@ -135,10 +135,6 @@ static_library("chrome") {
sources += [
"//chrome/browser/speech/tts_controller_delegate_impl.cc",
"//chrome/browser/speech/tts_controller_delegate_impl.h",
"//chrome/browser/speech/tts_message_filter.cc",
"//chrome/browser/speech/tts_message_filter.h",
"//chrome/renderer/tts_dispatcher.cc",
"//chrome/renderer/tts_dispatcher.h",
]
}

@@ -202,8 +198,6 @@ static_library("chrome") {
"//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
"//chrome/browser/ui/views/overlay/close_image_button.cc",
"//chrome/browser/ui/views/overlay/close_image_button.h",
"//chrome/browser/ui/views/overlay/mute_image_button.cc",
"//chrome/browser/ui/views/overlay/mute_image_button.h",
"//chrome/browser/ui/views/overlay/overlay_window_views.cc",
"//chrome/browser/ui/views/overlay/overlay_window_views.h",
"//chrome/browser/ui/views/overlay/playback_image_button.cc",
@@ -73,7 +73,7 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
void CertificateManagerModel::Create(content::BrowserContext* browser_context,
const CreationCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
base::PostTaskWithTraits(
base::PostTask(
FROM_HERE, {BrowserThread::IO},
base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
browser_context->GetResourceContext(), callback));
@@ -146,7 +146,7 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
DCHECK_CURRENTLY_ON(BrowserThread::IO);

bool is_user_db_available = !!cert_db->GetPublicSlot();
base::PostTaskWithTraits(
base::PostTask(
FROM_HERE, {BrowserThread::UI},
base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
is_user_db_available, callback));
@@ -705,7 +705,7 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
if (shutdown(fd_, SHUT_WR) < 0)
PLOG(ERROR) << "shutdown() failed";

base::PostTaskWithTraits(
base::PostTask(
FROM_HERE, {BrowserThread::IO},
base::BindOnce(&ProcessSingleton::LinuxWatcher::RemoveSocketReader,
parent_, this));
@@ -885,10 +885,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {

void ProcessSingleton::StartListeningOnSocket() {
watcher_ = new LinuxWatcher(this);
base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::IO},
base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
sock_));
base::PostTask(FROM_HERE, {BrowserThread::IO},
base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening,
watcher_, sock_));
}

void ProcessSingleton::OnBrowserReady() {
@@ -54,6 +54,7 @@ component("pepper_flash") {
"//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
"//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
]
libs = [ "CoreGraphics.framework" ]
}
if (is_linux) {
deps += [ "//components/services/font/public/cpp" ]
@@ -36,7 +36,6 @@ mas-cgdisplayusesforcetogray.patch
mas-audiodeviceduck.patch
mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
ignore_rc_check.patch
enable_widevine.patch
chrome_key_systems.patch
allow_nested_error_trackers.patch
blink_initialization_order.patch
@@ -62,7 +61,6 @@ 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
feat_offscreen_rendering_with_viz_compositor.patch
worker_context_will_destroy.patch
fix_breakpad_symbol_generation_on_linux_arm.patch
frame_host_manager.patch
@@ -78,3 +76,5 @@ disable_compositor_recycling.patch
allow_new_privileges_in_unsandboxed_child_processes.patch
expose_setuseragent_on_networkcontext.patch
feat_add_set_theme_source_to_allow_apps_to.patch
revert_cleanup_remove_menu_subtitles_sublabels.patch
ui_views_fix_jumbo_build.patch
@@ -10,7 +10,7 @@ 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 46d92835eadd6429ea0c6a53c5a39ff04f1c2634..1b99a1e601f4226280cdf1382af555b4d61b92fa 100644
index 4373f508964cb1e9fd51c952122ac2f41fb35ae9..065a7a57b77f1e3bf5e03fac900f1936d48ad4ff 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -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 7ca876bc7f2afa192167f0689690d73d5a420c60..d58085e0b14241d666f533cb23dd89159c27d8b2 100644
index 3eeafca490b1fbbedc2c16f203a4ac28b23da675..fee684296357c2c3af7395bdd17ac8b8445f55c4 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -642,6 +642,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -647,6 +647,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}

@@ -70,7 +70,7 @@ index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755
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 ee7c89a4950d6b3c97a810c41a62fee7e372018d..c2b60f20a72cca46d05af369f33d9c19395b34ef 100644
index 3f44cd2fdf648057be8defcf041574b4c91e0363..55c0e7c66649ae9d9cbef6179daac7ad771b755c 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
@@ -140,6 +140,7 @@ class WTF_EXPORT ArrayBufferContents {
@@ -10,7 +10,7 @@ to fix electron/electron#13787. The backport landed in Chromium 67 but the
DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely

diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index c0ec993ca6d96c5f95eb7b918ca9c37d9defff43..2522add8f9b1e3ada14fcc5c09d161b0820f4418 100644
index 8331c466ac9ae91d79c32f17b815f048c7e30a8b..e066abfc3341ff620191116d87ff0e135cdf43e7 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -205,11 +205,10 @@ void LocalWindowProxy::Initialize() {
@@ -24,5 +24,5 @@ index c0ec993ca6d96c5f95eb7b918ca9c37d9defff43..2522add8f9b1e3ada14fcc5c09d161b0
- InstallConditionalFeatures();
-
// This needs to go after everything else since it accesses the window object.
// WARNING: May modify the global object!
InitializeV8ExtrasBinding(script_state_);

@@ -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 488d9238eec29fd90540881d895f86d8597300be..b9cbd011d8ab5f86128590b2b98a517a5ad04c4e 100644
index 1dc588e0683232fd40fea4fd4b9d4869ccacfaac..66107801f2a4ceddca509fc3737c750d4a798fbf 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -334,10 +334,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -338,10 +338,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
}
CHECK(!view_ || !view_->IsAttached());

@@ -28,7 +28,7 @@ index 488d9238eec29fd90540881d895f86d8597300be..b9cbd011d8ab5f86128590b2b98a517a
if (!Client())
return;

@@ -355,6 +351,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -359,6 +355,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();
@@ -19,10 +19,10 @@ index a781a44399a31f048419311d2317229c912752c2..131c0dcb125b00215e3ad469c11c4b47
// 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 85481bb0178d707bb52a4766521cdd8f740b0497..e3d4e5284c13383db47153adb5f8e3d9fce64dbf 100644
index 0fccae4bfe95944bd203240524f358d8ea97f654..107593a056ab68b4e4aa1cd172c35334c5e0b0ea 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
@@ -874,6 +874,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -877,6 +877,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}

@@ -8,10 +8,10 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.

diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index b50d4123e44ddee34af0b07bfe5d067c4ccc5809..3e2c639a067fb76848783f35ec112a380da2353e 100644
index 6717a2bd93b7bec89934bb3e70cdfb5461dcc29b..ca2bd030d1f46b1a7294883e30274cd0da2e7f49 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -61,6 +61,7 @@
@@ -62,6 +62,7 @@
X("dwrite") \
X("DXVA Decoding") \
X("EarlyJava") \
@@ -5,7 +5,7 @@ Subject: build_gn.patch


diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 59ab7810e71916e8f0f2d69f06e3c2c3ebc99030..b144e800c94956429ca85fc0aefe6539a6246e4b 100644
index f89e7e831b79f82bd11a5dd8cee6ab49d8de724e..f8a611bf0676ce323cdbb5d639333df9875dd0ca 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
@@ -18,8 +18,8 @@ index 59ab7810e71916e8f0f2d69f06e3c2c3ebc99030..b144e800c94956429ca85fc0aefe6539
# Set to enable the official build level of optimization. This has nothing
# to do with branding, but enables an additional level of optimization above
# release (!is_debug). This might be better expressed as a tri-state
@@ -437,6 +440,7 @@ default_compiler_configs = [
"//build/config/compiler:thin_archive",
@@ -438,6 +441,7 @@ default_compiler_configs = [
"//build/config/compiler:default_init_stack_vars",
"//build/config/coverage:default_coverage",
"//build/config/sanitizers:default_sanitizer_flags",
+ "//electron/build/config:mas_build",
@@ -5,10 +5,10 @@ Subject: can_create_window.patch


diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index c6381fe498311421d2568b6d91b33539eb72cb0b..90b2457b49cb9c68a0dd269e8e8f64a44cae80cf 100644
index bfcb977fbf2400e4ae8c7ea0b69d2b733ed410dc..be064ded7bfa3f96b5230e5bf00f68a0a8f618c2 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3885,6 +3885,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3985,6 +3985,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@@ -17,10 +17,10 @@ index c6381fe498311421d2568b6d91b33539eb72cb0b..90b2457b49cb9c68a0dd269e8e8f64a4
&no_javascript_access);

diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index e227f780d720a80a13699f475757142571094cd1..6984f69e6f9a0d3058b0054df8a3aa9d46f14dbd 100644
index 94b48f4a88df48f51adff20bc7954b0989e5ae05..a8eb7ba81afd2c8fb87544fb70a8ef862811a014 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -299,6 +299,10 @@ struct CreateNewWindowParams {
@@ -307,6 +307,10 @@ struct CreateNewWindowParams {

// The window features to use for the new window.
blink.mojom.WindowFeatures features;
@@ -32,10 +32,10 @@ index e227f780d720a80a13699f475757142571094cd1..6984f69e6f9a0d3058b0054df8a3aa9d

// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 1c904cd011b7a5ca9592a994cf4ba0be025eef55..15081967b0a29316ab82746ca6fe7d188a9efc58 100644
index 6d2b19d1b65496425e0850d8c224b4bf9eefa567..df6f9848ba8ae1e8e7c6e5415b3a4c2efaf6f055 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -484,6 +484,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -493,6 +493,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -45,18 +45,18 @@ index 1c904cd011b7a5ca9592a994cf4ba0be025eef55..15081967b0a29316ab82746ca6fe7d18
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 07dc81e27ae92e4e7a872134dcdc6a3ba2e08ec5..678b25401338a624dc37a11c45331d65082934e9 100644
index a9131e72beefd3fd706640d5eeb82646a7ffe65d..7578110f13b23e9585a181bba3e73a3996f60faf 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -178,6 +178,7 @@ class RenderFrameHost;
@@ -179,6 +179,7 @@ class RenderFrameHost;
class RenderProcessHost;
class RenderViewHost;
class ResourceContext;
+class ResourceRequestBody;
class SerialDelegate;
class SiteInstance;
class SpeechRecognitionManagerDelegate;
@@ -767,6 +768,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -779,6 +780,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -66,18 +66,18 @@ index 07dc81e27ae92e4e7a872134dcdc6a3ba2e08ec5..678b25401338a624dc37a11c45331d65
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index a8a2d29739aabb0bd80cb77e28c46de57afe2b10..e3fa35b439e0f945e9e6a95587561fedd1ef4a2c 100644
index f14d1f7fe20e81b9e488f787db00cd114cce16a7..94bfcf7ae25f6f5c2d1fdf93b96350bd229045e3 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -75,6 +75,7 @@
@@ -73,6 +73,7 @@
#include "content/renderer/ime_event_guard.h"
#include "content/renderer/internal_document_state_data.h"
#include "content/renderer/loader/request_extra_data.h"
+#include "content/renderer/loader/web_url_request_util.h"
#include "content/renderer/media/audio/audio_device_factory.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
#include "content/renderer/media/webrtc/rtc_peer_connection_handler.h"
@@ -1346,6 +1347,8 @@ WebView* RenderViewImpl::CreateView(
@@ -1325,6 +1326,8 @@ WebView* RenderViewImpl::CreateView(
}
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);

@@ -87,10 +87,10 @@ index a8a2d29739aabb0bd80cb77e28c46de57afe2b10..e3fa35b439e0f945e9e6a95587561fed
// moved on send.
bool is_background_tab =
diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
index 1a159e8d2877e5b1c6778b68aec5b36fb88214fd..f9111b3e20fb7607faa4bb605be1ff4c385e40d6 100644
index 5faaea374484d51b1af261ff93fb96aec2eaa4e1..786d3a904a765b5cb53859c35a045b9e04b6250b 100644
--- a/content/shell/browser/web_test/web_test_content_browser_client.cc
+++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
@@ -313,6 +313,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -312,6 +312,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -100,10 +100,10 @@ index 1a159e8d2877e5b1c6778b68aec5b36fb88214fd..f9111b3e20fb7607faa4bb605be1ff4c
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
index 1a714946de9f0dceaec008e93928d2c414ef01da..34423135e85b3ed7a54c9f22f6674f9c4026a67c 100644
index 435f204a364e54b59c0bd651b760bf350ea94d11..1e6bee1fa08fa2d2a396678838d475e0e7e4ce0c 100644
--- a/content/shell/browser/web_test/web_test_content_browser_client.h
+++ b/content/shell/browser/web_test/web_test_content_browser_client.h
@@ -67,6 +67,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents.

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 61324582c2dca5e1e5a75c0793034307b648cc98..c73c1e26c2f01713952840fadbd7e8975bcb9843 100644
index 28521684fd37dca5ea4251c166be33470b5ae0d8..cd5f3ef6b679899cd28068e39715d5c4847595cc 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1496,7 +1496,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
@@ -1505,7 +1505,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
NOTREACHED();
#else
base::RunLoop run_loop;

0 comments on commit eb2d226

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