Skip to content
Permalink
Browse files

chore: bump chromium to 79eae5b7b2d9dac441ac0182ee160 (master) (#19166)

  • Loading branch information...
electron-bot authored and nornagon committed Jul 24, 2019
1 parent 6d83eaa commit bd526f97a57593387511626c4ede9205e4b9b252
Showing with 507 additions and 461 deletions.
  1. +1 −1 BUILD.gn
  2. +1 −1 DEPS
  3. +4 −0 build/args/all.gn
  4. +1 −1 chromium_src/BUILD.gn
  5. +1 −1 patches/boringssl/expose_ripemd160.patch
  6. +3 −2 patches/chromium/.patches
  7. +4 −4 patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
  8. +2 −2 patches/chromium/add_realloc.patch
  9. +2 −2 patches/chromium/allow_webview_file_url.patch
  10. +2 −2 patches/chromium/blink_initialization_order.patch
  11. +1 −1 patches/chromium/blink_local_frame.patch
  12. +5 −5 patches/chromium/blink_world_context.patch
  13. +1 −1 patches/chromium/build_add_electron_tracing_category.patch
  14. +1 −1 patches/chromium/build_gn.patch
  15. +36 −0 patches/chromium/build_win_disable_zc_twophase.patch
  16. +14 −14 patches/chromium/can_create_window.patch
  17. +2 −2 patches/chromium/content_browser_main_loop.patch
  18. +5 −5 patches/chromium/cross_site_document_resource_handler.patch
  19. +6 −6 patches/chromium/dcheck.patch
  20. +3 −3 patches/chromium/desktop_media_list.patch
  21. +6 −6 patches/chromium/disable-redraw-lock.patch
  22. +33 −34 patches/chromium/disable_color_correct_rendering.patch
  23. +4 −4 patches/chromium/disable_hidden.patch
  24. +1 −1 patches/chromium/disable_network_services_by_default.patch
  25. +2 −2 patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
  26. +1 −1 patches/chromium/dom_storage_limits.patch
  27. +2 −2 patches/chromium/exclude-a-few-test-files-from-build.patch
  28. +20 −12 patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch
  29. +2 −2 patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
  30. +10 −10 patches/chromium/frame_host_manager.patch
  31. +2 −2 patches/chromium/gritsettings_resource_ids.patch
  32. +1 −1 patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
  33. +24 −24 patches/chromium/mas_no_private_api.patch
  34. +9 −9 patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
  35. +1 −1 patches/chromium/no_cache_storage_check.patch
  36. +26 −28 patches/chromium/notification_provenance.patch
  37. +2 −2 patches/chromium/out_of_process_instance.patch
  38. +3 −3 patches/chromium/patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
  39. +18 −18 patches/chromium/pepper_flash.patch
  40. +30 −30 patches/chromium/printing.patch
  41. +4 −4 patches/chromium/put_back_deleted_colors_for_autofill.patch
  42. +2 −2 patches/chromium/render_widget_host_view_base.patch
  43. +6 −6 patches/chromium/render_widget_host_view_mac.patch
  44. +3 −3 patches/chromium/resource_file_conflict.patch
  45. +2 −2 patches/chromium/scroll_bounce_flag.patch
  46. +5 −5 patches/chromium/support_mixed_sandbox_with_zygote.patch
  47. +1 −1 patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
  48. +6 −6 patches/chromium/web_contents.patch
  49. +2 −2 patches/chromium/webview_cross_drag.patch
  50. +7 −7 patches/chromium/worker_context_will_destroy.patch
  51. +0 −2 patches/config.json
  52. 0 patches/swiftshader/.patches
  53. +4 −4 patches/v8/add_realloc.patch
  54. +3 −3 patches/v8/build_gn.patch
  55. +4 −4 patches/v8/dcheck.patch
  56. +24 −24 patches/v8/deps_provide_more_v8_backwards_compatibility.patch
  57. +1 −1 patches/v8/do_not_export_private_v8_symbols_on_windows.patch
  58. +1 −1 patches/v8/export_symbols_needed_for_windows_build.patch
  59. +3 −3 patches/v8/expose_mksnapshot.patch
  60. +2 −2 patches/v8/workaround_an_undefined_symbol_error.patch
  61. +6 −0 script/zip_manifests/dist_zip.mac.x64.manifest
  62. +6 −0 script/zip_manifests/dist_zip.mac_mas.x64.manifest
  63. +0 −4 shell/app/atom_main_delegate.cc
  64. +0 −1 shell/app/atom_main_delegate.h
  65. +3 −0 shell/app/atom_main_delegate_mac.mm
  66. +0 −3 shell/app/manifests.cc
  67. +1 −1 shell/browser/api/atom_api_net_log.cc
  68. +4 −2 shell/browser/api/atom_api_top_level_window.cc
  69. +5 −4 shell/browser/api/atom_api_url_request_ns.cc
  70. +2 −2 shell/browser/api/atom_api_url_request_ns.h
  71. +22 −20 shell/browser/atom_browser_client.cc
  72. +9 −12 shell/browser/atom_browser_client.h
  73. +4 −4 shell/browser/io_thread.cc
  74. +1 −1 shell/browser/native_window.cc
  75. +2 −2 shell/browser/native_window.h
  76. +2 −2 shell/browser/native_window_mac.h
  77. +4 −4 shell/browser/native_window_mac.mm
  78. +6 −6 shell/browser/native_window_views.cc
  79. +2 −2 shell/browser/native_window_views.h
  80. +8 −5 shell/browser/net/asar/asar_url_loader.cc
  81. +9 −7 shell/browser/net/atom_url_loader_factory.cc
  82. +7 −6 shell/browser/net/node_stream_loader.cc
  83. +2 −2 shell/browser/net/node_stream_loader.h
  84. +5 −5 shell/browser/net/url_pipe_loader.cc
  85. +2 −2 shell/browser/net/url_pipe_loader.h
  86. +1 −1 shell/browser/printing/print_preview_message_handler.h
  87. +4 −4 shell/browser/ui/drag_util_views.cc
  88. +1 −0 shell/browser/ui/views/autofill_popup_view.cc
  89. +1 −0 shell/browser/ui/win/notify_icon.cc
  90. +2 −0 shell/common/mac/main_application_bundle.mm
  91. +13 −31 shell/utility/atom_content_utility_client.cc
  92. +1 −0 shell/utility/atom_content_utility_client.h
@@ -298,7 +298,6 @@ source_set("manifests") {
deps = [
"//electron/shell/common/api:mojo",
"//printing/buildflags",
"//services/proxy_resolver/public/cpp:manifest",
"//services/service_manager/public/cpp",
]

@@ -369,6 +368,7 @@ source_set("electron_lib") {
"//content/public/renderer",
"//content/public/utility",
"//device/bluetooth",
"//device/bluetooth/public/cpp",
"//gin",
"//media/capture/mojom:video_capture",
"//media/mojo/interfaces",
2 DEPS
@@ -10,7 +10,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'5a48e127c8cb8ae827f4fead0b527079194b9899',
'b781cb24dc079eae5b7b2d9dac441ac0182ee160',
'node_version':
'v12.6.0',
'nan_version':
@@ -20,3 +20,7 @@ enable_basic_printing = true
angle_enable_vulkan_validation_layers = false

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"
@@ -165,7 +165,7 @@ static_library("chrome") {
"//components/printing/browser",
"//components/printing/renderer",
"//components/services/pdf_compositor/public/cpp:factory",
"//components/services/pdf_compositor/public/interfaces",
"//components/services/pdf_compositor/public/mojom",
]
deps += [
"//components/printing/common",
@@ -80,7 +80,7 @@ index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
}
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
index 1a1ca29732afae317c8e8740c629e8922fc83093..48ebdd1eb93b3febecddbc2545b7aae583f21525 100644
index c7c679760a30329311b4a6c0db475b2375537028..991fa00b8330a663625719436075bcc8ae32e17a 100644
--- a/include/openssl/digest.h
+++ b/include/openssl/digest.h
@@ -88,6 +88,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512(void);
@@ -56,7 +56,6 @@ tts.patch
printing.patch
verbose_generate_breakpad_symbols.patch
support_mixed_sandbox_with_zygote.patch
disable_color_correct_rendering.patch
autofill_size_calculation.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
@@ -65,7 +64,6 @@ disable_network_services_by_default.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
add_contentgpuclient_precreatemessageloop_callback.patch
disable_custom_libcxx_on_windows.patch
feat_offscreen_rendering_with_viz_compositor.patch
worker_context_will_destroy.patch
@@ -76,3 +74,6 @@ 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
build_win_disable_zc_twophase.patch
disable_color_correct_rendering.patch
add_contentgpuclient_precreatemessageloop_callback.patch
@@ -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 877495568fddbc7dae5835ead41faf37be77208a..362c01039826ee5764d170da17cc7111617a8de2 100644
index 69cb584e3b99a6989dbb2906bfa5bdf1c5cd3df5..7d1d9f871f7a0676b040651cf5a7122ee6cf2732 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -235,6 +235,10 @@ int GpuMain(const MainFunctionParams& parameters) {

logging::SetLogMessageHandler(GpuProcessLogMessageHandler);

@@ -23,9 +23,9 @@ index 877495568fddbc7dae5835ead41faf37be77208a..362c01039826ee5764d170da17cc7111
// 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
@@ -339,7 +343,6 @@ int GpuMain(const MainFunctionParams& parameters) {
: base::ThreadPriority::NORMAL;
@@ -348,7 +352,6 @@ int GpuMain(const MainFunctionParams& parameters) {
GpuProcess gpu_process(io_thread_priority);
#endif

- auto* client = GetContentClient()->gpu();
if (client)
@@ -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 d4fcac361f99e52a4a0e9e90abe639816cf51fc1..8d7c531de5e9016da6cd2d823f7d7f3270b9abf6 100644
index fc77a1d2c717cbf6a4066082c4e941d73e707847..cde4f969cb799b9ede05f29148fba32d32309cc2 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -632,6 +632,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -643,6 +643,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}

@@ -6,10 +6,10 @@ 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 c4db9c98e4e909cea8ba000402afdb32ff57cb4e..28325e6f6f64922c4ba0daf2c94dcae34d5b4855 100644
index 76bcf34f58ef62dc42927a94d1e4410c1a0bde2e..008d89fe6b46facb7b3f8ca908c76c36d19c396b 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(
@@ -1426,6 +1426,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
!policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
!is_external_protocol;

@@ -10,10 +10,10 @@ 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 59af62ece264de7f392f8b13ae373700d6aafc56..2d547910eaef8ba2194a012f8a6c9a444b7de741 100644
index 50c06fddeff3647dc99f8ab9f1538723f91ec2a9..fa4b6c3c8081af03055ddeadc53606fcc9030d5c 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
@@ -191,11 +191,10 @@ void LocalWindowProxy::Initialize() {
@@ -203,11 +203,10 @@ void LocalWindowProxy::Initialize() {
GetFrame()->IsMainFrame());
MainThreadDebugger::Instance()->ContextCreated(script_state_, GetFrame(),
origin);
@@ -14,7 +14,7 @@ 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 b4e75c8bc63c30c4d0dde96912aee87260662103..3a61f37a05fb5e626a0898b53600b79ab3c20f88 100644
index 164617045cd6a6474ea6ecad0fea268645959e37..548a2ae1305d9b409ad76cb1869eeeee109150d9 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -332,10 +332,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -5,7 +5,7 @@ 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 c41afd046ee882cdb4c9f706c4d08cd05bd133ec..a52f1a86e6aeecb0d704b01746de550125e4358f 100644
index c3c23c35aab3f9bead8b13b8b540412e6f124c1b..3924632936bd972f1a904163a29a634ea1dfda72 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -357,6 +357,9 @@ class WebLocalFrame : public WebFrame {
@@ -19,10 +19,10 @@ index c41afd046ee882cdb4c9f706c4d08cd05bd133ec..a52f1a86e6aeecb0d704b01746de5501
// 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 e55ac9152cfdd35e0d5e0cc99ec8d8abe5bac5f1..cb1881473d452e3454977d9277551ad693f3a90c 100644
index a0e9ad3581fbd7ed748bc551931c89f13015d9ce..1683e16cb4f507fd75d4525a516568e69efac861 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
@@ -867,6 +867,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -868,6 +868,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}

@@ -37,10 +37,10 @@ index e55ac9152cfdd35e0d5e0cc99ec8d8abe5bac5f1..cb1881473d452e3454977d9277551ad6
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 043afe0005af3e4271f2b0c8e490e4e4141fc1b5..3a937e1a451ddf1e99ef4322ebc21044d48ad537 100644
index 744a3f1befcf47c268db347e8e6dd3b000a10b9a..0e24471373395ad91832a4922d2666cf995340ce 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
@@ -148,6 +148,8 @@ class CORE_EXPORT WebLocalFrameImpl final
@@ -149,6 +149,8 @@ class CORE_EXPORT WebLocalFrameImpl final
int argc,
v8::Local<v8::Value> argv[]) override;
v8::Local<v8::Context> MainWorldScriptContext() const override;
@@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category.

diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 2225bfcbb9a2bf8ee0082304adf6528522964e65..151f7fe91fc53b3069ce892607e4e6f9c91b40f7 100644
index 7c0723ffd4934300fed249e2d3c98532e9382885..b0e5e3f30c2235e4bbe0bd3dc324e99d7f505e79 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -61,6 +61,7 @@
@@ -5,7 +5,7 @@ Subject: build_gn.patch


diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 7063da0f26c5691f01214c2dc014128d7c8c5e09..b45c5adade6f68d5ba90ddbdf39755b53431b6f6 100644
index db7ab0255b482d4e1fd20a31cfec86a24546602a..bb3f8efa2340d6c19a1bc51a5d12c5cd9449664a 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
@@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Tue, 16 Jul 2019 14:38:52 -0700
Subject: build: Temporarily disable /Zc:twoPhase when libcxx is not used on
windows.

This is to workaround the bug in crbug.com/969698#c10
until fixes have landed in upstream.

diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
index a6c0aeaf98f7a860c131dc52161f52f308432a91..7b490d07d0f8383db5cea2703d7451db0108d252 100644
--- a/build/config/win/BUILD.gn
+++ b/build/config/win/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

+import("//build/config/c++/c++.gni")
import("//build/config/chrome_build.gni")
import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
@@ -67,9 +68,13 @@ config("compiler") {
"/FS", # Preserve previous PDB behavior.
"/bigobj", # Some of our files are bigger than the regular limits.
"/utf-8", # Assume UTF-8 by default to avoid code page dependencies.
- "/Zc:twoPhase",
]

+ if (use_custom_libcxx) {
+ # Work around crbug.com/969698#c6, bug in MSSTL <xxatomic>.
+ cflags += [ "/Zc:twoPhase" ]
+ }
+
# Force C/C++ mode for the given GN detected file type. This is necessary
# for precompiled headers where the same source file is compiled in both
# modes.
@@ -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 ee3bf9edbd615fb238d541f1baab5bcda1897d56..045b136fd6659f746affcd3ace85092111fec602 100644
index 0774bc243cf83cbec60b0d1c0a93d56538676354..44a85b814e305e158d58e615901a7d188b813d43 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3814,6 +3814,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3834,6 +3834,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 ee3bf9edbd615fb238d541f1baab5bcda1897d56..045b136fd6659f746affcd3ace850921
&no_javascript_access);

diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index c5078d23ace270e1e7f479a827712f24aaf729a4..4dab0367f1280b2c9374309c3803436df2929ef0 100644
index a2fe2dbd0d1c91a0bf5047b5c93f30758a0db277..d9f44fecaae883d861eea94c6cc16727967f0baa 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -303,6 +303,10 @@ struct CreateNewWindowParams {
@@ -305,6 +305,10 @@ struct CreateNewWindowParams {

// The window features to use for the new window.
blink.mojom.WindowFeatures features;
@@ -32,10 +32,10 @@ index c5078d23ace270e1e7f479a827712f24aaf729a4..4dab0367f1280b2c9374309c3803436d

// 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 d7d2b18dbded3b1041ac8bd93ee5a5161d220aed..b7a903ae979f56e79603af1a6edf395d67e0e982 100644
index 546ad19cd1e76474136492076b1d016d02338c42..06984e1da1512c3d8577716432920a1755524cf8 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -517,6 +517,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -512,6 +512,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -45,18 +45,18 @@ index d7d2b18dbded3b1041ac8bd93ee5a5161d220aed..b7a903ae979f56e79603af1a6edf395d
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 b422bbf7baa6252ce97670c0b8c16e1eb526f627..86755824ccbaef2d5eeea63166d2243228bd5a4a 100644
index cc45848df84b5be9b20d9e60f6f605dbc32f36e7..52cf099889768bbc14acc3f32fcfba5ab7640a1d 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -177,6 +177,7 @@ class RenderFrameHost;
@@ -176,6 +176,7 @@ class RenderFrameHost;
class RenderProcessHost;
class RenderViewHost;
class ResourceContext;
+class ResourceRequestBody;
class SerialDelegate;
class SiteInstance;
class SpeechRecognitionManagerDelegate;
@@ -807,6 +808,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -797,6 +798,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -66,18 +66,18 @@ index b422bbf7baa6252ce97670c0b8c16e1eb526f627..86755824ccbaef2d5eeea63166d22432
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index dae2f5a0dfedc5f7cd81c479cfab383730e61d9c..960fe49cab461b2f34793959bde0bbd829fe56bd 100644
index d0ca81590d2b5688022ca6045869dcae0ecd778e..7752c1e49dbee49c64a552ec249cabdb4d073109 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -76,6 +76,7 @@
@@ -75,6 +75,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/stream/media_stream_device_observer.h"
#include "content/renderer/media/video_capture/video_capture_impl_manager.h"
@@ -1359,6 +1360,8 @@ WebView* RenderViewImpl::CreateView(
@@ -1366,6 +1367,8 @@ WebView* RenderViewImpl::CreateView(
}
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);

@@ -87,7 +87,7 @@ index dae2f5a0dfedc5f7cd81c479cfab383730e61d9c..960fe49cab461b2f34793959bde0bbd8
// 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 c8aa2f99f40d038b73d0c9dbec2d941b1c652a6f..b8c17c44f3884e1f60ffd42dbae433392dde6307 100644
index dacecdd4d0195e999f11fd2e1dfaabe95a639263..c5b88ee2561561c0b8a8032d32255645ce30c450 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
@@ -308,6 +308,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -100,7 +100,7 @@ index c8aa2f99f40d038b73d0c9dbec2d941b1c652a6f..b8c17c44f3884e1f60ffd42dbae43339
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 c07734ff32037fe4de7a5082d3409ee99ae19870..f0b47cc56ba5565d142e5b38efcefe333ce89e2f 100644
index 4f00217da5a4f6f3d7410b82352fcb94e7f4a8fd..33e30d6a816e87dade0a26710a8f71fc6f630f34 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
@@ -69,6 +69,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -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 777e9ccf6da4da4924b2e35bff8e7b84fb18a9aa..f04fd728df749100a4699dd922f7a4b17f1fd98c 100644
index 5b9d42a924bdd121a3eab7145d3f62679e44b09e..78d3ce1ab15ffd1fba2a4a4c1d6447c7627ddb50 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1501,7 +1501,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
@@ -1508,7 +1508,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
NOTREACHED();
#else
base::RunLoop run_loop;

0 comments on commit bd526f9

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