mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 100.0.4857.0 (main) (#32419)

Browse source 
* chore: bump chromium in DEPS to 99.0.4819.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4824.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4827.0

* chore: update patches

* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons

3352511

* 3309164: webhid: Show FIDO devices in the chooser if allowed

3309164

* 3297868: hid: Add experimental HIDDevice.forget()

3297868

* 3362491: [Extensions] Move i18n API to //extensions

3362491

* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.

3281481

* 3352616: [Gtk] Remove libgtk from the link-line

3352616

* 3249211: Clear-Site-Data support for partitioned cookies

3249211

* [Extensions][COIL] Use [allow|block]list in //extensions/common

3372668

* Begin ScopedUserPrefUpdate migration to modern base::Value

3376154

* [Code Health] Refactor PrefService GetDict + GetList to use base::Value

3343526

* 3354997: [CodeHealth] Remove deprecated SetDictionary method

3354997

* 3287323: Add LacrosPrefStore for lacros settings

3287323

* 3365916: [PA] Clean up remaining lazy commit code

3365916

* [MPArch] Target the external protocol error at the responsible frame.

3011560

* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories

3350608

* Linux: Send OSCrypt raw encryption key to the Network Service

3320484

* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.

3359441

* chore: fixup for lint

* 3327621: Fix tablet mode detection for Win 11.

3327621

* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella

3342428

* 3353974: Mac: Use base::Feature for overlay features

3353974

* chore: bump chromium in DEPS to 99.0.4828.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4837.0

* chore: update patches

* chore: update patches

* 3379142: Drop FALLTHROUGH macro
Ref: 3379142

* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: 3381749

* chore: bump chromium in DEPS to 99.0.4839.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4840.0

* chore: bump chromium in DEPS to 99.0.4844.0

* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()

Ref: 3395881

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4845.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4847.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4849.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4851.0

* chore: bump chromium in DEPS to 100.0.4853.0

* update patches

* chore: update patches

* update patches

* 3383599: Fonts Access: Remove prototype that uses a font picker.

3383599

* 3404768: Remove ALLOW_UNUSED macros

3404768

* 3374762: Remove ignore_result.h

3374762

* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections

3399305

* 3402210: [Extensions] Don't trigger unload event for already unloaded extension

3402210

* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.

3410912

* 3370428: Make the AuthSchemes policy support dynamic refresh

3370428

* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value

3407603

* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11

3378352

* 3370810: Delete chrome/service, AKA the Cloud Print service process.

3370810

* chore: bump chromium in DEPS to 100.0.4855.0

* chore: update patches

* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.

* revert 3348007 to fix windows build

* 3318572: [Code health] Fix gn check errors in //extensions/browser:*

3318572

* fix printing.patch

* fix iwyu issue

* 3408515: win: Make ShorcutOperation an enum class and modernize names

3408515

* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc

3388333

* fix windows build? i hope

* patch gn visibility of //ui/ozone/platform/x11

* missing include base/logging.h

* use BUILDFLAG for USE_NSS_CERTS

3379123

* defined(OS_*) ==> BUILDFLAG(IS_*)

https://bugs.chromium.org/p/chromium/issues/detail?id=1234043

* fixup! 3404768: Remove ALLOW_UNUSED macros

* another attempt to fix windows build

* temporarily disable the custom scheme service worker test

https://github.com/electron/electron/issues/32664

* fix loading mv3 extensions

not sure what cl broke this unfort.

* fixup! 3404768: Remove ALLOW_UNUSED macros

* patch nan

3395880

* fix node test

* fix nullptr in FindPdfFrame

* patch perfetto to fix build issue on win-ia32

bc44c3c753

* fix build for linux-x64-testing-no-run-as-node

* fix patch

* skip <webview>.capturePage() test

https://github.com/electron/electron/issues/32705

* test: fix failing tests of focus/blur events of WebContents (#32711)

* inherit stdio from app module test child processes

this prevents them from timing out due to full stdout buffers

* test to see if we can get better logs on windows ci

* try again for appveyor log things

* skip contentTracing tests on ia32

* ci: disable gpu compositing

* drop applied patch

* fix merge fail

* Revert "ci: disable gpu compositing"

This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-02-09 18:58:52 -08:00 • committed by GitHub
parent e9a43be9be
commit 28ada6ea8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
279 changed files with 1681 additions and 2236 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/common/api/electron_api_clipboard.cc
View file

@ -56,7 +56,7 @@ std::string Clipboard::Read(const std::string& format_string) {
ui::ClipboardFormatType::CustomPlatformType(format_string));
bool rawFormatAvailable = clipboard->IsFormatAvailable(
rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr);
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
if (!rawFormatAvailable) {
rawFormatAvailable = clipboard->IsFormatAvailable(
rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr);
@ -72,7 +72,7 @@ std::string Clipboard::Read(const std::string& format_string) {
custom_format_names =
clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
/* data_dst = */ nullptr);
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
if (custom_format_names.find(format_string) == custom_format_names.end()) {
custom_format_names =
clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,
@ -150,7 +150,7 @@ std::u16string Clipboard::ReadText(gin_helper::Arguments* args) {
type, /* data_dst = */ nullptr)) {
clipboard->ReadText(type, /* data_dst = */ nullptr, &data);
} else {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::PlainTextAType(),
type,
/* data_dst = */ nullptr)) {
@ -249,7 +249,7 @@ void Clipboard::WriteImage(const gfx::Image& image,
}
}
#if !defined(OS_MAC)
#if !BUILDFLAG(IS_MAC)
void Clipboard::WriteFindText(const std::u16string& text) {}
std::u16string Clipboard::ReadFindText() {
return std::u16string();

24
shell/common/api/electron_api_native_image.cc
View file

@ -42,7 +42,7 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/image/image_util.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "base/win/scoped_gdi_object.h"
#include "shell/common/asar/archive.h"
#include "ui/gfx/icon_util.h"
@ -78,14 +78,14 @@ base::FilePath NormalizePath(const base::FilePath& path) {
}
}
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
bool IsTemplateFilename(const base::FilePath& path) {
return (base::MatchPattern(path.value(), "*Template.*") ||
base::MatchPattern(path.value(), "*Template@*x.*"));
}
#endif
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
// If file is in asar archive, we extract it to a temp file so LoadImage can
// load it.
@ -112,7 +112,7 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
AdjustAmountOfExternalAllocatedMemory(true);
}
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
: hicon_path_(hicon_path), isolate_(isolate) {
// Use the 256x256 icon as fallback icon.
@ -149,7 +149,7 @@ bool NativeImage::TryConvertNativeImage(v8::Isolate* isolate,
if (gin::ConvertFromV8(isolate, image, &icon_path)) {
*native_image = NativeImage::CreateFromPath(isolate, icon_path).get();
if ((*native_image)->image().IsEmpty()) {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
const auto img_path = base::WideToUTF8(icon_path.value());
#else
const auto img_path = icon_path.value();
@ -178,7 +178,7 @@ bool NativeImage::TryConvertNativeImage(v8::Isolate* isolate,
return true;
}
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
HICON NativeImage::GetHICON(int size) {
auto iter = hicons_.find(size);
if (iter != hicons_.end())
@ -287,7 +287,7 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
v8::Local<v8::Value> NativeImage::GetNativeHandle(
gin_helper::ErrorThrower thrower) {
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
if (IsEmpty())
return node::Buffer::New(thrower.isolate(), 0).ToLocalChecked();
@ -416,7 +416,7 @@ void NativeImage::AddRepresentation(const gin_helper::Dictionary& options) {
}
}
#if !defined(OS_MAC)
#if !BUILDFLAG(IS_MAC)
void NativeImage::SetTemplateImage(bool setAsTemplate) {}
bool NativeImage::IsTemplateImage() {
@ -460,7 +460,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate,
const base::FilePath& path) {
base::FilePath image_path = NormalizePath(path);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
return gin::CreateHandle(isolate, new NativeImage(isolate, image_path));
}
@ -469,7 +469,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromPath(
electron::util::PopulateImageSkiaRepsFromPath(&image_skia, image_path);
gfx::Image image(image_skia);
gin::Handle<NativeImage> handle = Create(isolate, image);
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
if (IsTemplateFilename(image_path))
handle->SetTemplateImage(true);
#endif
@ -566,7 +566,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromDataURL(v8::Isolate* isolate,
return CreateEmpty(isolate);
}
#if !defined(OS_MAC)
#if !BUILDFLAG(IS_MAC)
gin::Handle<NativeImage> NativeImage::CreateFromNamedImage(gin::Arguments* args,
std::string name) {
return CreateEmpty(args->isolate());
@ -637,7 +637,7 @@ void Initialize(v8::Local<v8::Object> exports,
native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL);
native_image.SetMethod("createFromNamedImage",
&NativeImage::CreateFromNamedImage);
#if !defined(OS_LINUX)
#if !BUILDFLAG(IS_LINUX)
native_image.SetMethod("createThumbnailFromPath",
&NativeImage::CreateThumbnailFromPath);
#endif

10
shell/common/api/electron_api_native_image.h
View file

@ -15,7 +15,7 @@
#include "shell/common/gin_helper/error_thrower.h"
#include "ui/gfx/image/image.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "base/files/file_path.h"
#include "base/win/scoped_gdi_object.h"
#endif
@ -46,7 +46,7 @@ namespace api {
class NativeImage : public gin::Wrappable<NativeImage> {
public:
NativeImage(v8::Isolate* isolate, const gfx::Image& image);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path);
#endif
~NativeImage() override;
@ -78,7 +78,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
const GURL& url);
static gin::Handle<NativeImage> CreateFromNamedImage(gin::Arguments* args,
std::string name);
#if !defined(OS_LINUX)
#if !BUILDFLAG(IS_LINUX)
static v8::Local<v8::Promise> CreateThumbnailFromPath(
v8::Isolate* isolate,
const base::FilePath& path,
@ -99,7 +99,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
v8::Isolate* isolate) override;
const char* GetTypeName() override;
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
HICON GetHICON(int size);
#endif
@ -128,7 +128,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
// Determine if the image is a template image.
bool IsTemplateImage();
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
base::FilePath hicon_path_;
std::map<int, base::win::ScopedHICON> hicons_;
#endif

15
shell/common/api/electron_api_shell.cc
View file

@ -14,7 +14,7 @@
#include "shell/common/node_includes.h"
#include "shell/common/platform_util.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "base/win/scoped_com_initializer.h"
#include "base/win/shortcut.h"
@ -29,11 +29,11 @@ struct Converter<base::win::ShortcutOperation> {
if (!ConvertFromV8(isolate, val, &operation))
return false;
if (operation.empty() || operation == "create")
*out = base::win::SHORTCUT_CREATE_ALWAYS;
*out = base::win::ShortcutOperation::kCreateAlways;
else if (operation == "update")
*out = base::win::SHORTCUT_UPDATE_EXISTING;
*out = base::win::ShortcutOperation::kUpdateExisting;
else if (operation == "replace")
*out = base::win::SHORTCUT_REPLACE_EXISTING;
*out = base::win::ShortcutOperation::kReplaceExisting;
else
return false;
return true;
@ -104,10 +104,11 @@ v8::Local<v8::Promise> TrashItem(v8::Isolate* isolate,
return handle;
}
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
bool WriteShortcutLink(const base::FilePath& shortcut_path,
gin_helper::Arguments* args) {
base::win::ShortcutOperation operation = base::win::SHORTCUT_CREATE_ALWAYS;
base::win::ShortcutOperation operation =
base::win::ShortcutOperation::kCreateAlways;
args->GetNext(&operation);
gin::Dictionary options = gin::Dictionary::CreateEmpty(args->isolate());
if (!args->GetNext(&options)) {
@ -173,7 +174,7 @@ void Initialize(v8::Local<v8::Object> exports,
dict.SetMethod("openExternal", &OpenExternal);
dict.SetMethod("trashItem", &TrashItem);
dict.SetMethod("beep", &platform_util::Beep);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
dict.SetMethod("writeShortcutLink", &WriteShortcutLink);
dict.SetMethod("readShortcutLink", &ReadShortcutLink);
#endif

12
shell/common/api/electron_bindings.cc
View file

@ -65,7 +65,7 @@ void ElectronBindings::BindProcess(v8::Isolate* isolate,
process->SetReadOnly("mas", true);
#endif
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
if (IsRunningInDesktopBridge())
process->SetReadOnly("windowsStore", true);
#endif
@ -77,7 +77,7 @@ void ElectronBindings::BindTo(v8::Isolate* isolate,
BindProcess(isolate, &dict, metrics_.get());
dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
#if defined(OS_POSIX)
#if BUILDFLAG(IS_POSIX)
dict.SetMethod("setFdLimit", &base::IncreaseFdLimitTo);
#endif
dict.SetMethod("activateUvLoop",
@ -190,7 +190,7 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
// See Chromium's "base/process/process_metrics.h" for an explanation.
int free =
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
mem_info.avail_phys;
#else
mem_info.free;
@ -198,7 +198,7 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
dict.Set("free", free);
// NB: These return bogus values on macOS
#if !defined(OS_MAC)
#if !BUILDFLAG(IS_MAC)
dict.Set("swapTotal", mem_info.swap_total);
dict.Set("swapFree", mem_info.swap_free);
#endif
@ -267,7 +267,7 @@ void ElectronBindings::DidReceiveMemoryDump(
if (target_pid == dump.pid()) {
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
const auto& osdump = dump.os_dump();
#if defined(OS_LINUX) || defined(OS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
dict.Set("residentSet", osdump.resident_set_kb);
#endif
dict.Set("private", osdump.private_footprint_kb);
@ -295,7 +295,7 @@ v8::Local<v8::Value> ElectronBindings::GetCPUUsage(
// NB: This will throw NOTIMPLEMENTED() on Windows
// For backwards compatibility, we'll return 0
#if !defined(OS_WIN)
#if !BUILDFLAG(IS_WIN)
dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
#else
dict.Set("idleWakeupsPerSecond", 0);

6
shell/common/application_info.h
View file

@ -5,7 +5,9 @@
#ifndef ELECTRON_SHELL_COMMON_APPLICATION_INFO_H_
#define ELECTRON_SHELL_COMMON_APPLICATION_INFO_H_
#if defined(OS_WIN)
#include "build/build_config.h"
#if BUILDFLAG(IS_WIN)
#include "shell/browser/win/scoped_hstring.h"
#endif
@ -23,7 +25,7 @@ std::string GetApplicationVersion();
// Returns the user agent of Electron.
std::string GetApplicationUserAgent();
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
PCWSTR GetRawAppUserModelID();
bool GetAppUserModelID(ScopedHString* app_id);
void SetAppUserModelID(const std::wstring& name);

18
shell/common/asar/archive.cc
View file

@ -22,7 +22,7 @@
#include "shell/common/asar/asar_util.h"
#include "shell/common/asar/scoped_temporary_file.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include <io.h>
#endif
@ -30,7 +30,7 @@ namespace asar {
namespace {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
const char kSeparators[] = "\\/";
#else
const char kSeparators[] = "/";
@ -124,7 +124,7 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
info->executable = executable.value();
}
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
if (load_integrity &&
electron::fuses::IsEmbeddedAsarIntegrityValidationEnabled()) {
if (auto* integrity = node->FindDictKey("integrity")) {
@ -178,15 +178,15 @@ Archive::Archive(const base::FilePath& path)
: initialized_(false), path_(path), file_(base::File::FILE_OK) {
base::ThreadRestrictions::ScopedAllowIO allow_io;
file_.Initialize(path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
fd_ = _open_osfhandle(reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0);
#elif defined(OS_POSIX)
#elif BUILDFLAG(IS_POSIX)
fd_ = file_.GetPlatformFile();
#endif
}
Archive::~Archive() {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
if (fd_ != -1) {
_close(fd_);
// Don't close the handle since we already closed the fd.
@ -247,7 +247,7 @@ bool Archive::Init() {
return false;
}
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
// Validate header signature if required and possible
if (electron::fuses::IsEmbeddedAsarIntegrityValidationEnabled() &&
RelativePath().has_value()) {
@ -285,7 +285,7 @@ bool Archive::Init() {
return true;
}
#if !defined(OS_MAC)
#if !BUILDFLAG(IS_MAC)
absl::optional<IntegrityPayload> Archive::HeaderIntegrity() const {
return absl::nullopt;
}
@ -400,7 +400,7 @@ bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
info.integrity))
return false;
#if defined(OS_POSIX)
#if BUILDFLAG(IS_POSIX)
if (info.executable) {
// chmod a+x temp_file;
base::SetPosixFilePermissions(temp_file->path(), 0755);

2
shell/common/asar/asar_util.cc
View file

@ -71,7 +71,7 @@ std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
// if we can create it, return it
auto archive = std::make_shared<Archive>(path);
if (archive->Init()) {
base::TryEmplace(map, lower, path, archive);
map.try_emplace(lower, path, archive);
return archive;
}

4
shell/common/asar/scoped_temporary_file.cc
View file

@ -21,7 +21,7 @@ ScopedTemporaryFile::~ScopedTemporaryFile() {
// On Windows it is very likely the file is already in use (because it is
// mostly used for Node native modules), so deleting it now will halt the
// program.
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
base::DeleteFileAfterReboot(path_);
#else
base::DeleteFile(path_);
@ -37,7 +37,7 @@ bool ScopedTemporaryFile::Init(const base::FilePath::StringType& ext) {
if (!base::CreateTemporaryFile(&path_))
return false;
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// Keep the original extension.
if (!ext.empty()) {
base::FilePath new_path = path_.AddExtension(ext);

12
shell/common/crash_keys.cc
View file

@ -29,7 +29,7 @@ namespace crash_keys {
namespace {
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// Breakpad has a flawed system of calculating the number of chunks
// we add 127 bytes to force an extra chunk
constexpr size_t kMaxCrashKeyValueSize = 20479;
@ -55,7 +55,7 @@ std::deque<std::string>& GetExtraCrashKeyNames() {
} // namespace
constexpr uint32_t kMaxCrashKeyNameLength = 40;
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
static_assert(kMaxCrashKeyNameLength <=
crash_reporter::internal::kCrashKeyStorageKeySize,
"max crash key name length above what breakpad supports");
@ -124,7 +124,7 @@ bool IsRunningAsNode() {
} // namespace
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
if (command_line.HasSwitch(switches::kGlobalCrashKeys)) {
std::vector<std::pair<std::string, std::string>> global_crash_keys;
base::SplitStringIntoKeyValuePairs(
@ -156,11 +156,11 @@ void SetPlatformCrashKey() {
// TODO(nornagon): this is redundant with the 'plat' key that
// //components/crash already includes. Remove it.
static crash_reporter::CrashKeyString<8> platform_key("platform");
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
platform_key.Set("win32");
#elif defined(OS_MAC)
#elif BUILDFLAG(IS_MAC)
platform_key.Set("darwin");
#elif defined(OS_LINUX)
#elif BUILDFLAG(IS_LINUX)
platform_key.Set("linux");
#else
platform_key.Set("unknown");

4
shell/common/electron_command_line.cc
View file

@ -18,7 +18,7 @@ void ElectronCommandLine::Init(int argc, base::CommandLine::CharType** argv) {
// NOTE: uv_setup_args does nothing on Windows, so we don't need to call it.
// Otherwise we'd have to convert the arguments from UTF16.
#if !defined(OS_WIN)
#if !BUILDFLAG(IS_WIN)
// Hack around with the argv pointer. Used for process.title = "blah"
argv = uv_setup_args(argc, argv);
#endif
@ -26,7 +26,7 @@ void ElectronCommandLine::Init(int argc, base::CommandLine::CharType** argv) {
argv_.assign(argv, argv + argc);
}
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// static
void ElectronCommandLine::InitializeFromCommandLine() {
argv_ = base::CommandLine::ForCurrentProcess()->argv();

2
shell/common/electron_command_line.h
View file

@ -22,7 +22,7 @@ class ElectronCommandLine {
static void Init(int argc, base::CommandLine::CharType** argv);
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// On Linux the command line has to be read from base::CommandLine since
// it is using zygote.
static void InitializeFromCommandLine();

14
shell/common/electron_paths.h
View file

@ -7,13 +7,13 @@
#include "base/base_paths.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "base/base_paths_win.h"
#elif defined(OS_MAC)
#elif BUILDFLAG(IS_MAC)
#include "base/base_paths_mac.h"
#endif
#if defined(OS_POSIX)
#if BUILDFLAG(IS_POSIX)
#include "base/base_paths_posix.h"
#endif
@ -25,11 +25,11 @@ enum {
DIR_USER_CACHE = PATH_START, // Directory where user cache can be written.
DIR_APP_LOGS, // Directory where app logs live
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
DIR_RECENT, // Directory where recent files live
#endif
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
DIR_APP_DATA, // Application Data directory under the user profile.
#endif
@ -37,9 +37,9 @@ enum {
PATH_END, // End of new paths. Those that follow redirect to base::DIR_*
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
DIR_APP_DATA = base::DIR_ROAMING_APP_DATA,
#elif defined(OS_MAC)
#elif BUILDFLAG(IS_MAC)
DIR_APP_DATA = base::DIR_APP_DATA,
#endif
};

2
shell/common/extensions/api/BUILD.gn
View file

@ -38,7 +38,6 @@ generated_json_strings("generated_api_json_strings") {
sources = [
"cryptotoken_private.idl",
"extension.json",
"i18n.json",
"resources_private.idl",
"tabs.json",
]
@ -56,7 +55,6 @@ generated_json_strings("generated_api_json_strings") {
generated_types("generated_api_types") {
sources = [
"cryptotoken_private.idl",
"i18n.json",
"resources_private.idl",
"tabs.json",
]

2
shell/common/extensions/electron_extensions_client.cc
View file

@ -131,7 +131,7 @@ const GURL& ElectronExtensionsClient::GetWebstoreUpdateURL() const {
return webstore_update_url_;
}
bool ElectronExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
bool ElectronExtensionsClient::IsBlocklistUpdateURL(const GURL& url) const {
return false;
}

2
shell/common/extensions/electron_extensions_client.h
View file

@ -51,7 +51,7 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient {
bool IsScriptableURL(const GURL& url, std::string* error) const override;
const GURL& GetWebstoreBaseURL() const override;
const GURL& GetWebstoreUpdateURL() const override;
bool IsBlacklistUpdateURL(const GURL& url) const override;
bool IsBlocklistUpdateURL(const GURL& url) const override;
private:
ScriptingAllowlist scripting_allowlist_;

2
shell/common/gin_converters/base_converter.h
View file

@ -29,7 +29,7 @@ struct Converter<base::TerminationStatus> {
return gin::ConvertToV8(isolate, "launch-failed");
case base::TERMINATION_STATUS_OOM:
return gin::ConvertToV8(isolate, "oom");
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
case base::TERMINATION_STATUS_INTEGRITY_FAILURE:
return gin::ConvertToV8(isolate, "integrity-failure");
#endif

8
shell/common/gin_converters/guid_converter.h
View file

@ -9,7 +9,7 @@
#include "gin/converter.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// c.f.:
// https://chromium-review.googlesource.com/c/chromium/src/+/3076480
// REFGUID is currently incorrectly inheriting its type
@ -27,7 +27,7 @@
#include "base/win/win_util.h"
#endif
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
typedef GUID UUID;
#else
typedef struct {
@ -41,7 +41,7 @@ struct Converter<UUID> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
UUID* out) {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
std::string guid;
if (!gin::ConvertFromV8(isolate, val, &guid))
return false;
@ -67,7 +67,7 @@ struct Converter<UUID> {
#endif
}
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, UUID val) {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
const GUID GUID_NULL = {};
if (val == GUID_NULL) {
return StringToV8(isolate, "");

6
shell/common/gin_converters/std_converter.h
View file

@ -11,7 +11,7 @@
#include "gin/converter.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "base/strings/string_util_win.h"
#endif
@ -24,7 +24,7 @@ v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate, T&& input) {
isolate, std::forward<T>(input));
}
#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
#if !BUILDFLAG(IS_LINUX) && !defined(OS_FREEBSD)
template <>
struct Converter<unsigned long> { // NOLINT(runtime/int)
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@ -186,7 +186,7 @@ struct Converter<std::map<K, V>> {
}
};
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
template <>
struct Converter<std::wstring> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,

6
shell/common/gin_helper/callback.h
View file

@ -50,7 +50,7 @@ struct V8FunctionInvoker<v8::Local<v8::Value>(ArgTypes...)> {
return v8::Null(isolate);
gin_helper::MicrotasksScope microtasks_scope(isolate, true);
v8::Local<v8::Function> holder = function.NewHandle(isolate);
v8::Local<v8::Context> context = holder->CreationContext();
v8::Local<v8::Context> context = holder->GetCreationContextChecked();
v8::Context::Scope context_scope(context);
std::vector<v8::Local<v8::Value>> args{
gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};
@ -74,7 +74,7 @@ struct V8FunctionInvoker<void(ArgTypes...)> {
return;
gin_helper::MicrotasksScope microtasks_scope(isolate, true);
v8::Local<v8::Function> holder = function.NewHandle(isolate);
v8::Local<v8::Context> context = holder->CreationContext();
v8::Local<v8::Context> context = holder->GetCreationContextChecked();
v8::Context::Scope context_scope(context);
std::vector<v8::Local<v8::Value>> args{
gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};
@ -97,7 +97,7 @@ struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
return ret;
gin_helper::MicrotasksScope microtasks_scope(isolate, true);
v8::Local<v8::Function> holder = function.NewHandle(isolate);
v8::Local<v8::Context> context = holder->CreationContext();
v8::Local<v8::Context> context = holder->GetCreationContextChecked();
v8::Context::Scope context_scope(context);
std::vector<v8::Local<v8::Value>> args{
gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};

44
shell/common/keyboard_util.cc
View file

@ -25,7 +25,7 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(
str == "meta") {
return ui::VKEY_COMMAND;
} else if (str == "commandorcontrol" || str == "cmdorctrl") {
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
return ui::VKEY_COMMAND;
#else
return ui::VKEY_CONTROL;
@ -210,108 +210,108 @@ ui::KeyboardCode KeyboardCodeFromCharCode(char16_t c, bool* shifted) {
case ')':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '0':
return ui::VKEY_0;
case '!':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '1':
return ui::VKEY_1;
case '@':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '2':
return ui::VKEY_2;
case '#':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '3':
return ui::VKEY_3;
case '$':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '4':
return ui::VKEY_4;
case '%':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '5':
return ui::VKEY_5;
case '^':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '6':
return ui::VKEY_6;
case '&':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '7':
return ui::VKEY_7;
case '*':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '8':
return ui::VKEY_8;
case '(':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '9':
return ui::VKEY_9;
case ':':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case ';':
return ui::VKEY_OEM_1;
case '+':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '=':
return ui::VKEY_OEM_PLUS;
case '<':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case ',':
return ui::VKEY_OEM_COMMA;
case '_':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '-':
return ui::VKEY_OEM_MINUS;
case '>':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '.':
return ui::VKEY_OEM_PERIOD;
case '?':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '/':
return ui::VKEY_OEM_2;
case '~':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '`':
return ui::VKEY_OEM_3;
case '{':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '[':
return ui::VKEY_OEM_4;
case '|':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '\\':
return ui::VKEY_OEM_5;
case '}':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case ']':
return ui::VKEY_OEM_6;
case '"':
*shifted = true;
FALLTHROUGH;
[[fallthrough]];
case '\'':
return ui::VKEY_OEM_7;

11
shell/common/logging.cc
View file

@ -67,6 +67,15 @@ LoggingDestination DetermineLoggingDestination(
if (!enable_logging)
return LOG_NONE;
bool also_log_to_stderr = false;
#if !defined(NDEBUG)
std::string also_log_to_stderr_str;
if (base::Environment::Create()->GetVar("ELECTRON_ALSO_LOG_TO_STDERR",
&also_log_to_stderr_str) &&
!also_log_to_stderr_str.empty())
also_log_to_stderr = true;
#endif
// --enable-logging logs to stderr, --enable-logging=file logs to a file.
// NB. this differs from Chromium, in which --enable-logging logs to a file
// and --enable-logging=stderr logs to stderr, because that's how Electron
@ -82,7 +91,7 @@ LoggingDestination DetermineLoggingDestination(
// given.
if (HasExplicitLogFile(command_line) ||
(logging_destination == "file" && !is_preinit))
return LOG_TO_FILE;
return LOG_TO_FILE | (also_log_to_stderr ? LOG_TO_STDERR : 0);
return LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR;
}

12
shell/common/node_bindings.cc
View file

@ -221,7 +221,7 @@ void SetNodeCliFlags() {
args.emplace_back("electron");
for (const auto& arg : argv) {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
const auto& option = base::WideToUTF8(arg);
#else
const auto& option = arg;
@ -301,7 +301,7 @@ namespace electron {
namespace {
base::FilePath GetResourcesPath() {
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
return MainApplicationBundlePath().Append("Contents").Append("Resources");
#else
auto* command_line = base::CommandLine::ForCurrentProcess();
@ -367,7 +367,7 @@ void NodeBindings::Initialize() {
// Open node's error reporting system for browser process.
node::g_upstream_node_mode = false;
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// Get real command line in renderer process forked by zygote.
if (browser_env_ != BrowserEnvironment::kBrowser)
ElectronCommandLine::InitializeFromCommandLine();
@ -396,7 +396,7 @@ void NodeBindings::Initialize() {
if (exit_code != 0)
exit(exit_code);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// uv_init overrides error mode to suppress the default crash dialog, bring
// it back if user wants to show it.
if (browser_env_ == BrowserEnvironment::kBrowser ||
@ -410,7 +410,7 @@ void NodeBindings::Initialize() {
node::Environment* NodeBindings::CreateEnvironment(
v8::Handle<v8::Context> context,
node::MultiIsolatePlatform* platform) {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
auto& atom_args = ElectronCommandLine::argv();
std::vector<std::string> args(atom_args.size());
std::transform(atom_args.cbegin(), atom_args.cend(), args.begin(),
@ -574,7 +574,7 @@ void NodeBindings::LoadEnvironment(node::Environment* env) {
}
void NodeBindings::PrepareMessageLoop() {
#if !defined(OS_WIN)
#if !BUILDFLAG(IS_WIN)
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.

2
shell/common/node_bindings.h
View file

@ -161,7 +161,7 @@ class NodeBindings {
// Isolate data used in creating the environment
node::IsolateData* isolate_data_ = nullptr;
#if !defined(OS_WIN)
#if !BUILDFLAG(IS_WIN)
int handle_ = -1;
#endif

6
shell/common/platform_util.h
View file

@ -42,17 +42,17 @@ void TrashItem(const base::FilePath& full_path,
void Beep();
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// SHGetFolderPath calls not covered by Chromium
bool GetFolderPath(int key, base::FilePath* result);
#endif
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
bool GetLoginItemEnabled();
bool SetLoginItemEnabled(bool enabled);
#endif
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// Returns a success flag.
// Unlike libgtkui, does *not* use "chromium-browser.desktop" as a fallback.
bool GetDesktopName(std::string* setme);

1
shell/common/platform_util_linux.cc
View file

@ -14,6 +14,7 @@
#include "base/containers/contains.h"
#include "base/environment.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/nix/xdg_util.h"
#include "base/no_destructor.h"
#include "base/posix/eintr_wrapper.h"

4
shell/common/skia_util.cc
View file

@ -23,7 +23,7 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/image/image_util.h"
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
#include "ui/gfx/icon_util.h"
#endif
@ -151,7 +151,7 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
image, path.InsertBeforeExtensionASCII(pair.name), pair.scale);
return succeed;
}
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);

2
shell/common/skia_util.h
View file

@ -37,7 +37,7 @@ bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
size_t size,
double scale_factor);
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon);
#endif