mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* 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 in773054ad59* 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 commit05c43e4e5d. 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>
104 lines
3.5 KiB
Plaintext
104 lines
3.5 KiB
Plaintext
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/mac/dict_util.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
|
|
#include "base/json/json_writer.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/values.h"
|
|
|
|
namespace electron {
|
|
|
|
NSArray* ListValueToNSArray(const base::ListValue& value) {
|
|
const auto json = base::WriteJson(value);
|
|
if (!json.has_value())
|
|
return nil;
|
|
NSData* jsonData = [NSData dataWithBytes:json->data() length:json->size()];
|
|
id obj = [NSJSONSerialization JSONObjectWithData:jsonData
|
|
options:0
|
|
error:nil];
|
|
if (![obj isKindOfClass:[NSArray class]])
|
|
return nil;
|
|
return obj;
|
|
}
|
|
|
|
base::ListValue NSArrayToValue(NSArray* arr) {
|
|
base::ListValue result;
|
|
if (!arr)
|
|
return result;
|
|
|
|
for (id value in arr) {
|
|
if ([value isKindOfClass:[NSString class]]) {
|
|
result.Append(base::SysNSStringToUTF8(value));
|
|
} else if ([value isKindOfClass:[NSNumber class]]) {
|
|
const std::string_view objc_type = [value objCType];
|
|
if (objc_type == @encode(BOOL) || objc_type == @encode(char))
|
|
result.Append([value boolValue]);
|
|
else if (objc_type == @encode(double) || objc_type == @encode(float))
|
|
result.Append([value doubleValue]);
|
|
else
|
|
result.Append([value intValue]);
|
|
} else if ([value isKindOfClass:[NSArray class]]) {
|
|
result.Append(NSArrayToValue(value));
|
|
} else if ([value isKindOfClass:[NSDictionary class]]) {
|
|
result.Append(NSDictionaryToValue(value));
|
|
} else {
|
|
result.Append(base::SysNSStringToUTF8([value description]));
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
NSDictionary* DictionaryValueToNSDictionary(const base::DictValue& value) {
|
|
const auto json = base::WriteJson(value);
|
|
if (!json.has_value())
|
|
return nil;
|
|
NSData* jsonData = [NSData dataWithBytes:json->data() length:json->size()];
|
|
id obj = [NSJSONSerialization JSONObjectWithData:jsonData
|
|
options:0
|
|
error:nil];
|
|
if (![obj isKindOfClass:[NSDictionary class]])
|
|
return nil;
|
|
return obj;
|
|
}
|
|
|
|
base::DictValue NSDictionaryToValue(NSDictionary* dict) {
|
|
base::DictValue result;
|
|
if (!dict)
|
|
return result;
|
|
|
|
for (id key in dict) {
|
|
std::string str_key = base::SysNSStringToUTF8(
|
|
[key isKindOfClass:[NSString class]] ? key : [key description]);
|
|
|
|
id value = [dict objectForKey:key];
|
|
if ([value isKindOfClass:[NSString class]]) {
|
|
result.Set(str_key, base::Value(base::SysNSStringToUTF8(value)));
|
|
} else if ([value isKindOfClass:[NSNumber class]]) {
|
|
const std::string_view objc_type = [value objCType];
|
|
if (objc_type == @encode(BOOL) || objc_type == @encode(char))
|
|
result.Set(str_key, base::Value([value boolValue]));
|
|
else if (objc_type == @encode(double) || objc_type == @encode(float))
|
|
result.Set(str_key, base::Value([value doubleValue]));
|
|
else
|
|
result.Set(str_key, base::Value([value intValue]));
|
|
} else if ([value isKindOfClass:[NSArray class]]) {
|
|
result.Set(str_key, NSArrayToValue(value));
|
|
} else if ([value isKindOfClass:[NSDictionary class]]) {
|
|
result.Set(str_key, NSDictionaryToValue(value));
|
|
} else {
|
|
result.Set(str_key,
|
|
base::Value(base::SysNSStringToUTF8([value description])));
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace electron
|