Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1f1ef1c

Browse files
authored
Merge branch 'main' into nodejs-v20
2 parents7c2fb19 +abb71f5 commit1f1ef1c

File tree

137 files changed

+943
-752
lines changed

Some content is hidden

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

137 files changed

+943
-752
lines changed

‎.github/workflows/pull-request-labeled.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name:Pull Request Labeled
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types:[labeled]
66

7-
permissions:
8-
contents:read
7+
permissions:{}
98

109
jobs:
1110
pull-request-labeled-backport-requested:

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars= {
44
'chromium_version':
5-
'121.0.6116.0',
5+
'121.0.6147.0',
66
'node_version':
77
'v20.9.0',
88
'nan_version':

‎build/args/all.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ enable_dangling_raw_ptr_checks = false
6060
# This flag speeds up the performance of fork/execve on linux systems.
6161
# Ref: https://chromium-review.googlesource.com/c/v8/v8/+/4602858
6262
v8_enable_private_mapping_fork_optimization=true
63+
64+
# Expose public V8 symbols for native modules.
65+
v8_expose_public_symbols=true

‎chromium_src/BUILD.gn

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ static_library("chrome") {
3131
"//chrome/browser/devtools/devtools_file_system_indexer.cc",
3232
"//chrome/browser/devtools/devtools_file_system_indexer.h",
3333
"//chrome/browser/devtools/devtools_settings.h",
34+
"//chrome/browser/devtools/visual_logging.cc",
35+
"//chrome/browser/devtools/visual_logging.h",
3436
"//chrome/browser/extensions/global_shortcut_listener.cc",
3537
"//chrome/browser/extensions/global_shortcut_listener.h",
3638
"//chrome/browser/icon_loader.cc",
@@ -256,6 +258,8 @@ static_library("chrome") {
256258
sources+= [
257259
"//chrome/browser/bad_message.cc",
258260
"//chrome/browser/bad_message.h",
261+
"//chrome/browser/printing/prefs_util.cc",
262+
"//chrome/browser/printing/prefs_util.h",
259263
"//chrome/browser/printing/print_job.cc",
260264
"//chrome/browser/printing/print_job.h",
261265
"//chrome/browser/printing/print_job_manager.cc",
@@ -333,6 +337,8 @@ static_library("chrome") {
333337
"//chrome/browser/pdf/pdf_extension_util.h",
334338
"//chrome/browser/pdf/pdf_frame_util.cc",
335339
"//chrome/browser/pdf/pdf_frame_util.h",
340+
"//chrome/browser/pdf/pdf_viewer_stream_manager.cc",
341+
"//chrome/browser/pdf/pdf_viewer_stream_manager.h",
336342
"//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
337343
"//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
338344
]

‎filenames.libcxx.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,6 @@ libcxx_headers = [
818818
"//third_party/libc++/src/include/__type_traits/negation.h",
819819
"//third_party/libc++/src/include/__type_traits/noexcept_move_assign_container.h",
820820
"//third_party/libc++/src/include/__type_traits/operation_traits.h",
821-
"//third_party/libc++/src/include/__type_traits/predicate_traits.h",
822821
"//third_party/libc++/src/include/__type_traits/promote.h",
823822
"//third_party/libc++/src/include/__type_traits/rank.h",
824823
"//third_party/libc++/src/include/__type_traits/remove_all_extents.h",
@@ -1003,6 +1002,7 @@ libcxx_headers = [
10031002
"//third_party/libc++/src/include/string.h",
10041003
"//third_party/libc++/src/include/string_view",
10051004
"//third_party/libc++/src/include/strstream",
1005+
"//third_party/libc++/src/include/syncstream",
10061006
"//third_party/libc++/src/include/system_error",
10071007
"//third_party/libc++/src/include/tgmath.h",
10081008
"//third_party/libc++/src/include/thread",

‎patches/chromium/.patches

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ fix_remove_caption-removing_style_call.patch
106106
build_allow_electron_to_use_exec_script.patch
107107
chore_introduce_blocking_api_for_electron.patch
108108
chore_patch_out_partition_attribute_dcheck_for_webviews.patch
109-
expose_v8initializer_codegenerationcheckcallbackinmainthread.patch
110109
chore_patch_out_profile_methods_in_profile_selections_cc.patch
111110
add_gin_converter_support_for_arraybufferview.patch
112111
chore_defer_usb_service_getdevices_request_until_usb_service_is.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

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

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
indexbfb0a24b2a57b4c75f64e0853700174c11df8d48..c9c40aca92fd7e0dde0da62d34120edb8479331a 100644
13+
index8d9c853f7fe861ed7ff790fa2c02706b3a2c7264..fa9717eeb7a6f46aebf14d1fc00e2b19741b55a2 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -262,6 +262,10 @@ int GpuMain(MainFunctionParams parameters) {
16+
@@ -264,6 +264,10 @@ int GpuMain(MainFunctionParams parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
1818
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
1919

@@ -24,7 +24,7 @@ index bfb0a24b2a57b4c75f64e0853700174c11df8d48..c9c40aca92fd7e0dde0da62d34120edb
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -358,7 +362,6 @@ int GpuMain(MainFunctionParams parameters) {
27+
@@ -360,7 +364,6 @@ int GpuMain(MainFunctionParams parameters) {
2828
const_cast<base::CommandLine*>(&command_line), gpu_preferences);
2929
const bool dead_on_arrival = !init_success;
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index c302f3e672cea9b73591048cf581f3e81078d5cb..eb1d1b0b59e687b996e76c205a871234
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
indexd20115a7c92f2cd516d40e456c82b23c9dc07a97..e124b9c231dd77d0d646f50cce2a30d92dbc480a 100644
26+
index9bea02ba22dc601e57406513ed02c8704bf587de..ccd3c27b7537f9c1adce9d32137d0e596be7c545 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4560,6 +4560,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4565,6 +4565,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index d20115a7c92f2cd516d40e456c82b23c9dc07a97..e124b9c231dd77d0d646f50cce2a30d9
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index2a675b88da91dff73cec17c4587ea46a5296d67b..3fc435922f105c752cacd5d91dcf7ed0b9fc598c 100644
43+
index6fa0c635d1080cf2d7dbc0c7bd2c9bb5c083b986..dee1c7e60a998fd1947b4ff542872de0eb8d87cd 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -618,6 +618,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -621,6 +621,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index 2a675b88da91dff73cec17c4587ea46a5296d67b..3fc435922f105c752cacd5d91dcf7ed0
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index64d8aca52be5e63c56fea2cb2a835761df11e098..6d3c66f3b08a625c4bcfffc3f2caf2d67f9ca258 100644
56+
indexac82f8a9c14546d09e0181da93fbc361dc09dd78..94e177829c75ba3f4b33b4ca0802173e7faa1b92 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -620,6 +620,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -619,6 +619,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,7 +67,7 @@ index 64d8aca52be5e63c56fea2cb2a835761df11e098..6d3c66f3b08a625c4bcfffc3f2caf2d6
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
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
70-
index5030619779b7bcd67923026991bb44d926d81e1a..1eea33740fcdca49e094ad7ad00cfda8938f96c1 100644
70+
indexe22ccf32a9e3c596e44506244f284f1c2be86762..65ff494dc7c5676fbb534c1dd1854010c507a1eb 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7373
@@ -202,6 +202,7 @@ void LocalWindowProxy::Initialize() {
@@ -79,10 +79,10 @@ index 5030619779b7bcd67923026991bb44d926d81e1a..1eea33740fcdca49e094ad7ad00cfda8
7979
if (World().IsMainWorld()) {
8080
probe::DidCreateMainWorldContext(GetFrame());
8181
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82-
indexc0fa11ea9ec9f35fe7ee1c36a8ea618cc0ccaea0..cd8a420bb51be71996d697b49ccf51f2bcce2c4c 100644
82+
indexe982a11fc5412a9dce2ecde8af2fdaab4b2d56e7..a2169ba91e8856667b300672ed1a64841bf9c3a6 100644
8383
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
8484
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
85-
@@ -320,6 +320,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
85+
@@ -302,6 +302,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
8686

8787
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
8888
int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index c0fa11ea9ec9f35fe7ee1c36a8ea618cc0ccaea0..cd8a420bb51be71996d697b49ccf51f2
9292
int32_t world_id) = 0;
9393
virtual bool AllowScriptExtensions() = 0;
9494
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
95-
index5dd3383cfddf4edc050ef5b37e98452f3476d7a9..25942059009f735a1d6b52fc9c1033d26c893306 100644
95+
index150f4280ec4c3829c14da8166ab2a4e9c043d551..b9dd77befa57677fa2b1f507c90cf0bedd09eafa 100644
9696
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9797
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9898
@@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 5dd3383cfddf4edc050ef5b37e98452f3476d7a9..25942059009f735a1d6b52fc9c1033d2
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
113-
index2dd6df6727828335ca4462b470df4afd8dd29539..91ee3bf31ba43e650cacd2f781a3a8103d216570 100644
113+
index19b6d04a1dc5ae33fa1ede248fd580a4eb95ede6..2b238811b634f449a90ee7cf5d19c2e55343eb10 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116116
@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 2dd6df6727828335ca4462b470df4afd8dd29539..91ee3bf31ba43e650cacd2f781a3a810
123123
int32_t world_id) override;
124124

125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
indexe0c700c76f360b24d7ffa4edfe16dc855e4fd8b1..265f3c590062009ec98be231f9e1f496c39370e0 100644
126+
index97bd9953e14088517a80b44c244f2bacf3b699bb..e67b3126f1082ecd2b6867ae01ab30d4c6ea41c5 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -408,6 +408,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -406,6 +406,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/add_gin_converter_support_for_arraybufferview.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ index 4eb8c3d8c8392512eeb235bc18012589549b872b..d0432f6fff09cdcebed55ccf03a6524a
3939
Local<External> val) {
4040
return val.As<Value>();
4141
diff --git a/gin/converter.h b/gin/converter.h
42-
index67b8d904d940f9abfd8557ec744b280fa084e897..2e4b6e44162aaa0f80c1f6c50abbd56cd3eb2576 100644
42+
index2afca004074a039e740908e85813ec8c07b480c7..66cfa806cb8bb1614cc4584fc4797227ee33a754 100644
4343
--- a/gin/converter.h
4444
+++ b/gin/converter.h
45-
@@ -181,6 +181,15 @@ struct GIN_EXPORT Converter<v8::Local<v8::ArrayBuffer> > {
45+
@@ -188,6 +188,15 @@ struct GIN_EXPORT Converter<v8::Local<v8::ArrayBuffer> > {
4646
v8::Local<v8::ArrayBuffer>* out);
4747
};
4848

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp