chore: bump chromium to 100.0.4857.0 (main) (#32419)
* 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 buttons3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed3309164
* 3297868: hid: Add experimental HIDDevice.forget()3297868
* 3362491: [Extensions] Move i18n API to //extensions3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.3281481
* 3352616: [Gtk] Remove libgtk from the link-line3352616
* 3249211: Clear-Site-Data support for partitioned cookies3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method3354997
* 3287323: Add LacrosPrefStore for lacros settings3287323
* 3365916: [PA] Clean up remaining lazy commit code3365916
* [MPArch] Target the external protocol error at the responsible frame.3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories3350608
* Linux: Send OSCrypt raw encryption key to the Network Service3320484
* [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 umbrella3342428
* 3353974: Mac: Use base::Feature for overlay features3353974
* 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 macros3404768
* 3374762: Remove ignore_result.h3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x113378352
* 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 names3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc3388333
* fix windows build? i hope * patch gn visibility of //ui/ozone/platform/x11 * missing include base/logging.h * use BUILDFLAG for USE_NSS_CERTS3379123
* 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 nan3395880
* fix node test * fix nullptr in FindPdfFrame * patch perfetto to fix build issue on win-ia32bc44c3c753
* 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:
parent
e9a43be9be
commit
28ada6ea8b
279 changed files with 1681 additions and 2236 deletions
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue