github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 146.0.7666.0 (main) (#49528)

Browse Source 
* chore: bump chromium in DEPS to 146.0.7652.0

* fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method

The upstream CL added a new constrainFrameRect:toScreen: method override to
NativeWidgetMacNSWindow as part of headless mode window zoom implementation.
The MAS patch's #endif for frameViewClassForStyleMask now correctly appears
after that method, since constrainFrameRect is a public API override that
doesn't need to be guarded.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666

* fix(patch-conflict): update printing.patch for base::DictValue rename

Updated printing.patch to use the new base::DictValue type name instead of
base::Value::Dict following Chromium's type renaming change. This affects
CompleteUpdatePrintSettings() signature and related code.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820

* fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename

Updated adjust_accessibility_ui_for_electron.patch to use the new
base::DictValue and base::ListValue type names instead of base::Value::Dict
and base::Value::List following Chromium's type renaming change.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820

* chore: update patches

* 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736

* chore: bump chromium in DEPS to 146.0.7653.0

* chore: update patches

* 7000847: add type tag to v8::External for gin_helper function templates

The upstream gin function templates now use v8::ExternalPointerTypeTag
for type safety when using v8::External. Updated Electron's forked
gin_helper function template to use the same kGinInternalCallbackHolderBaseTag
that Chromium's gin uses.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847

* fix(patch-update): extend V8 Object API deprecation patch for Node.js

Extended the existing patch to cover additional files that use
GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField:
- src/stream_base-inl.h
- src/udp_wrap.cc
- src/js_udp_wrap.cc
- src/node_process_methods.cc
- src/node_snapshotable.cc
- src/base_object.cc

These APIs now require an EmbedderDataTypeTag parameter.

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956

* 7000847: add type tag to v8::External calls in shared_texture

Updated v8::External::New and v8::External::Value calls to use the
kExternalPointerTypeTagDefault tag as required by the V8 API change
that deprecates the tagless versions.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847

* 7508687: use ChildProcessId for file permission APIs

The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs
now require ChildProcessId instead of int. Updated to use GetID()
instead of GetDeprecatedID() for these specific calls.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687

* 7000847: add type tag to v8::External calls in callback and osr_converter

The v8::External API now requires an EmbedderPointerTypeTag parameter
for both New() and Value() methods to improve V8 sandbox type safety.

Updated calls in:
- callback.cc: TranslatorHolder constructor and CallTranslator
- osr_converter.cc: OffscreenSharedTextureValue converter

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847

* fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods

Extended the Node.js patch to cover histogram.cc which also uses
SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField
APIs that now require the EmbedderDataTypeTag parameter.

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956

* chore: bump chromium in DEPS to 146.0.7655.0

* chore: update patches

* 7509043: update WebSpellingMarker type for API change

The upstream Chromium API changed - WebSpellingMarker was moved from a
nested type within WebTextCheckClient to a standalone type in the blink
namespace.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043

* 7498491: update process_id to use OriginatingProcess type

The upstream Chromium API changed - URLLoaderFactoryParams::process_id
was changed from an integer to a union type network::OriginatingProcess
that distinguishes between browser and renderer processes.

- For browser process requests, use OriginatingProcess::browser()
- For renderer process lookups, check !is_browser() and use
  renderer_process().value() to get the child_id

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491

* 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330

5710330 added a new NSNextStepFrame interface extension and
implementations for NativeWidgetMacNSWindowTitledFrame and
NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs
that are not available in Mac App Store builds.

* chore: update patches

* chore: bump chromium in DEPS to 146.0.7661.0

* chore: bump chromium in DEPS to 146.0.7663.0

* fix(patch-conflict): update accessibility_ui for string_view API change

Upstream removed redundant std::string(default_api_type) conversion as part
of a string_view optimization cleanup. Updated patch context to match.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107

* fix(patch-conflict): update service process launch options for sandbox API refactor

Upstream removed content/common/sandbox_init_win.cc and
content/public/common/sandbox_init_win.h, moving the functionality directly
into ChildProcessLauncherHelper. Updated patch to call
sandbox::policy::SandboxWin::StartSandboxedProcess directly with the
LaunchOptions pointer instead of going through the removed helper.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253

* fix(patch-conflict): update MAS safestorage for keychain API refactor

Upstream refactored KeychainPassword::GetPassword() to use a new
GetPasswordImpl() helper function with improved error tracking via
base::expected<std::string, OSStatus>. Adapted patch to use the new
GetPasswordImpl with the suffixed account name and handle migration
from legacy accounts through the new API.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438

* chore: update patches

* chore: bump chromium in DEPS to 146.0.7663.0

* fix: base::Value::Dict -> base::DictValue
https://chromium-review.googlesource.com/c/chromium/src/+/7513889

* fix: include new cookie exclusion reason
https://chromium-review.googlesource.com/c/chromium/src/+/7486527

* fix: enable libc++ ABI flag for trivially copyable std::vector<bool>

Required for changes introduced in the following CL
https://chromium-review.googlesource.com/c/chromium/src/+/7513653

* fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889

* fix: spellcheck not working in tests
https://chromium-review.googlesource.com/c/chromium/src/+/7452579

* fix: cookie test failing due to multiple rejection reasons
https://chromium-review.googlesource.com/c/chromium/src/+/7506629

* fix: macos sizing unmaximized window incorrectly
https://chromium-review.googlesource.com/c/chromium/src/+/7487666

Changes to headless mode caused the unmaximized window to subtract
the height of the menubar.

* fix: skip tests for incompatible BoringSSL ML-DSA crypto
https://boringssl-review.googlesource.com/c/boringssl/+/84929

* test: fix pseudonymization registration in utility process on Linux

Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913

* fix: restore MAS patch-outs

Restores some `#if !IS_MAS_BUILD()` gates dropped in 773054ad59

* fixup! 7508687: use ChildProcessId for file permission APIs

* fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor

* chore: add note about parallel upstream change

* fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main

* Revert "fixup! 7508687: use ChildProcessId for file permission APIs"

This reverts commit 05c43e4e5d.

The _impl version has the signature, but not the public interface. :oof:

* fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
Co-authored-by: clavin <clavin@electronjs.org>
This commit is contained in:
electron-roller[bot]
2026-02-12 12:37:56 -05:00
committed by GitHub
parent e9faa14cc0
commit a65cfed500
180 changed files with 1195 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/browser/ui/cocoa/electron_ns_window.mm
View File

@@ -320,7 +320,7 @@ void SwizzleSwipeWithEvent(NSView* view, SEL swiz_selector) {
}
- (void)disableHeadlessMode {
if (shell_) {
if (shell_ && self.isHeadless) {
// We initialize the window in headless mode to allow painting before it is
// shown, but we don't want the headless behavior of allowing the window to
// be placed unconstrained.

10
shell/browser/ui/cocoa/electron_touch_bar.mm
View File

@@ -254,7 +254,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
NSColor* color = ((NSColorPickerTouchBarItem*)sender).color;
std::string hex_color =
electron::ToRGBHex(skia::NSDeviceColorToSkColor(color));
base::Value::Dict details;
base::DictValue details;
details.Set("color", hex_color);
window_->NotifyTouchBarItemInteraction([item_id UTF8String],
std::move(details));
@@ -264,7 +264,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
NSString* identifier = ((NSSliderTouchBarItem*)sender).identifier;
NSString* item_id = [self idFromIdentifier:identifier
withPrefix:SliderIdentifier];
base::Value::Dict details;
base::DictValue details;
details.Set("value", [((NSSliderTouchBarItem*)sender).slider intValue]);
window_->NotifyTouchBarItemInteraction([item_id UTF8String],
std::move(details));
@@ -278,7 +278,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
- (void)segmentedControlAction:(id)sender {
NSString* item_id =
[NSString stringWithFormat:@"%ld", ((NSSegmentedControl*)sender).tag];
base::Value::Dict details;
base::DictValue details;
details.Set("selectedIndex",
static_cast<int>(((NSSegmentedControl*)sender).selectedSegment));
details.Set(
@@ -291,7 +291,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
- (void)scrubber:(NSScrubber*)scrubber
didSelectItemAtIndex:(NSInteger)selectedIndex {
base::Value::Dict details;
base::DictValue details;
details.Set("selectedIndex", static_cast<int>(selectedIndex));
details.Set("type", "select");
window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String],
@@ -300,7 +300,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
- (void)scrubber:(NSScrubber*)scrubber
didHighlightItemAtIndex:(NSInteger)highlightedIndex {
base::Value::Dict details;
base::DictValue details;
details.Set("highlightedIndex", static_cast<int>(highlightedIndex));
details.Set("type", "highlight");
window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String],

24
shell/browser/ui/inspectable_web_contents.cc
View File

@@ -96,15 +96,15 @@ constexpr std::string_view kTitleFormat = "Developer Tools - %s";
const size_t kMaxMessageChunkSize = IPC::mojom::kChannelMaximumMessageSize / 4;
base::Value::Dict RectToDictionary(const gfx::Rect& bounds) {
return base::Value::Dict{}
base::DictValue RectToDictionary(const gfx::Rect& bounds) {
return base::DictValue{}
.Set("x", bounds.x())
.Set("y", bounds.y())
.Set("width", bounds.width())
.Set("height", bounds.height());
}
gfx::Rect DictionaryToRect(const base::Value::Dict& dict) {
gfx::Rect DictionaryToRect(const base::DictValue& dict) {
return gfx::Rect{dict.FindInt("x").value_or(0), dict.FindInt("y").value_or(0),
dict.FindInt("width").value_or(800),
dict.FindInt("height").value_or(600)};
@@ -269,7 +269,7 @@ class InspectableWebContents::NetworkResourceLoader
"statusCode", response_headers_ ? response_headers_->response_code()
: net::HTTP_OK);
base::Value::Dict headers;
base::DictValue headers;
size_t iterator = 0;
std::string name;
std::string value;
@@ -490,7 +490,7 @@ void InspectableWebContents::CallClientFunction(
if (!GetDevToolsWebContents())
return;
base::Value::List arguments;
base::ListValue arguments;
if (!arg1.is_none()) {
arguments.Append(std::move(arg1));
if (!arg2.is_none()) {
@@ -550,7 +550,7 @@ void InspectableWebContents::LoadCompleted() {
}
} else {
if (dock_state_.empty()) {
const base::Value::Dict& prefs =
const base::DictValue& prefs =
pref_service_->GetDict(kDevToolsPreferences);
const std::string* current_dock_state =
prefs.FindString("currentDockState");
@@ -597,7 +597,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
if (!registry)
return;
base::Value::List results;
base::ListValue results;
for (auto& extension : registry->enabled_extensions()) {
auto devtools_page_url =
extensions::chrome_manifest_urls::GetDevToolsPage(extension.get());
@@ -611,7 +611,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
web_contents_->GetPrimaryMainFrame()->GetProcess()->GetDeprecatedID(),
url::Origin::Create(extension->url()));
base::Value::Dict extension_info;
base::DictValue extension_info;
extension_info.Set("startPage", devtools_page_url.spec());
extension_info.Set("name", extension->name());
extension_info.Set("exposeExperimentalAPIs",
@@ -864,7 +864,7 @@ void InspectableWebContents::GetSyncInformation(DispatchCallback callback) {
}
void InspectableWebContents::GetHostConfig(DispatchCallback callback) {
base::Value::Dict response_dict;
base::DictValue response_dict;
base::Value response = base::Value(std::move(response_dict));
std::move(callback).Run(&response);
}
@@ -875,7 +875,7 @@ void InspectableWebContents::RegisterExtensionsAPI(const std::string& origin,
}
void InspectableWebContents::HandleMessageFromDevToolsFrontend(
base::Value::Dict message) {
base::DictValue message) {
// TODO(alexeykuzmin): Should we expect it to exist?
if (!embedder_message_dispatcher_) {
return;
@@ -889,8 +889,8 @@ void InspectableWebContents::HandleMessageFromDevToolsFrontend(
return;
}
const base::Value::List no_params;
const base::Value::List& params_list =
const base::ListValue no_params;
const base::ListValue& params_list =
params != nullptr && params->is_list() ? params->GetList() : no_params;
const int id = message.FindInt(kFrontendHostId).value_or(0);

2
shell/browser/ui/inspectable_web_contents.h
View File

@@ -201,7 +201,7 @@ class InspectableWebContents
const DevToolsDispatchHttpRequestParams& params) override {}
// content::DevToolsFrontendHostDelegate:
void HandleMessageFromDevToolsFrontend(base::Value::Dict message);
void HandleMessageFromDevToolsFrontend(base::DictValue message);
// content::DevToolsAgentHostClient:
void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,

38
shell/browser/ui/webui/accessibility_ui.cc
View File

@@ -94,7 +94,7 @@ constexpr std::string_view kWeb = "web";
static const char kDetectedATName[] = "detectedATName";
static const char kIsScreenReaderActive[] = "isScreenReaderActive";
base::Value::Dict BuildTargetDescriptor(
base::DictValue BuildTargetDescriptor(
const GURL& url,
const std::string& name,
const GURL& favicon_url,
@@ -102,7 +102,7 @@ base::Value::Dict BuildTargetDescriptor(
int routing_id,
ui::AXMode accessibility_mode,
base::ProcessHandle handle = base::kNullProcessHandle) {
base::Value::Dict target_data;
base::DictValue target_data;
target_data.Set(kProcessIdField, process_id);
target_data.Set(kRoutingIdField, routing_id);
target_data.Set(kUrlField, url.spec());
@@ -115,7 +115,7 @@ base::Value::Dict BuildTargetDescriptor(
return target_data;
}
base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
base::DictValue BuildTargetDescriptor(content::RenderViewHost* rvh) {
content::WebContents* web_contents =
content::WebContents::FromRenderViewHost(rvh);
ui::AXMode accessibility_mode;
@@ -143,8 +143,8 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
rvh->GetRoutingID(), accessibility_mode);
}
base::Value::Dict BuildTargetDescriptor(electron::NativeWindow* window) {
base::Value::Dict target_data;
base::DictValue BuildTargetDescriptor(electron::NativeWindow* window) {
base::DictValue target_data;
target_data.Set(kSessionIdField, window->window_id());
target_data.Set(kNameField, window->GetTitle());
target_data.Set(kTypeField, kBrowser);
@@ -157,7 +157,7 @@ bool ShouldHandleAccessibilityRequestCallback(const std::string& path) {
// Sets boolean values in `data` for each bit in `new_ax_mode` that differs from
// that in `last_ax_mode`. Returns `true` if `data` was modified.
void SetProcessModeBools(ui::AXMode ax_mode, base::Value::Dict& data) {
void SetProcessModeBools(ui::AXMode ax_mode, base::DictValue& data) {
data.Set(kNative, ax_mode.has_mode(ui::AXMode::kNativeAPIs));
data.Set(kWeb, ax_mode.has_mode(ui::AXMode::kWebContents));
data.Set(kText, ax_mode.has_mode(ui::AXMode::kInlineTextBoxes));
@@ -170,7 +170,7 @@ void SetProcessModeBools(ui::AXMode ax_mode, base::Value::Dict& data) {
#if BUILDFLAG(IS_WIN)
// Sets values in `data` for the platform node counts in `counts`.
void SetNodeCounts(const ui::AXPlatformNodeWin::Counts& counts,
base::Value::Dict& data) {
base::DictValue& data) {
data.Set("dormantCount", base::NumberToString(counts.dormant_nodes));
data.Set("liveCount", base::NumberToString(counts.live_nodes));
data.Set("ghostCount", base::NumberToString(counts.ghost_nodes));
@@ -186,7 +186,7 @@ void HandleAccessibilityRequestCallback(
auto& browser_accessibility_state =
*content::BrowserAccessibilityState::GetInstance();
base::Value::Dict data;
base::DictValue data;
PrefService* pref =
static_cast<electron::ElectronBrowserContext*>(current_context)->prefs();
ui::AXMode mode =
@@ -226,7 +226,7 @@ void HandleAccessibilityRequestCallback(
// is checked.
data.Set(
kLockedPlatformModes,
base::Value::Dict()
base::DictValue()
.Set(kNative,
allow_platform_activation && native &&
initial_process_mode.has_mode(ui::AXMode::kNativeAPIs))
@@ -252,7 +252,7 @@ void HandleAccessibilityRequestCallback(
std::vector<ui::AXApiType::Type> supported_api_types =
content::AXInspectFactory::SupportedApis();
base::Value::List supported_api_list;
base::ListValue supported_api_list;
supported_api_list.reserve(supported_api_types.size());
for (ui::AXApiType::Type type : supported_api_types) {
supported_api_list.Append(std::string_view(type));
@@ -274,7 +274,7 @@ void HandleAccessibilityRequestCallback(
data.Set(kLocked, !browser_accessibility_state.IsAXModeChangeAllowed());
base::Value::List page_list;
base::ListValue page_list;
std::unique_ptr<content::RenderWidgetHostIterator> widget_iter(
content::RenderWidgetHost::GetRenderWidgetHosts());
@@ -305,7 +305,7 @@ void HandleAccessibilityRequestCallback(
continue;
}
base::Value::Dict descriptor = BuildTargetDescriptor(rvh);
base::DictValue descriptor = BuildTargetDescriptor(rvh);
descriptor.Set(kNative, native);
descriptor.Set(kExtendedProperties, extended_properties);
descriptor.Set(kScreenReader, screen_reader);
@@ -314,7 +314,7 @@ void HandleAccessibilityRequestCallback(
}
data.Set(kPagesField, std::move(page_list));
base::Value::List window_list;
base::ListValue window_list;
for (auto* window : electron::WindowList::GetWindows()) {
window_list.Append(BuildTargetDescriptor(window));
}
@@ -420,7 +420,7 @@ ElectronAccessibilityUIMessageHandler::ElectronAccessibilityUIMessageHandler()
base::Unretained(this))) {}
void ElectronAccessibilityUIMessageHandler::GetRequestTypeAndFilters(
const base::Value::Dict& data,
const base::DictValue& data,
std::string& request_type,
std::string& allow,
std::string& allow_empty,
@@ -433,8 +433,8 @@ void ElectronAccessibilityUIMessageHandler::GetRequestTypeAndFilters(
}
void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
const base::Value::List& args) {
const base::Value::Dict& data = args.front().GetDict();
const base::ListValue& args) {
const base::DictValue& data = args.front().GetDict();
std::string request_type, allow, allow_empty, deny;
GetRequestTypeAndFilters(data, request_type, allow, allow_empty, deny);
@@ -451,7 +451,7 @@ void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
for (auto* window : electron::WindowList::GetWindows()) {
if (window->window_id() == window_id) {
base::Value::Dict result = BuildTargetDescriptor(window);
base::DictValue result = BuildTargetDescriptor(window);
gfx::NativeWindow native_window = window->GetNativeWindow();
ui::AXPlatformNode* node =
ui::AXPlatformNode::FromNativeWindow(native_window);
@@ -463,7 +463,7 @@ void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
}
// No browser with the specified |id| was found.
base::Value::Dict result;
base::DictValue result;
result.Set(kSessionIdField, window_id);
result.Set(kTypeField, kBrowser);
result.Set(kErrorField, "Window no longer exists.");
@@ -533,7 +533,7 @@ void ElectronAccessibilityUIMessageHandler::OnVisibilityChanged(
void ElectronAccessibilityUIMessageHandler::OnUpdateDisplayTimer() {
// Collect the current state.
base::Value::Dict data;
base::DictValue data;
SetProcessModeBools(
content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode(),

7
shell/browser/ui/webui/accessibility_ui.h
View File

@@ -34,12 +34,13 @@ class ElectronAccessibilityUIMessageHandler
static void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry);
private:
void GetRequestTypeAndFilters(const base::Value::Dict& data,
void GetRequestTypeAndFilters(const base::DictValue& data,
std::string& request_type,
std::string& allow,
std::string& allow_empty,
std::string& deny);
void RequestNativeUITree(const base::Value::List& args);
void RequestNativeUITree(const base::ListValue& args);
// content::WebContentsObserver:
void OnVisibilityChanged(content::Visibility visibility) override;
@@ -49,7 +50,7 @@ class ElectronAccessibilityUIMessageHandler
void OnUpdateDisplayTimer();
// The last data for display sent to the UI by OnUpdateDisplayTimer.
base::Value::Dict last_data_;
base::DictValue last_data_;
// A timer that runs while the UI is visible to call OnUpdateDisplayTimer.
base::RepeatingTimer update_display_timer_;