Skip to content

Commit e794260

Browse files
nitsakhnitsakh
committed
Update chromium patches
1 parent f14eb32 commit e794260

52 files changed

Lines changed: 268 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎patches/common/chromium/.patches‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ stream_resource_handler.patch
1717
thread_capabilities.patch
1818
web_contents.patch
1919
webview_cross_drag.patch
20-
worker_context_will_destroy.patch
2120
disable_user_gesture_requirement_for_beforeunload_dialogs.patch
2221
gin_enable_disable_v8_platform.patch
2322
blink-worker-enable-csp-in-file-scheme.patch
@@ -72,9 +71,10 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch
7271
ipc_message_start.patch
7372
disable_network_services_by_default.patch
7473
unsandboxed_ppapi_processes_skip_zygote.patch
75-
viz_osr.patch
7674
patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
77-
revert_roll_clang_356356_357569.patch
7875
partially_revert_fb4ab3be3fc0024d00358d5b7816d3215a8ff20c.patch
7976
build_add_electron_tracing_category.patch
8077
add_contentgpuclient_precreatemessageloop_callback.patch
78+
disable_custom_libcxx_on_windows.patch
79+
feat_offscreen_rendering_with_viz_compositor.patch
80+
worker_context_will_destroy.patch

‎patches/common/chromium/allow_webview_file_url.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: allow_webview_file_url.patch
66
Allow webview to load non-web URLs.
77

88
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
9-
index 27f7edf204a0f22917cc7b62a63723e7ff396702..ea25f04910803f34248674c42a43574fa884b8ab 100644
9+
index 5d721cad1ed0d42441edd57c8c17b559abbbf0a7..c100b8b7d645a2683aee410234cc3d05335eb7ea 100644
1010
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
1111
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
12-
@@ -1496,6 +1496,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
12+
@@ -1473,6 +1473,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
1313
!policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
1414
!is_external_protocol;
1515

‎patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
55

66

77
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
8-
index d90b74ba141ee7f9609bea8698ca7b7c2f630d9f..f66233507fb26b4a2626b75b4eb38ff340d2d91c 100644
8+
index eeeaa47777df0cab00e1c14f60a0d1e26432c538..608ba10174a9c313bb17ab6d5f68053ce37a0435 100644
99
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
1010
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
11-
@@ -310,7 +310,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
11+
@@ -307,7 +307,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
1212
// document (which is implemented in WorkerMessagingProxy, and
1313
// m_contentSecurityPolicy should be left as nullptr to inherit the policy).
1414
if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

‎patches/common/chromium/blink_local_frame.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ when there is code doing that.
1414
This patch reverts the change to fix the crash in Electron.
1515

1616
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
17-
index 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63918850bb 100644
17+
index 29a339c3bad6c8e5a8cae29ee421a83f039f9717..f155d964fb665726f8959295b7c8876c559b87f2 100644
1818
--- a/third_party/blink/renderer/core/frame/local_frame.cc
1919
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
20-
@@ -423,10 +423,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
20+
@@ -406,10 +406,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
2121
}
2222
CHECK(!view_ || !view_->IsAttached());
2323

@@ -28,7 +28,7 @@ index 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63
2828
if (!Client())
2929
return;
3030

31-
@@ -444,6 +440,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
31+
@@ -427,6 +423,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
3232
// Notify ScriptController that the frame is closing, since its cleanup ends
3333
// up calling back to LocalFrameClient via WindowProxy.
3434
GetScriptController().ClearForClose();

‎patches/common/chromium/blink_world_context.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: blink_world_context.patch
55

66

77
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
8-
index 641a24b04dcf6602f8da660e4d84d591bc38573a..f9f1871d73dce74375084dd1786dee2806f973fb 100644
8+
index fa0c5f7ad8e20b429b697de0f81fe84199c09a87..1bacc981007b4706dc5bd775f96ac4fccb12cdaf 100644
99
--- a/third_party/blink/public/web/web_local_frame.h
1010
+++ b/third_party/blink/public/web/web_local_frame.h
11-
@@ -355,6 +355,9 @@ class WebLocalFrame : public WebFrame {
11+
@@ -351,6 +351,9 @@ class WebLocalFrame : public WebFrame {
1212
// be calling this API.
1313
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
1414

@@ -19,10 +19,10 @@ index 641a24b04dcf6602f8da660e4d84d591bc38573a..f9f1871d73dce74375084dd1786dee28
1919
// that the script evaluated to with callback. Script execution can be
2020
// suspend.
2121
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
22-
index 412e7553b657077c4ed5587dd7763ad4f14dc649..295ccca27242d3583697e4cda3460476ea38b231 100644
22+
index bed103526f62358fa98973ba11bc3e1d9688c159..fcfc4948bc723864ac39cfef34ad28d3a673c0e2 100644
2323
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
2424
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
25-
@@ -868,6 +868,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
25+
@@ -861,6 +861,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
2626
return MainWorldScriptContext()->Global();
2727
}
2828

@@ -37,10 +37,10 @@ index 412e7553b657077c4ed5587dd7763ad4f14dc649..295ccca27242d3583697e4cda3460476
3737
return BindingSecurity::ShouldAllowAccessToFrame(
3838
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
3939
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
40-
index c6d881efbe2ecbb9170521020ac12590df3a74fd..a32f8cd49ab2f8ce9c462af04260453889ebcd92 100644
40+
index 8b5916d086f1de3467a8579aebbb910c6568256f..cdea9b68698713cd635f9b1e0c54e1efca76cd51 100644
4141
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
4242
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
43-
@@ -147,6 +147,8 @@ class CORE_EXPORT WebLocalFrameImpl final
43+
@@ -146,6 +146,8 @@ class CORE_EXPORT WebLocalFrameImpl final
4444
int argc,
4545
v8::Local<v8::Value> argv[]) override;
4646
v8::Local<v8::Context> MainWorldScriptContext() const override;

‎patches/common/chromium/boringssl_build_gn.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
66
Build BoringSSL with some extra functions that nodejs needs.
77

88
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
9-
index 051b3ed07fa7d4ec2e5f9200dab6843176e55d56..edf567e79c88fbe66acf4aabd3952cb8adcab4af 100644
9+
index 250ed854247a6f2f17690ffb95524eb57c72598b..6399d955196fb2d79f18dfcf7cbb2dbd5bd0bcae 100644
1010
--- a/third_party/boringssl/BUILD.gn
1111
+++ b/third_party/boringssl/BUILD.gn
1212
@@ -45,6 +45,19 @@ config("no_asm_config") {

‎patches/common/chromium/build_add_electron_tracing_category.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
88
to introduce a new Electron category.
99

1010
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
11-
index 0a0fb37798bdf596fef33c148ee0d9d358559286..ea0775c7edca664f9e1ba981b4a512f6fa5f3c29 100644
11+
index 97055b4bdaf0dc38b8d248fefddfcf8c68c123b9..6dbe407151dfc5a9168df77f42932e51b802377f 100644
1212
--- a/base/trace_event/builtin_categories.h
1313
+++ b/base/trace_event/builtin_categories.h
1414
@@ -61,6 +61,7 @@

‎patches/common/chromium/build_gn.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: build_gn.patch
55

66

77
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
8-
index 7175865b31ceefb592bfdfb55b00a1aaab14ef15..a96c2429dacac65489da0cd6fa5a642222f4b518 100644
8+
index 7063da0f26c5691f01214c2dc014128d7c8c5e09..b45c5adade6f68d5ba90ddbdf39755b53431b6f6 100644
99
--- a/build/config/BUILDCONFIG.gn
1010
+++ b/build/config/BUILDCONFIG.gn
1111
@@ -123,6 +123,9 @@ if (current_os == "") {
@@ -18,7 +18,7 @@ index 7175865b31ceefb592bfdfb55b00a1aaab14ef15..a96c2429dacac65489da0cd6fa5a6422
1818
# Set to enable the official build level of optimization. This has nothing
1919
# to do with branding, but enables an additional level of optimization above
2020
# release (!is_debug). This might be better expressed as a tri-state
21-
@@ -438,6 +441,7 @@ default_compiler_configs = [
21+
@@ -437,6 +440,7 @@ default_compiler_configs = [
2222
"//build/config/compiler:thin_archive",
2323
"//build/config/coverage:default_coverage",
2424
"//build/config/sanitizers:default_sanitizer_flags",

‎patches/common/chromium/can_create_window.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: can_create_window.patch
55

66

77
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
8-
index 5eb0746e4d69a72b083d1632bb66882888b6b7f1..e99ea17700d6e0c240e07984748983e65fc61425 100644
8+
index ac73b61ebe584abaf18b0de782ad4111996edd71..0d78b60fcc9d6bf312981a5033b8d5ee7671d2ae 100644
99
--- a/content/browser/frame_host/render_frame_host_impl.cc
1010
+++ b/content/browser/frame_host/render_frame_host_impl.cc
11-
@@ -3669,6 +3669,7 @@ void RenderFrameHostImpl::CreateNewWindow(
11+
@@ -3730,6 +3730,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1212
last_committed_origin_, params->window_container_type,
1313
params->target_url, params->referrer.To<Referrer>(),
1414
params->frame_name, params->disposition, *params->features,
@@ -17,10 +17,10 @@ index 5eb0746e4d69a72b083d1632bb66882888b6b7f1..e99ea17700d6e0c240e07984748983e6
1717
&no_javascript_access);
1818

1919
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
20-
index 68cb13c4e2bd144a81546edb99ba993e36cf09ff..67b676e6c58f2e27e47c9064980e2bfca39c7d3b 100644
20+
index ee0ca5d5b76756ab4123652b02298eede20f22e0..51c89138745cf587a483771b4716b5cabef91eb3 100644
2121
--- a/content/common/frame.mojom
2222
+++ b/content/common/frame.mojom
23-
@@ -289,6 +289,10 @@ struct CreateNewWindowParams {
23+
@@ -291,6 +291,10 @@ struct CreateNewWindowParams {
2424

2525
// The window features to use for the new window.
2626
blink.mojom.WindowFeatures features;
@@ -32,7 +32,7 @@ index 68cb13c4e2bd144a81546edb99ba993e36cf09ff..67b676e6c58f2e27e47c9064980e2bfc
3232

3333
// Operation result when the renderer asks the browser to create a new window.
3434
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
35-
index bf0bbe26b5dfd43539b47a9dda8ec079f24adca4..bac5261c293f1c9aeec1ce077d483378538b9046 100644
35+
index 74da3ccb05fb9eababe966b881eca87d5c71a9f6..66280289f51a89dcd17c288569348efa18227e9b 100644
3636
--- a/content/public/browser/content_browser_client.cc
3737
+++ b/content/public/browser/content_browser_client.cc
3838
@@ -518,6 +518,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -45,7 +45,7 @@ index bf0bbe26b5dfd43539b47a9dda8ec079f24adca4..bac5261c293f1c9aeec1ce077d483378
4545
bool opener_suppressed,
4646
bool* no_javascript_access) {
4747
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
48-
index e295f5a9b4c27ddcb5128c041dfbb91378dda791..2539e6fce69fd0eb68f0439ae93393f88c670566 100644
48+
index 3545b144d53e22334b3d844a7904aa6e2e741076..f0e60c3e8c135712db5cb8e918109f249502bee9 100644
4949
--- a/content/public/browser/content_browser_client.h
5050
+++ b/content/public/browser/content_browser_client.h
5151
@@ -175,6 +175,7 @@ class RenderFrameHost;
@@ -66,7 +66,7 @@ index e295f5a9b4c27ddcb5128c041dfbb91378dda791..2539e6fce69fd0eb68f0439ae93393f8
6666
bool opener_suppressed,
6767
bool* no_javascript_access);
6868
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
69-
index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca50fbdf561 100644
69+
index d13a90f530fd47d16be0e6681317d627b8877f19..a6be87cd24168f76ba1658496642ec0ead1d3923 100644
7070
--- a/content/renderer/render_view_impl.cc
7171
+++ b/content/renderer/render_view_impl.cc
7272
@@ -77,6 +77,7 @@
@@ -77,7 +77,7 @@ index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca5
7777
#include "content/renderer/media/audio/audio_device_factory.h"
7878
#include "content/renderer/media/stream/media_stream_device_observer.h"
7979
#include "content/renderer/media/video_capture/video_capture_impl_manager.h"
80-
@@ -1368,6 +1369,8 @@ WebView* RenderViewImpl::CreateView(
80+
@@ -1358,6 +1359,8 @@ WebView* RenderViewImpl::CreateView(
8181
}
8282
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
8383

@@ -87,10 +87,10 @@ index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca5
8787
// moved on send.
8888
bool is_background_tab =
8989
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
90-
index a303b169acb638a0c4bbec1349a028c8d89762bd..c95dcedefc74e5ad9883d16448bb36fcb5a088a6 100644
90+
index 3e3f251af3c531fca379f7fa00f67d671bbe2d5f..e77427146729664247e4dd3313f8533a78059bf7 100644
9191
--- a/content/shell/browser/web_test/web_test_content_browser_client.cc
9292
+++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
93-
@@ -298,6 +298,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
93+
@@ -299,6 +299,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
9494
const std::string& frame_name,
9595
WindowOpenDisposition disposition,
9696
const blink::mojom::WindowFeatures& features,
@@ -100,10 +100,10 @@ index a303b169acb638a0c4bbec1349a028c8d89762bd..c95dcedefc74e5ad9883d16448bb36fc
100100
bool opener_suppressed,
101101
bool* no_javascript_access) {
102102
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
103-
index 6413e5f117d7dfd4a61779d4c971c28a14a86082..a02e232249cf99c55ec5b07a94b29f0a6d4a38bf 100644
103+
index 8b9ae118bca4678c315d820af6b4dbe850943ed4..acde862d6d48429db5936f2e6735017dc2ef647e 100644
104104
--- a/content/shell/browser/web_test/web_test_content_browser_client.h
105105
+++ b/content/shell/browser/web_test/web_test_content_browser_client.h
106-
@@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
106+
@@ -69,6 +69,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
107107
const std::string& frame_name,
108108
WindowOpenDisposition disposition,
109109
const blink::mojom::WindowFeatures& features,

‎patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 456df421598153bde006ad0ecb0f1031360bb543..af06d78b91fa30e5daf993ad2c65c2c5
4040
return service_manager::ProcessType::kDefault;
4141
}
4242
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
43-
index 01f81ee8a103bc893c0739de3463c48839f8d10f..40123b4bf42131a716f9ed7f5dd14b93151fd0b3 100644
43+
index d4f3b8097c6aba8e15616c6d00070565064b1e9c..5672f4f1c328d30bb04dd8aaf4af63c51d52b3e6 100644
4444
--- a/content/public/app/content_main_delegate.h
4545
+++ b/content/public/app/content_main_delegate.h
4646
@@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentMainDelegate {

0 commit comments

Comments
 (0)