chore: bump chromium to 122.0.6261.6 (main) (#40949)
* chore: bump chromium in DEPS to 122.0.6239.2 * chore: update patches * refactor: extensions replaced StringPiece with string_view Ref:5171926
* chore: bump chromium in DEPS to 122.0.6240.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6241.5 * chore: bump chromium in DEPS to 122.0.6245.0 * chore: bump chromium in DEPS to 122.0.6247.0 * chore: bump chromium in DEPS to 122.0.6249.0 * chore: bump chromium in DEPS to 122.0.6251.0 * 5192010: Rename {absl => std}::optional in //chrome/5192010
* 5109767: CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* 5105227: [media_preview] Show requested device in permission bubble5105227
* chore: bump chromium in DEPS to 122.0.6253.0 * chore: update patches * 5180720: Polish tiled browser window UI on Linux |5180720
* chore: update patches * chore: bump chromium in DEPS to 122.0.6255.0 * chore: update patches * 5186276: [autopip] Make "allow once" per navigation |5186276
* chore: bump chromium in DEPS to 122.0.6257.0 * chore: bump chromium in DEPS to 122.0.6259.0 * chore: update patches * 5190661: Automated T* -> raw_ptr<T> rewrite "refresh" |5190661
* 5206106: Make sure RenderFrameHosts are active when printing |5206106
* 5202674: Reland "Automated T* -> raw_ptr<T> rewrite 'refresh'"5202674
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* fixup 5206106: Make sure RenderFrameHosts are active when printing * Make legacy ToV8() helpers private to ScriptPromiseResolver, their only user5207474
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton * fixup 5186276: [autopip] Make "allow once" per navigation5186276
* chore: update patches after rebase * chore: bump chromium in DEPS to 122.0.6260.0 * 5191363: Mark LOG(FATAL) [[noreturn]]5191363
* fixup 5186276: [autopip] Make "allow once" per navigation5186276
* fixup Make legacy ToV8() helpers private to ScriptPromiseResolver5207474
* chore: update patches * chore: bump chromium in DEPS to 122.0.6261.0 * chore: update patches * chore: restore patch that was mistakenly removed * 5181931: Improve LoginHandler (Part 9 / N)5181931
* Dispatch SiteInstanceGotProcess() only when both process and site are set.5142354
* 5171446: [AsyncSB] Pass navigation_id into CreateURLLoaderThrottles5171446
* 5213708: Move DownloadTargetInfo into components/download5213708
* extensions: Add a loader for Controlled Frame embedder scripts5202765
* [CSC][Zoom] Add initial_zoom_level to DisplayMediaInformation5168626
* chore: bump chromium in DEPS to 123.0.6262.0 * chore: bump chromium in DEPS to 122.0.6261.6 * fix: suppress clang -Wimplicit-const-int-float-conversion * fixup 5191363: Mark LOG(FATAL) [[noreturn]] for Windows5191363
* 5167921: Remove Widget::IsTranslucentWindowOpacitySupported5167921
Also 5148392: PinnedState: Support pinned state in PlatformWindowState |5148392
* fixup: 5180720: Polish tiled browser window UI on Linux5180720
* 5170669: clipboard: Migrate DOMException constructors to RejectWith-5170669
* 5178824: [Fullscreen] Record UKM data5178824
* chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
921da723b8
commit
1a0991a9b9
99 changed files with 744 additions and 991 deletions
|
@ -51,7 +51,7 @@ index b05c0157ecca222452fb38e3b28c9d7cc6bcfbfd..02d9eabfef9521722340739bf86df3df
|
|||
base::win::MessageWindow window_; // The message-only window.
|
||||
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
|
||||
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
||||
index f4692fd100b157d571cff4bcd2ca30f33d132af3..09108f231a54b117a143e71efa3f3663d64a63e6 100644
|
||||
index f2913f2d78edb2547ae21816b34936d38f1870a9..298c9c81fa110ad7900d0bd6822136bb57f0382e 100644
|
||||
--- a/chrome/browser/process_singleton_posix.cc
|
||||
+++ b/chrome/browser/process_singleton_posix.cc
|
||||
@@ -54,6 +54,7 @@
|
||||
|
@ -70,29 +70,25 @@ index f4692fd100b157d571cff4bcd2ca30f33d132af3..09108f231a54b117a143e71efa3f3663
|
|||
#include "base/threading/platform_thread.h"
|
||||
#include "base/time/time.h"
|
||||
#include "base/timer/timer.h"
|
||||
@@ -97,9 +99,11 @@
|
||||
@@ -97,7 +99,7 @@
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/base/resource/scoped_startup_resource_bundle.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if 0
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
using content::BrowserThread;
|
||||
|
||||
@@ -343,6 +347,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
|
||||
@@ -343,6 +345,8 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
|
||||
bool DisplayProfileInUseError(const base::FilePath& lock_path,
|
||||
const std::string& hostname,
|
||||
int pid) {
|
||||
+ return true;
|
||||
+
|
||||
+#if 0
|
||||
// Ensure there is an instance of ResourceBundle that is initialized for
|
||||
// localized string resource accesses.
|
||||
ui::ScopedStartupResourceBundle ensure_startup_resource_bundle;
|
||||
@@ -366,6 +373,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
|
||||
@@ -366,6 +370,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
|
||||
|
||||
NOTREACHED();
|
||||
return false;
|
||||
|
@ -100,8 +96,8 @@ index f4692fd100b157d571cff4bcd2ca30f33d132af3..09108f231a54b117a143e71efa3f3663
|
|||
}
|
||||
|
||||
bool IsChromeProcess(pid_t pid) {
|
||||
@@ -406,6 +414,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
|
||||
return (cookie == ReadLink(path));
|
||||
@@ -378,6 +383,21 @@ bool IsChromeProcess(pid_t pid) {
|
||||
base::FilePath(chrome::kBrowserProcessExecutableName));
|
||||
}
|
||||
|
||||
+bool IsAppSandboxed() {
|
||||
|
@ -119,13 +115,13 @@ index f4692fd100b157d571cff4bcd2ca30f33d132af3..09108f231a54b117a143e71efa3f3663
|
|||
+#endif // BUILDFLAG(IS_MAC)
|
||||
+}
|
||||
+
|
||||
bool ConnectSocket(ScopedSocket* socket,
|
||||
const base::FilePath& socket_path,
|
||||
const base::FilePath& cookie_path) {
|
||||
@@ -773,6 +796,10 @@ ProcessSingleton::ProcessSingleton(
|
||||
|
||||
ProcessSingleton::~ProcessSingleton() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
// A helper class to hold onto a socket.
|
||||
class ScopedSocket {
|
||||
public:
|
||||
@@ -781,6 +801,10 @@ ProcessSingleton::~ProcessSingleton() {
|
||||
if (watcher_) {
|
||||
watcher_->OnEminentProcessSingletonDestruction();
|
||||
}
|
||||
+ // Manually free resources with IO explicitly allowed.
|
||||
+ base::ScopedAllowBlocking allow_blocking;
|
||||
+ watcher_ = nullptr;
|
||||
|
@ -133,13 +129,10 @@ index f4692fd100b157d571cff4bcd2ca30f33d132af3..09108f231a54b117a143e71efa3f3663
|
|||
}
|
||||
|
||||
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
||||
@@ -1036,14 +1063,32 @@ bool ProcessSingleton::Create() {
|
||||
#endif
|
||||
}
|
||||
|
||||
- // Create the socket file somewhere in /tmp which is usually mounted as a
|
||||
- // normal filesystem. Some network filesystems (notably AFS) are screwy and
|
||||
- // do not support Unix domain sockets.
|
||||
@@ -1047,11 +1071,32 @@ bool ProcessSingleton::Create() {
|
||||
// Create the socket file somewhere in /tmp which is usually mounted as a
|
||||
// normal filesystem. Some network filesystems (notably AFS) are screwy and
|
||||
// do not support Unix domain sockets.
|
||||
- if (!socket_dir_.CreateUniqueTempDir()) {
|
||||
- LOG(ERROR) << "Failed to create socket directory.";
|
||||
+ base::FilePath tmp_dir;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue