Skip to content

Commit db21391

Browse files
electron-boterickzhaocodebytere
committed
chore: bump chromium to cbeb16cf544f79c1990f1eae4d4fe (master) (electron#19610)
Co-authored-by: Erick Zhao <erickzhao@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by Micha Hanselmann <DeerMichel@github.com>
1 parent 12df0e8 commit db21391

File tree

71 files changed

+348
-355
lines changed

Some content is hidden

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

71 files changed

+348
-355
lines changed

‎BUILD.gn‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ source_set("manifests") {
304304
if (enable_basic_printing) {
305305
deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
306306
}
307-
308-
if (enable_print_preview) {
309-
deps += [ "//chrome/services/printing/public/cpp:manifest" ]
310-
}
311307
}
312308

313309
npm_action("electron_version_args") {
@@ -354,6 +350,7 @@ source_set("electron_lib") {
354350
"//base:base_static",
355351
"//base/allocator:buildflags",
356352
"//chrome/app/resources:platform_locale_settings",
353+
"//chrome/services/printing/public/mojom",
357354
"//components/certificate_transparency",
358355
"//components/net_log",
359356
"//components/network_session_configurator/common",
@@ -371,7 +368,7 @@ source_set("electron_lib") {
371368
"//device/bluetooth/public/cpp",
372369
"//gin",
373370
"//media/capture/mojom:video_capture",
374-
"//media/mojo/interfaces",
371+
"//media/mojo/mojom",
375372
"//net:extras",
376373
"//net:net_resources",
377374
"//net:net_with_v8",

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gclient_gn_args = [
1010

1111
vars = {
1212
'chromium_version':
13-
'0b543daaf04d9b3f4e4f485738a304e742b2ee7d',
13+
'956a430350ccbeb16cf544f79c1990f1eae4d4fe',
1414
'node_version':
1515
'v12.8.0',
1616
'nan_version':

‎chromium_src/BUILD.gn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ static_library("chrome") {
3737
"//chrome/browser/net/proxy_config_monitor.h",
3838
"//chrome/browser/net/proxy_service_factory.cc",
3939
"//chrome/browser/net/proxy_service_factory.h",
40+
"//chrome/browser/printing/printing_service.cc",
41+
"//chrome/browser/printing/printing_service.h",
4042
"//chrome/browser/ssl/security_state_tab_helper.cc",
4143
"//chrome/browser/ssl/security_state_tab_helper.h",
4244
"//chrome/browser/ui/autofill/popup_view_common.cc",

‎patches/chromium/.patches‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ put_back_deleted_colors_for_autofill.patch
7373
build_win_disable_zc_twophase.patch
7474
disable_color_correct_rendering.patch
7575
add_contentgpuclient_precreatemessageloop_callback.patch
76-
fix_use_weakptr_to_detect_deletion.patch
76+
fix_vc_incompatible_inline_calls.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ index 46d92835eadd6429ea0c6a53c5a39ff04f1c2634..1b99a1e601f4226280cdf1382af555b4
3232
client->PostIOThreadCreated(gpu_process.io_task_runner());
3333

3434
diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
35-
index 20e31e1bd96395cb4350aa6ae84cc16c4ca2116b..d89af81ef9426c197a62027b514011afd10ea3ce 100644
35+
index 830d5e89af7bd3ddb409ac7bf9d8eb3109830d41..7d544536ec846c294deb6626f51d5de7846fc5c2 100644
3636
--- a/content/public/gpu/content_gpu_client.h
3737
+++ b/content/public/gpu/content_gpu_client.h
38-
@@ -35,6 +35,10 @@ class CONTENT_EXPORT ContentGpuClient {
38+
@@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient {
3939
public:
4040
virtual ~ContentGpuClient() {}
4141

‎patches/chromium/add_realloc.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ index e44b0d054d61914b43f4a3c36fa2578f452e1797..8b46714d15db976968ad084e7941ab50
5454
WTF::ArrayBufferContents::FreeMemory(data);
5555
}
5656
diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
57-
index 0031242152ce5190b0dfc77b53af2d984e5fad82..a6370ec793ce6c38eb7dab189583ea11cca51c1f 100644
57+
index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755f652d8e8 100644
5858
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
5959
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
6060
@@ -130,6 +130,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@@ -70,7 +70,7 @@ index 0031242152ce5190b0dfc77b53af2d984e5fad82..a6370ec793ce6c38eb7dab189583ea11
7070
Partitions::ArrayBufferPartition()->Free(data);
7171
}
7272
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
73-
index 601046eca671613693d3fc083cf48a0d530c8fd3..a94b7ea29bbd6d5e6cc6fb3a850be7e1ef00c5ad 100644
73+
index 929468d9d4885953576b777785609e9b54d5ebd0..ee35b4782b9797278209280c2a031e5f3d5ce6c6 100644
7474
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
7575
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
7676
@@ -135,6 +135,7 @@ class WTF_EXPORT ArrayBufferContents {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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 873bf34f0f6fff5ee955f84a5019ddf9c6aefc9c..8fca091c4a430f7109aa59400e1ffbea533938d9 100644
8+
index b1b9f451951bb7b11eefe6453a71a6b44be838a5..0f62ba09ef99538a5b0b306f601d10c44a7a7abf 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
1111
@@ -308,7 +308,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(

‎patches/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 e207fc64130db0a912bd25466d14f73e79ba09ce..a03ba7fa815ba4e79641e96e9cd820cc58725e61 100644
17+
index f4e7059fa98be4470cf20c26fd7260a442b25585..8eefe09f6ebbc02e3bca3d111c3b47d509a7a2a4 100644
1818
--- a/third_party/blink/renderer/core/frame/local_frame.cc
1919
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
20-
@@ -332,10 +332,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
20+
@@ -334,10 +334,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
2121
}
2222
CHECK(!view_ || !view_->IsAttached());
2323

@@ -28,7 +28,7 @@ index e207fc64130db0a912bd25466d14f73e79ba09ce..a03ba7fa815ba4e79641e96e9cd820cc
2828
if (!Client())
2929
return;
3030

31-
@@ -353,6 +349,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
31+
@@ -355,6 +351,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/chromium/blink_world_context.patch‎

Lines changed: 5 additions & 5 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 f62985f20f9e89ec663141d09ccae7113f11124e..911e5601a3800e94720dcdc8c91cfeb0d7d72443 100644
8+
index a781a44399a31f048419311d2317229c912752c2..131c0dcb125b00215e3ad469c11c4b47d7cb126b 100644
99
--- a/third_party/blink/public/web/web_local_frame.h
1010
+++ b/third_party/blink/public/web/web_local_frame.h
11-
@@ -357,6 +357,9 @@ class WebLocalFrame : public WebFrame {
11+
@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame {
1212
// be calling this API.
1313
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
1414

@@ -19,7 +19,7 @@ index f62985f20f9e89ec663141d09ccae7113f11124e..911e5601a3800e94720dcdc8c91cfeb0
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 48d73a37562595ca7f97d839c25df9c58f8efe32..b724c55007baa3c8e791bc7a4816d20861d26e65 100644
22+
index 050494ce5d2389b81fab27506f8ff2204126eb6b..93632d57953a69be01ae5b6b9777d8a6b417b3f3 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
2525
@@ -866,6 +866,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -37,10 +37,10 @@ index 48d73a37562595ca7f97d839c25df9c58f8efe32..b724c55007baa3c8e791bc7a4816d208
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 bad60721541dc8b8f2552f3ba3ef720949eb2baa..b37439a62fd56baa56ca69394000976a3fbb8674 100644
40+
index 9fbb94efc829928a1b1e284d529dd5562619dc20..0a0904ab66d55753252ccf484c03c07c8dac002b 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-
@@ -149,6 +149,8 @@ class CORE_EXPORT WebLocalFrameImpl final
43+
@@ -150,6 +150,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/chromium/browser_compositor_mac.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ index de89d291e5cbc0981cf06170ed35502a1239136d..656f6c38d55d9f9af569bc772254ca13
2626
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
2727
void OnDidNotProduceFrame(const viz::BeginFrameAck& ack);
2828
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
29-
index 4b3f3c7e97e73ad6d0166ad114f4168d9ed00e11..59e58d693c971742951434f6582140d9179235f2 100644
29+
index 8ddd790decc43af9820c97121a3b359e7cbb49ee..18019d5794f688ca07b35a665cc9800bb1d3047a 100644
3030
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
3131
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
3232
@@ -80,6 +80,12 @@

0 commit comments

Comments
 (0)