Skip to content

Commit d362be5

Browse files
electron-botMarshallOfSound
electron-bot
authored and
MarshallOfSound
committed
chore: bump chromium to f156cb7658ec5382f5623a05841c6 (master) (electron#19096)
* chore: bump chromium in DEPS to 37cd06a295cf156cb7658ec5382f5623a05841c6 * update patches * fix: replace NO_TRAFFIC_ANNOTATION_YET with MISSING_TRAFFIC_ANNOTATION Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1653256
1 parent ae01a48 commit d362be5

24 files changed

+59
-76
lines changed

‎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-
'3062b7cf090f1d9522c04ca8fa0a906f88ababe9',
13+
'37cd06a295cf156cb7658ec5382f5623a05841c6',
1414
'node_version':
1515
'780436005ffc7f317abfba48b236428858284e99',
1616
'nan_version':

‎patches/chromium/.patches‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,3 @@ crashpad_pid_check.patch
7777
chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch
7878
network_service_allow_remote_certificate_verification_logic.patch
7979
put_back_deleted_colors_for_autofill.patch
80-
fix_re-add_endauxattributes_to_fix_gpu_info_enumeration.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
99
This should be upstreamed
1010

1111
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
12-
index ad0d612eb6b87cb320047ebaaff5220f46d8fb8c..9f1fc3a3f1b98d90c5aea07d30616e5180cfa8d5 100644
12+
index 877495568fddbc7dae5835ead41faf37be77208a..362c01039826ee5764d170da17cc7111617a8de2 100644
1313
--- a/content/gpu/gpu_main.cc
1414
+++ b/content/gpu/gpu_main.cc
1515
@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -23,7 +23,7 @@ index ad0d612eb6b87cb320047ebaaff5220f46d8fb8c..9f1fc3a3f1b98d90c5aea07d30616e51
2323
// We are experiencing what appear to be memory-stomp issues in the GPU
2424
// process. These issues seem to be impacting the task executor and listeners
2525
// registered to it. Create the task executor on the heap to guard against
26-
@@ -337,7 +341,6 @@ int GpuMain(const MainFunctionParams& parameters) {
26+
@@ -339,7 +343,6 @@ int GpuMain(const MainFunctionParams& parameters) {
2727
: base::ThreadPriority::NORMAL;
2828
GpuProcess gpu_process(io_thread_priority);
2929

‎patches/chromium/add_realloc.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
3939

4040
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
4141
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
42-
index 82bfcb5d1d98772fda0e8c5692e8fdc2626fd1c9..ea29d4e0404344be09e9098920d175e7bb80d000 100644
42+
index d4fcac361f99e52a4a0e9e90abe639816cf51fc1..8d7c531de5e9016da6cd2d823f7d7f3270b9abf6 100644
4343
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
4444
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
45-
@@ -582,6 +582,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
45+
@@ -632,6 +632,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
4646
size, WTF::ArrayBufferContents::kDontInitialize);
4747
}
4848

‎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 2bf09644bdd6bf6f8dd49557f9e707f7bf77c2b4..bc36e8bc9fc1a973c89d52e60bd62e753ef17f15 100644
17+
index b4e75c8bc63c30c4d0dde96912aee87260662103..3a61f37a05fb5e626a0898b53600b79ab3c20f88 100644
1818
--- a/third_party/blink/renderer/core/frame/local_frame.cc
1919
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
20-
@@ -331,10 +331,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
20+
@@ -332,10 +332,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
2121
}
2222
CHECK(!view_ || !view_->IsAttached());
2323

@@ -28,7 +28,7 @@ index 2bf09644bdd6bf6f8dd49557f9e707f7bf77c2b4..bc36e8bc9fc1a973c89d52e60bd62e75
2828
if (!Client())
2929
return;
3030

31-
@@ -352,6 +348,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
31+
@@ -353,6 +349,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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index c41afd046ee882cdb4c9f706c4d08cd05bd133ec..a52f1a86e6aeecb0d704b01746de5501
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 e9fda5584f7b0ce69c8ca031f34e9b181a704868..a444ec89dbfd6395e2b182a73572555563861e1d 100644
22+
index e55ac9152cfdd35e0d5e0cc99ec8d8abe5bac5f1..cb1881473d452e3454977d9277551ad693f3a90c 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
@@ -867,6 +867,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -37,7 +37,7 @@ index e9fda5584f7b0ce69c8ca031f34e9b181a704868..a444ec89dbfd6395e2b182a735725555
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 15ed90d550941c58ceb375afa9feadc57e4b46c4..8c18516e6957206a4c9ae9365fdf06870c2d3094 100644
40+
index 043afe0005af3e4271f2b0c8e490e4e4141fc1b5..3a937e1a451ddf1e99ef4322ebc21044d48ad537 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
4343
@@ -148,6 +148,8 @@ class CORE_EXPORT WebLocalFrameImpl final

‎patches/chromium/can_create_window.patch‎

Lines changed: 2 additions & 2 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 36e6f08c3d0ed6ef7f7d071b01c70e99c16efc05..2ada995112fec477e186a9de3e815d3be5dc1292 100644
8+
index ad82e3695847dcb3f71b3a26d4609029b6201ee8..01c3c1ece91a6478d1a7d075d304359de9050cb2 100644
99
--- a/content/browser/frame_host/render_frame_host_impl.cc
1010
+++ b/content/browser/frame_host/render_frame_host_impl.cc
11-
@@ -3807,6 +3807,7 @@ void RenderFrameHostImpl::CreateNewWindow(
11+
@@ -3809,6 +3809,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,

‎patches/chromium/content_browser_main_loop.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
88
in atom::CommonWebContentsDelegate::ResetManageWebContents.
99

1010
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
11-
index d4426f92a066f8f30aa24cc5ad02ae4e75ab0e33..c1f2cb0a239566a279f13cdeec46d4e9f59db965 100644
11+
index 777e9ccf6da4da4924b2e35bff8e7b84fb18a9aa..f04fd728df749100a4699dd922f7a4b17f1fd98c 100644
1212
--- a/content/browser/browser_main_loop.cc
1313
+++ b/content/browser/browser_main_loop.cc
14-
@@ -1499,7 +1499,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
14+
@@ -1501,7 +1501,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
1515
NOTREACHED();
1616
#else
1717
base::RunLoop run_loop;

‎patches/chromium/disable_color_correct_rendering.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,18 +215,18 @@ index 4165ba000223c6d13e112a6a9861f015bb9ebbbb..70a9d11bdd1f836215724af18df18876
215215
service_manager::switches::kGpuSandboxAllowSysVShm,
216216
service_manager::switches::kGpuSandboxFailuresFatal,
217217
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
218-
index 26b1e9e2043cd5576e58ed44c5595c42a58f9f84..b9064efa92653be6e10b78f81b2e50c8f3742657 100644
218+
index ce456a679fe94077c1a69b5eb697eba746ddba85..880d0e759659c62b3401d46fa962abadf8146a95 100644
219219
--- a/content/browser/renderer_host/render_process_host_impl.cc
220220
+++ b/content/browser/renderer_host/render_process_host_impl.cc
221-
@@ -216,6 +216,7 @@
221+
@@ -217,6 +217,7 @@
222222
#include "ui/base/ui_base_switches.h"
223223
#include "ui/base/ui_base_switches_util.h"
224224
#include "ui/display/display_switches.h"
225225
+#include "ui/gfx/switches.h"
226226
#include "ui/gl/gl_switches.h"
227227
#include "ui/native_theme/native_theme_features.h"
228228

229-
@@ -2898,6 +2899,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
229+
@@ -2908,6 +2909,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
230230
// Propagate the following switches to the renderer command line (along
231231
// with any associated values) if present in the browser command line.
232232
static const char* const kSwitchNames[] = {

‎patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
66
See https://github.com/electron/electron/issues/10754
77

88
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
9-
index 9a7175184c094ae1725bb9f58182e17090c0e1f3..90cb0da5405b3b65572fc8afc8b127c031a421e9 100644
9+
index a532335fbe025ca34a1f2df8803225b7a4943bd0..2b2439bae4a1989c94026976d157522a3274aafb 100644
1010
--- a/third_party/blink/renderer/core/dom/document.cc
1111
+++ b/third_party/blink/renderer/core/dom/document.cc
12-
@@ -3676,7 +3676,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
12+
@@ -3992,7 +3992,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
1313
"frame that never had a user gesture since its load. "
1414
"https://www.chromestatus.com/feature/5082396709879808";
1515
Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);

0 commit comments

Comments
 (0)