Skip to content

Commit 040910b

Browse files
electron-roller[bot]patchup[bot]
electron-roller[bot]
and
patchup[bot]
authored
chore: bump chromium to 96.0.4664.110 (16-x-y) (#32123)
* chore: bump chromium in DEPS to 96.0.4664.93 * chore: update patches * chore: bump chromium in DEPS to 96.0.4664.110 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
1 parent 27a2f89 commit 040910b

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎DEPS‎

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

1616
vars = {
1717
'chromium_version':
18-
'96.0.4664.55',
18+
'96.0.4664.110',
1919
'node_version':
2020
'v16.9.1',
2121
'nan_version':

‎patches/chromium/can_create_window.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12-
index cb2e3a09dece9b5eafd3dcb4e0c1c963210ba691..7ccad8c0439ea83c05266c95bcd81ec506889cdf 100644
12+
index 193bfd1abc5f9d97f79ded22617f1a9e110175fc..b68c5ee5bd719e15d952a48ff4bc8ef0046e361a 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -6507,6 +6507,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -6504,6 +6504,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1616
last_committed_origin_, params->window_container_type,
1717
params->target_url, params->referrer.To<Referrer>(),
1818
params->frame_name, params->disposition, *params->features,

‎patches/chromium/feat_add_data_parameter_to_processsingleton.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446
6161
#if defined(OS_WIN)
6262
bool EscapeVirtualization(const base::FilePath& user_data_dir);
6363
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
64-
index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e736011510634c0e 100644
64+
index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efedd488afbc 100644
6565
--- a/chrome/browser/process_singleton_posix.cc
6666
+++ b/chrome/browser/process_singleton_posix.cc
67-
@@ -567,6 +567,7 @@ class ProcessSingleton::LinuxWatcher
67+
@@ -626,6 +626,7 @@ class ProcessSingleton::LinuxWatcher
6868
// |reader| is for sending back ACK message.
6969
void HandleMessage(const std::string& current_dir,
7070
const std::vector<std::string>& argv,
7171
+ const std::vector<const uint8_t> additional_data,
7272
SocketReader* reader);
7373

7474
private:
75-
@@ -621,13 +622,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
75+
@@ -680,13 +681,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
7676
}
7777

7878
void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -91,7 +91,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
9191
// Send back "ACK" message to prevent the client process from starting up.
9292
reader->FinishWithACK(kACKToken, base::size(kACKToken) - 1);
9393
} else {
94-
@@ -675,7 +679,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
94+
@@ -734,7 +738,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
9595
}
9696
}
9797

@@ -101,7 +101,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
101101
const size_t kMinMessageLength = base::size(kStartToken) + 4;
102102
if (bytes_read_ < kMinMessageLength) {
103103
buf_[bytes_read_] = 0;
104-
@@ -705,10 +710,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
104+
@@ -764,10 +769,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
105105
tokens.erase(tokens.begin());
106106
tokens.erase(tokens.begin());
107107

@@ -131,7 +131,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
131131
fd_watch_controller_.reset();
132132

133133
// LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
134-
@@ -737,8 +760,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
134+
@@ -796,8 +819,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
135135
//
136136
ProcessSingleton::ProcessSingleton(
137137
const base::FilePath& user_data_dir,
@@ -142,7 +142,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
142142
current_pid_(base::GetCurrentProcId()),
143143
watcher_(new LinuxWatcher(this)) {
144144
socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
145-
@@ -855,7 +880,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
145+
@@ -914,7 +939,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
146146
sizeof(socket_timeout));
147147

148148
// Found another process, prepare our command line
@@ -152,7 +152,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
152152
std::string to_send(kStartToken);
153153
to_send.push_back(kTokenDelimiter);
154154

155-
@@ -865,11 +891,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
155+
@@ -924,11 +950,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
156156
to_send.append(current_dir.value());
157157

158158
const std::vector<std::string>& argv = cmd_line.argv();

‎patches/chromium/process_singleton.patch‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ index 0d7c1db6489d95a40c66808c3f838b0740e46ff6..eec994c4252f17d9c9c41e66d5dae650
7676

7777
#if defined(OS_MAC)
7878
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
79-
index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf7c97f009 100644
79+
index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830ce1c99be 100644
8080
--- a/chrome/browser/process_singleton_posix.cc
8181
+++ b/chrome/browser/process_singleton_posix.cc
82-
@@ -80,6 +80,7 @@
82+
@@ -82,6 +82,7 @@
8383
#include "base/strings/stringprintf.h"
8484
#include "base/strings/sys_string_conversions.h"
8585
#include "base/strings/utf_string_conversions.h"
8686
+#include "base/task/post_task.h"
8787
#include "base/threading/platform_thread.h"
8888
#include "base/threading/thread_task_runner_handle.h"
8989
#include "base/time/time.h"
90-
@@ -95,9 +96,11 @@
90+
@@ -97,9 +98,11 @@
9191
#include "net/base/network_interfaces.h"
9292
#include "ui/base/l10n/l10n_util.h"
9393

@@ -99,7 +99,7 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
9999

100100
#if defined(TOOLKIT_VIEWS) && \
101101
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
102-
@@ -289,6 +292,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
102+
@@ -348,6 +351,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
103103
bool DisplayProfileInUseError(const base::FilePath& lock_path,
104104
const std::string& hostname,
105105
int pid) {
@@ -109,15 +109,15 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
109109
std::u16string error = l10n_util::GetStringFUTF16(
110110
IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
111111
base::ASCIIToUTF16(hostname));
112-
@@ -308,6 +314,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
112+
@@ -367,6 +373,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
113113

114114
NOTREACHED();
115115
return false;
116116
+#endif
117117
}
118118

119119
bool IsChromeProcess(pid_t pid) {
120-
@@ -348,6 +355,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
120+
@@ -407,6 +414,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
121121
return (cookie == ReadLink(path));
122122
}
123123

@@ -139,7 +139,7 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
139139
bool ConnectSocket(ScopedSocket* socket,
140140
const base::FilePath& socket_path,
141141
const base::FilePath& cookie_path) {
142-
@@ -729,6 +751,10 @@ ProcessSingleton::ProcessSingleton(
142+
@@ -788,6 +810,10 @@ ProcessSingleton::ProcessSingleton(
143143

144144
ProcessSingleton::~ProcessSingleton() {
145145
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -150,7 +150,7 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
150150
}
151151

152152
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
153-
@@ -897,6 +923,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
153+
@@ -956,6 +982,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
154154
base::Seconds(kTimeoutInSeconds));
155155
}
156156

@@ -171,7 +171,7 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
171171
ProcessSingleton::NotifyResult
172172
ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
173173
const base::CommandLine& command_line,
174-
@@ -999,14 +1039,32 @@ bool ProcessSingleton::Create() {
174+
@@ -1055,14 +1095,32 @@ bool ProcessSingleton::Create() {
175175
#endif
176176
}
177177

@@ -209,7 +209,7 @@ index 4547eb8563e1af57aad991d9d1e2cf02c778380a..a04d139f958a7aaef9b96e8c29317ccf
209209
// Check that the directory was created with the correct permissions.
210210
int dir_mode = 0;
211211
CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
212-
@@ -1046,10 +1104,13 @@ bool ProcessSingleton::Create() {
212+
@@ -1105,10 +1163,13 @@ bool ProcessSingleton::Create() {
213213
if (listen(sock, 5) < 0)
214214
NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
215215

‎patches/chromium/webview_fullscreen.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
1414
`api::WebContents::IsFullscreenForTabOrPending` value.
1515

1616
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
17-
index 7ccad8c0439ea83c05266c95bcd81ec506889cdf..214f08880b8b94f8ef1f6d90eecd3590704469f6 100644
17+
index b68c5ee5bd719e15d952a48ff4bc8ef0046e361a..44c089d82fc91462ea986ec63e124ce0cd59e7b7 100644
1818
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1919
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
20-
@@ -5910,6 +5910,15 @@ void RenderFrameHostImpl::EnterFullscreen(
20+
@@ -5907,6 +5907,15 @@ void RenderFrameHostImpl::EnterFullscreen(
2121
notified_instances.insert(parent_site_instance);
2222
}
2323

‎patches/v8/dcheck.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: dcheck.patch
66
https://github.com/auchenberg/volkswagen
77

88
diff --git a/src/api/api.cc b/src/api/api.cc
9-
index f79d0482ed3f1b42e60e09b4ad07749f9dbdadf0..f87db8a84efc661aad15781f2f949901e5befc17 100644
9+
index 93fa70ae1bb1dfd4b55f0e18cb22d764278dfbd2..c163170190dd8d9a72fc921ff062143d48681b5a 100644
1010
--- a/src/api/api.cc
1111
+++ b/src/api/api.cc
1212
@@ -8907,7 +8907,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {

0 commit comments

Comments
 (0)