cc01272a8d
* chore: bump chromium in DEPS to 95.0.4630.0 * 3133701: Fix chrome root store codegen for cross-compile builds. https://chromium-review.googlesource.com/c/chromium/src/+/3133701 * 49125: Include SHA512-256 in EVP_get_digestbyname and EVP_MD_do_all. https://boringssl-review.googlesource.com/c/boringssl/+/49125 * chore: fixup patch indices * 3131662: [Code Health] Remove ListValue::Append(Integer|Boolean) https://chromium-review.googlesource.com/c/chromium/src/+/3131662 * chore: bump chromium in DEPS to 95.0.4631.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4635.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4636.0 * chore: bump chromium in DEPS to 95.0.4637.0 * chore: update patches * refactor: move PlatformNotificationService into BrowserContext Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3137256 * refactor: ListValue::GetSize and ListValue::AppendString were removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * chore: bump chromium in DEPS to 95.0.4638.0 * chore: bump chromium in DEPS to 95.0.4638.4 * chore: bump chromium in DEPS to 96.0.4640.0 * chore: bump chromium in DEPS to 96.0.4641.0 * chore: bump chromium in DEPS to 96.0.4642.0 * chore: update patches Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> * 3134756: Move extensions/browser/value_store to components/value_store. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3134756 * 3150092: [Autofill] Allow aligning Autofill suggestions to the field's center Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3150092 * chore: bump chromium in DEPS to 96.0.4643.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4644.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4645.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4646.0 * chore: bump chromium in DEPS to 96.0.4647.0 * chore: update patches Ref (for chromium): https://chromium-review.googlesource.com/c/chromium/src/+/3165772 * 3162087: Reland "Ensure Branch Target Identification is enabled for executable pages." Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3162087 * chore: update evert_add_inline_and_inline_origin_records_to_symbol_file.patch Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166678 Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166674 * chore: update Allocator construction Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3135195 Change RefCount::kAllowed/Disallowed semantics into BackupRefPtr::kEnabled/Disabled * chore: add UseConfigurablePool to v8::ArrayBuffer::Allocator invocation Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3090845 * chore: do not set network_context_params.context_name Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3155743 Remove name field from mojom::NetworkContext * fix: use ForEachRenderFrameHost to iterate frames. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3163336 New implementation partially cribbed from https://source.chromium.org/chromium/chromium/src/+/main:extensions/browser/script_executor.cc;drc=f894f106c6d5fac8e0b75158f622256e0f34f593;l=109 * [Blink Cleanup] Remove WebLocalFrame::RequestExecuteScriptAndReturnValue() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3149699 ExecuteJavaScript's RequestExecuteScript() new params are cribbed from https://chromium-review.googlesource.com/c/chromium/src/+/3149699/4/third_party/blink/renderer/core/frame/web_local_frame_impl.cc * Remove IsDescendantOf API on RenderFrameHost. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3165357 function is trivial to implement, so make a local copy in anon namespace * Rewrite IsDescendantOf check to check GetParentOrOuterDocument. https://chromium-review.googlesource.com/c/chromium/src/+/3160061 * Remove GetFramesInSubtree from RenderFrameHost https://chromium-review.googlesource.com/c/chromium/src/+/3163336 * fix: dump_syms for macOS * chore: update patches * [Code Health] Remove ListValue::AppendString and ListValue::GetSize https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * fix: gn check https://chromium-review.googlesource.com/c/chromium/src/+/3163890 * fix: crash with Isolate::GetHeapCodeAndMetadataStatistics https://chromium-review.googlesource.com/c/v8/v8/+/3175820 * chore: update patches * chore: fix windows build * Add kPrintWithPostScriptType42Fonts feature. https://chromium-review.googlesource.com/c/chromium/src/+/3150776 * chore: update patches * chore: fix tests * ozone/x11: fix VA-API. https://chromium-review.googlesource.com/c/chromium/src/+/3141878 * Revert "ozone/x11: fix VA-API." This reverts commit 23e742acb1032bf4afc1a45e4bed38e42184fd01. * Reland "Make Ozone/X11 default." https://chromium-review.googlesource.com/c/chromium/src/+/3114071 * fixup Reland "Make Ozone/X11 default." * fixup Reland "Make Ozone/X11 default." for clipboard Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
107 lines
3.6 KiB
Text
107 lines
3.6 KiB
Text
// 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 "base/json/json_writer.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/values.h"
|
|
|
|
namespace electron {
|
|
|
|
NSArray* ListValueToNSArray(const base::ListValue& value) {
|
|
std::string json;
|
|
if (!base::JSONWriter::Write(value, &json))
|
|
return nil;
|
|
NSData* jsonData = [NSData dataWithBytes:json.c_str() length:json.length()];
|
|
id obj = [NSJSONSerialization JSONObjectWithData:jsonData
|
|
options:0
|
|
error:nil];
|
|
if (![obj isKindOfClass:[NSArray class]])
|
|
return nil;
|
|
return obj;
|
|
}
|
|
|
|
base::ListValue NSArrayToListValue(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 char* objc_type = [value objCType];
|
|
if (strcmp(objc_type, @encode(BOOL)) == 0 ||
|
|
strcmp(objc_type, @encode(char)) == 0)
|
|
result.Append([value boolValue]);
|
|
else if (strcmp(objc_type, @encode(double)) == 0 ||
|
|
strcmp(objc_type, @encode(float)) == 0)
|
|
result.Append([value doubleValue]);
|
|
else
|
|
result.Append([value intValue]);
|
|
} else if ([value isKindOfClass:[NSArray class]]) {
|
|
result.Append(NSArrayToListValue(value));
|
|
} else if ([value isKindOfClass:[NSDictionary class]]) {
|
|
result.Append(NSDictionaryToDictionaryValue(value));
|
|
} else {
|
|
result.Append(base::SysNSStringToUTF8([value description]));
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
NSDictionary* DictionaryValueToNSDictionary(
|
|
const base::DictionaryValue& value) {
|
|
std::string json;
|
|
if (!base::JSONWriter::Write(value, &json))
|
|
return nil;
|
|
NSData* jsonData = [NSData dataWithBytes:json.c_str() length:json.length()];
|
|
id obj = [NSJSONSerialization JSONObjectWithData:jsonData
|
|
options:0
|
|
error:nil];
|
|
if (![obj isKindOfClass:[NSDictionary class]])
|
|
return nil;
|
|
return obj;
|
|
}
|
|
|
|
base::DictionaryValue NSDictionaryToDictionaryValue(NSDictionary* dict) {
|
|
base::DictionaryValue 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.SetKey(str_key, base::Value(base::SysNSStringToUTF8(value)));
|
|
} else if ([value isKindOfClass:[NSNumber class]]) {
|
|
const char* objc_type = [value objCType];
|
|
if (strcmp(objc_type, @encode(BOOL)) == 0 ||
|
|
strcmp(objc_type, @encode(char)) == 0)
|
|
result.SetKey(str_key, base::Value([value boolValue]));
|
|
else if (strcmp(objc_type, @encode(double)) == 0 ||
|
|
strcmp(objc_type, @encode(float)) == 0)
|
|
result.SetKey(str_key, base::Value([value doubleValue]));
|
|
else
|
|
result.SetKey(str_key, base::Value([value intValue]));
|
|
} else if ([value isKindOfClass:[NSArray class]]) {
|
|
result.SetKey(str_key, NSArrayToListValue(value));
|
|
} else if ([value isKindOfClass:[NSDictionary class]]) {
|
|
result.SetKey(str_key, NSDictionaryToDictionaryValue(value));
|
|
} else {
|
|
result.SetKey(str_key,
|
|
base::Value(base::SysNSStringToUTF8([value description])));
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace electron
|