mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
chore: bump chromium to 138.0.7154.0 (main) (#46872)
* chore: bump chromium in DEPS to 138.0.7152.0 * chore: update patches * chore: bump chromium in DEPS to 138.0.7154.0 * chore: update patches * ozone/wayland: Fix bookmark dropdown right click context menu https://chromium-review.googlesource.com/c/chromium/src/+/6488801 * Use base::cstring_view in base::Environment https://chromium-review.googlesource.com/c/chromium/src/+/6494292 * [A11yPerformance] Remove Add/Remove AXMode methods https://chromium-review.googlesource.com/c/chromium/src/+/6418444 xref: https://chromium-review.googlesource.com/c/chromium/src/+/6383275 * build: update filenames.libcxx.gni * Use base::cstring_view in base::Environment https://chromium-review.googlesource.com/c/chromium/src/+/6494292 * Use getters to expose NativePixmapHandle from GpuMemoryBufferHandle https://chromium-review.googlesource.com/c/chromium/src/+/6374406 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
committed by
GitHub
parent
63114e2b8e
commit
2b07e6450c
@@ -18,6 +18,7 @@
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/path_service.h"
|
||||
#include "base/strings/cstring_view.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "components/content_settings/core/common/content_settings_pattern.h"
|
||||
@@ -81,8 +82,9 @@ namespace {
|
||||
|
||||
constexpr std::string_view kRelauncherProcess = "relauncher";
|
||||
|
||||
constexpr std::string_view kElectronDisableSandbox{"ELECTRON_DISABLE_SANDBOX"};
|
||||
constexpr std::string_view kElectronEnableStackDumping{
|
||||
constexpr base::cstring_view kElectronDisableSandbox{
|
||||
"ELECTRON_DISABLE_SANDBOX"};
|
||||
constexpr base::cstring_view kElectronEnableStackDumping{
|
||||
"ELECTRON_ENABLE_STACK_DUMPING"};
|
||||
|
||||
// Returns true if this subprocess type needs the ResourceBundle initialized
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "base/containers/fixed_flat_set.h"
|
||||
#include "base/environment.h"
|
||||
#include "base/feature_list.h"
|
||||
#include "base/strings/cstring_view.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/task/thread_pool/thread_pool_instance.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
@@ -85,12 +86,13 @@ void ExitIfContainsDisallowedFlags(const std::vector<std::string>& argv) {
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
// A list of node envs that may be used to inject scripts.
|
||||
const char* kHijackableEnvs[] = {"NODE_OPTIONS", "NODE_REPL_EXTERNAL_MODULE"};
|
||||
constexpr base::cstring_view kHijackableEnvs[] = {"NODE_OPTIONS",
|
||||
"NODE_REPL_EXTERNAL_MODULE"};
|
||||
|
||||
// Return true if there is any env in kHijackableEnvs.
|
||||
bool UnsetHijackableEnvs(base::Environment* env) {
|
||||
bool has = false;
|
||||
for (const char* name : kHijackableEnvs) {
|
||||
for (base::cstring_view name : kHijackableEnvs) {
|
||||
if (env->HasVar(name)) {
|
||||
env->UnSetVar(name);
|
||||
has = true;
|
||||
|
||||
Reference in New Issue
Block a user