mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
chore: bump chromium to 98.0.4706.0 (main) (#31555)
* chore: bump chromium in DEPS to 97.0.4678.0
* chore: bump chromium in DEPS to 97.0.4679.0
* chore: bump chromium in DEPS to 97.0.4680.0
* chore: bump chromium in DEPS to 97.0.4681.0
* chore: bump chromium in DEPS to 97.0.4682.0
* chore: update patches
* 3234737: Disable -Wunused-but-set-variable
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* 3216953: Reland "Move task-related files from base/ to base/task/"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216953
* 3202710: TimeDelta factory function migration.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3202710
* 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3226841
* 3212165: blink/gin: changes blink to load snapshot based on runtime information
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3212165
* 3220292: Deprecate returning a GURL from GURL::GetOrigin()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3220292
* 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3231995
* 3205121: Remove base::DictionaryValue::GetDouble
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3205121
* 3208413: [flags] Make --js-flags settings have priority over V8 features
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3208413
* chore: bump chromium in DEPS to 97.0.4683.0
* chore: update patches
* 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3188834
* chore: update process_singleton patches
* chore: bump chromium in DEPS to 97.0.4684.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4685.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4686.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4687.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4688.0
* chore: update patches
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3223422
sync pepper_plugin_support.patch with upstream
* chore: bump chromium in DEPS to 97.0.4689.0
* 3247791: ax_mac_merge: Merge AX Math attribute implementations
Xref: ax_mac_merge: Merge AX Math attribute implementations
chore: fix minor patch shear in #includes
* 3243425: Add VisibleTimeRequestTrigger helper class
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3243425
chore: fix minor patch shear in #includes
* chore: regen chromium patches
* fixup! 3247722: Use correct source_site_instance if navigating via context menu
* chore: bump chromium in DEPS to 97.0.4690.0
* 3188659: Window Placement: make GetScreenInfo(s) const
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3188659
simple sync GetScreenInfo with upstream refactor
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4690.4
* chore: bump chromium in DEPS to 97.0.4692.0
* 3198073: ozone: //content: clean up from USE_X11
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3198073
Fixing patch shear. Nothing to see here.
* 3252338: Remove label images checkbox from chrome://accessibility page
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3252338
Part of our a11y patch is no longer needed due to upstream label removal
* 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3258183
Replace our use of the macro with explicitly-deleted class methods.
See https://chromium-review.googlesource.com/c/chromium/src/+/3256952
for upstream examples of this same replacement.
* chore: update patches
* 3247295: Unwind SecurityStyleExplanations
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3247295
update GetSecurityStyle() signature and impl to match upstream changes
* 3259578: media: grabs lock to ensure video output when occluded
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3259578
Add stub for new upstream virtual method OnCapturerCountChanged()
* fixup! 3247295: Unwind SecurityStyleExplanations
* 3238504: Fix up drag image is not shown from bookmark bar
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3238504
SetDragImage() no longer takes a widget argument
* 3217452: [devtools] Add getSyncInformation host binding
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3217452
Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled.
* chore: bump chromium in DEPS to 98.0.4693.0
* chore: bump chromium in DEPS to 98.0.4694.0
* chore: bump chromium in DEPS to 98.0.4695.0
* chore: bump chromium in DEPS to 98.0.4696.0
* chore: bump chromium in DEPS to 98.0.4697.0
* chore: bump chromium in DEPS to 98.0.4699.0
* chore: bump chromium in DEPS to 98.0.4701.0
* chore: bump chromium in DEPS to 98.0.4703.0
* chore: bump chromium in DEPS to 98.0.4705.0
* chore: bump chromium in DEPS to 98.0.4706.0
* chore: update patches
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs
https://chromium-review.googlesource.com/c/chromium/src/+/3259964
* 3269029: blink/gin: sets histogram callbacks during isolate creation
https://chromium-review.googlesource.com/c/chromium/src/+/3269029
* fixup after rebase
* [content] Make ContentMainParams and MainFunctionParams move-only
https://chromium-review.googlesource.com/c/chromium/src/+/3244976
* 3255305: Stop sending the securityStateChanged event and unwind
https://chromium-review.googlesource.com/c/chromium/src/+/3255305
* [Blink] Add promise support to WebLocalFrame::RequestExecuteScript()
https://chromium-review.googlesource.com/c/chromium/src/+/3230010
* 3256162: Simplify RWHV Show and ShowWithVisibility handling
https://chromium-review.googlesource.com/c/chromium/src/+/3256162
* 3263824: ozone: //ui/base: clean up from USE_X11 1/*
https://chromium-review.googlesource.com/c/chromium/src/+/3263824
* Request or cancel RecordContentToPresentationTimeRequest during capture
https://chromium-review.googlesource.com/c/chromium/src/+/3256802
* appcache: remove BrowsingData/quota references
https://chromium-review.googlesource.com/c/chromium/src/+/3255725
* [Autofill] Don't show Autofill dropdown if overlaps with permissions
https://chromium-review.googlesource.com/c/chromium/src/+/3236729
* Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks
https://chromium-review.googlesource.com/c/chromium/src/+/3268574
* cleanup patch
* fixup [content] Make ContentMainParams and MainFunctionParams move-only
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* ozone: //chrome/browser clean up from USE_X11
https://chromium-review.googlesource.com/c/chromium/src/+/3186490
Refs: https://github.com/electron/electron/issues/31382
* chore: update support_mixed_sandbox_with_zygote.patch
* Enable -Wunused-but-set-variable.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* fixup! ozone: //ui/base: clean up from USE_X11 1/*
* fixup! ozone: //chrome/browser clean up from USE_X11
* chore: fix deprecation warning in libuv
* chore: fixup for lint
* 3251161: Reland "Make the Clang update.py script require Python 3"
https://chromium-review.googlesource.com/c/chromium/src/+/3251161
* fixup: Enable -Wunused-but-set-variable.
* [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
https://chromium-review.googlesource.com/c/chromium/src/+/3262369
* Replace sandbox::policy::SandboxType with mojom Sandbox enum
https://chromium-review.googlesource.com/c/chromium/src/+/3213677
* fixup: [content] Make ContentMainParams and MainFunctionParams move-only
* build: ensure angle has a full git checkout available to it
* fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
* fixup lint
* [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame
https://chromium-review.googlesource.com/c/chromium/src/+/3223434
* fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions
* 3217591: Move browser UI CSS color parsing to own file part 2/2
https://chromium-review.googlesource.com/c/chromium/src/+/3217591
* Make kNoSandboxAndElevatedPrivileges only available to utilities
https://chromium-review.googlesource.com/c/chromium/src/+/3276784
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* Address review feedback
* chore: update patches
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* fix: unused variable compat
* chore: remove redundant patch
* fixup for 3262517: Re-enable WindowCaptureMacV2
https://chromium-review.googlesource.com/c/chromium/src/+/3262517
* chore: cleanup todo
The functions added in https://chromium-review.googlesource.com/c/chromium/src/+/3256802 are not used by offscreen rendering.
* fixup: update mas_no_private_api.patch
* 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216879 Fixes up commit b2f1aca956
* chore: cleanup support_mixed_sandbox_with_zygote.patch
* test: use window focus event instead of delay to wait for webContents focus
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
committed by
GitHub
parent
065cad6d2c
commit
bd10b19b0c
@@ -13,18 +13,18 @@ app.requestSingleInstanceLock API so that users can pass in a JSON
|
||||
object for the second instance to send to the first instance.
|
||||
|
||||
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
|
||||
index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446c2cc2cc8 100644
|
||||
index 13b325ecad9ba48398173e89680287c63efd4fa6..2061374805de9f9e646b896c4212bb3dcf2b8ed7 100644
|
||||
--- a/chrome/browser/process_singleton.h
|
||||
+++ b/chrome/browser/process_singleton.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "base/macros.h"
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/process/process.h"
|
||||
+#include "base/containers/span.h"
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
|
||||
#if defined(OS_POSIX) && !defined(OS_ANDROID)
|
||||
@@ -101,21 +102,24 @@ class ProcessSingleton {
|
||||
@@ -100,21 +101,24 @@ class ProcessSingleton {
|
||||
// should handle it (i.e., because the current process is shutting down).
|
||||
using NotificationCallback =
|
||||
base::RepeatingCallback<bool(const base::CommandLine& command_line,
|
||||
@@ -51,7 +51,7 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446
|
||||
~ProcessSingleton();
|
||||
|
||||
// Notify another process, if available. Otherwise sets ourselves as the
|
||||
@@ -179,6 +183,8 @@ class ProcessSingleton {
|
||||
@@ -178,6 +182,8 @@ class ProcessSingleton {
|
||||
|
||||
private:
|
||||
NotificationCallback notification_callback_; // Handler for notifications.
|
||||
@@ -61,10 +61,10 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446
|
||||
#if defined(OS_WIN)
|
||||
bool EscapeVirtualization(const base::FilePath& user_data_dir);
|
||||
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
||||
index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e736011510634c0e 100644
|
||||
index 0d74cd93a21b937f65f3d417b4734ae5b87acdf2..66a4369747377fe64c91b68f57ee4178c426ea61 100644
|
||||
--- a/chrome/browser/process_singleton_posix.cc
|
||||
+++ b/chrome/browser/process_singleton_posix.cc
|
||||
@@ -567,6 +567,7 @@ class ProcessSingleton::LinuxWatcher
|
||||
@@ -627,6 +627,7 @@ class ProcessSingleton::LinuxWatcher
|
||||
// |reader| is for sending back ACK message.
|
||||
void HandleMessage(const std::string& current_dir,
|
||||
const std::vector<std::string>& argv,
|
||||
@@ -72,7 +72,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
SocketReader* reader);
|
||||
|
||||
private:
|
||||
@@ -621,13 +622,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
|
||||
@@ -681,13 +682,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
|
||||
}
|
||||
|
||||
void ProcessSingleton::LinuxWatcher::HandleMessage(
|
||||
@@ -91,7 +91,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
// Send back "ACK" message to prevent the client process from starting up.
|
||||
reader->FinishWithACK(kACKToken, base::size(kACKToken) - 1);
|
||||
} else {
|
||||
@@ -675,7 +679,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
|
||||
@@ -735,7 +739,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
const size_t kMinMessageLength = base::size(kStartToken) + 4;
|
||||
if (bytes_read_ < kMinMessageLength) {
|
||||
buf_[bytes_read_] = 0;
|
||||
@@ -705,10 +710,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
|
||||
@@ -765,10 +770,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
|
||||
tokens.erase(tokens.begin());
|
||||
tokens.erase(tokens.begin());
|
||||
|
||||
@@ -131,7 +131,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
fd_watch_controller_.reset();
|
||||
|
||||
// LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
|
||||
@@ -737,8 +760,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
|
||||
@@ -797,8 +820,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
|
||||
//
|
||||
ProcessSingleton::ProcessSingleton(
|
||||
const base::FilePath& user_data_dir,
|
||||
@@ -142,7 +142,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
current_pid_(base::GetCurrentProcId()),
|
||||
watcher_(new LinuxWatcher(this)) {
|
||||
socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
|
||||
@@ -855,7 +880,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
|
||||
@@ -915,7 +940,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
|
||||
sizeof(socket_timeout));
|
||||
|
||||
// Found another process, prepare our command line
|
||||
@@ -152,7 +152,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
std::string to_send(kStartToken);
|
||||
to_send.push_back(kTokenDelimiter);
|
||||
|
||||
@@ -865,11 +891,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
|
||||
@@ -925,11 +951,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
|
||||
to_send.append(current_dir.value());
|
||||
|
||||
const std::vector<std::string>& argv = cmd_line.argv();
|
||||
@@ -175,10 +175,10 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115
|
||||
if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
|
||||
// Try to kill the other process, because it might have been dead.
|
||||
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
|
||||
index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e8847df55 100644
|
||||
index 679350dd08ca0211653ea669405e3f4f86c2fc0f..daab2f170d857082df56966c7bd8abc53924631d 100644
|
||||
--- a/chrome/browser/process_singleton_win.cc
|
||||
+++ b/chrome/browser/process_singleton_win.cc
|
||||
@@ -99,10 +99,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
|
||||
@@ -98,10 +98,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
|
||||
|
||||
bool ParseCommandLine(const COPYDATASTRUCT* cds,
|
||||
base::CommandLine* parsed_command_line,
|
||||
@@ -193,7 +193,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e
|
||||
static const int min_message_size = 7;
|
||||
if (cds->cbData < min_message_size * sizeof(wchar_t) ||
|
||||
cds->cbData % sizeof(wchar_t) != 0) {
|
||||
@@ -152,6 +154,37 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
|
||||
@@ -151,6 +153,37 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
|
||||
const std::wstring cmd_line =
|
||||
msg.substr(second_null + 1, third_null - second_null);
|
||||
*parsed_command_line = base::CommandLine::FromString(cmd_line);
|
||||
@@ -231,7 +231,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -168,16 +201,16 @@ bool ProcessLaunchNotification(
|
||||
@@ -167,16 +200,16 @@ bool ProcessLaunchNotification(
|
||||
|
||||
// Handle the WM_COPYDATA message from another process.
|
||||
const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
|
||||
@@ -252,7 +252,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -274,9 +307,11 @@ bool ProcessSingleton::EscapeVirtualization(
|
||||
@@ -273,9 +306,11 @@ bool ProcessSingleton::EscapeVirtualization(
|
||||
ProcessSingleton::ProcessSingleton(
|
||||
const std::string& program_name,
|
||||
const base::FilePath& user_data_dir,
|
||||
@@ -264,7 +264,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e
|
||||
program_name_(program_name),
|
||||
is_app_sandboxed_(is_app_sandboxed),
|
||||
is_virtualized_(false),
|
||||
@@ -301,7 +336,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
||||
@@ -300,7 +335,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
||||
return PROCESS_NONE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user