540d88f809
* chore: bump chromium in DEPS to 126.0.6468.2 * chore: bump chromium in DEPS to 126.0.6478.4 * chore: bump chromium in DEPS to 126.0.6478.9 * chore: bump chromium in DEPS to 126.0.6478.8 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs | https://chromium-review.googlesource.com/c/chromium/src/+/5492605 (cherry picked from commit 01bbc6b9609954e6f5e8ed2d7c5864e6f2a7929b) * 5513277: Move subresource-filter-ruleset to GCS | https://chromium-review.googlesource.com/c/chromium/src/+/5513277 (cherry picked from commit 284bbbdf86d640cfbe27831524a7cefa1f0ec344) * 5512656: Remove CustomizeChromeSupportsChromeRefresh2023 | https://chromium-review.googlesource.com/c/chromium/src/+/5512656 (cherry picked from commit 41acddd97e2f4f79dba13a3916c1af46d47fa6f5) * 5516009: Accept mouse events in inactive window for Top Chrome WebUIs | https://chromium-review.googlesource.com/c/chromium/src/+/5516009 (cherry picked from commit ffc88b3b2a7bee830a1e78b64afb6dfe6aff7347) * 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. | https://chromium-review.googlesource.com/c/chromium/src/+/5376861 (cherry picked from commit 5a48cf6952f0c3fde8a4d2b717ac5b2d50d13671) * 5490530: Use partition_alloc PA_BUILDFLAG(...) outside PA. #cleanup | https://chromium-review.googlesource.com/c/chromium/src/+/5490530 (cherry picked from commit 8deba32e729d3ded310be6645a27a78458046d69) * 5296870: network: Allow trusted loaders to learn the sent request cookies. | https://chromium-review.googlesource.com/c/chromium/src/+/5296870 (cherry picked from commit 7aef2f0ad890bb778fa8843bd262daf6909c5f52) * 5453438: Delegate delegated ink trails to RWHI from RWHIER. | https://chromium-review.googlesource.com/c/chromium/src/+/5453438 (cherry picked from commit 368eb3924a3b9b58430c7340b930254a3db6f1a3) * chore: update patches (cherry picked from commit 9d6dac074b0f173e43d8e587edbe7de1565de3d6) * chore: update patches (cherry picked from commit fb4134d68204ea85a095d496b31216905f801878) * update patches (cherry picked from commit 6f6fff5b0b08c4cccdbc98950f8cbb399caf6340) * only disable enterprise_cloud_content_analysis (cherry picked from commit 5426d227ee5f4ce60ed3f1c863fe506ee706e78b) * 5403888: [api] support v8::Data in v8::TracedReference and v8::EmbedderGraph https://chromium-review.googlesource.com/c/v8/v8/+/5403888 (cherry picked from commit 2030447cf5bbce26b73e2e9b054dee38438f9fdd) * chore: update patches * chore: fixup patch * 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation https://chromium-review.googlesource.com/c/v8/v8/+/5465511 * 5513528: Move service_provider_config files to components/enterprise/connectors/ https://chromium-review.googlesource.com/c/chromium/src/+/5513528 * chore: bump chromium in DEPS to 126.0.6478.17 * chore: bump chromium in DEPS to 126.0.6478.26 * chore: update patches * build: use Sha256Sum in script/sysroots.json Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5506275 (cherry picked from commit fccef2b6ba8769da9d8b1bd81fda5cc61b2086e0) * fixup! build: use Sha256Sum in script/sysroots.json `sync` succeeds now (cherry picked from commit e71852729fbf3575d1bc37774deadddfebdeefb4) * chore: cherry-pick Node.js patch for V8 API removal fix Node.js PR: https://github.com/nodejs/node/pull/52996 V8 API Removal CL: https://chromium-review.googlesource.com/c/v8/v8/+/5539888 See the patch description for more details. (cherry picked from commit ef0c441dbaa97478828ad481a39d0c2c93748729) * chore: revert v8 deprecation See patch message for more details. https://chromium-review.googlesource.com/c/v8/v8/+/5526611 (cherry picked from commit 6f03785eadea8d8629970c24393f0900fc3fa4af) * chore: revert v8 removal https://chromium-review.googlesource.com/c/v8/v8/+/5497515 See patch message for more details. (cherry picked from commit 4fd7f5bbb603b0461482fee027de7bfdbf02ceac) * 5522321: [devtools] Support saving base64 encoded files via host bindings https://chromium-review.googlesource.com/c/chromium/src/+/5522321 (cherry picked from commit 4b5f43d7838062834de6d634033fe10af2f9d01a) * fixup! 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation https://chromium-review.googlesource.com/c/v8/v8/+/5465511 (cherry picked from commit 368005f2b2f9195bcffb5325041e3ff1041a3830) * 5514687: Reland "Add a secret handshake to the base::Feature constructor" https://chromium-review.googlesource.com/c/chromium/src/+/5514687 (cherry picked from commit 142c6e16b10496b3fffddc9924001fb94096852e) * 5512176: Remove OnEnvironmentEstimationComplete() https://chromium-review.googlesource.com/c/chromium/src/+/5512176 (cherry picked from commit 1e20ffb24ef6d0b0aeec8c314393cb77631ab279) * 5539888: [api] Remove several APIs deprecated in version 12.6 https://chromium-review.googlesource.com/c/v8/v8/+/5539888 This commit essentially only removes the `only_terminate_in_safe_scope` isolate creation parameter. This undoes some work that was originally done in #35766. (cherry picked from commit ceb6182b199e2471c64700203bf42b73052a38c6) * 5492183: Extensions: CodeHealth: Give enums some class https://chromium-review.googlesource.com/c/chromium/src/+/5492183 (cherry picked from commit a11b8e637cdc0868b6152dd5b0ed3b582f446aa7) * 5483406: [PEPC] Make PEPC permission subscription take into account device status https://chromium-review.googlesource.com/c/chromium/src/+/5483406 (cherry picked from commit fc93c876b481a988a6c1d5eb69d97035dc5ad64a) * 5463431: iwa: Only create IsolatedWebAppURLLoaderFactory for subresources in IWAs https://chromium-review.googlesource.com/c/chromium/src/+/5463431 (cherry picked from commit fbfe3c998c8251f28b76c2703a3212b5b0175a84) * 5502081: Migrate OnDisplayRemoved to OnDisplaysRemoved https://chromium-review.googlesource.com/c/chromium/src/+/5502081 (cherry picked from commit ccf9a5137efdf2ca18d9ee9851388338c26d036e) * 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. https://chromium-review.googlesource.com/c/chromium/src/+/5376861 (cherry picked from commit fd3e6ce148b3c5ab27e234d28b9405933ba32b14) * fixup! 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum https://chromium-review.googlesource.com/c/chromium/src/+/5530163 (cherry picked from commit 9a900e734a8c08e534317ca4d7411bfadd9087f5) * 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum https://chromium-review.googlesource.com/c/chromium/src/+/5530163 (cherry picked from commit fd94de9736125c3121aed99f50f2702fc430ba26) * 5466238: PDF Viewer: add metrics to record if PDF is opened with a11y https://chromium-review.googlesource.com/c/chromium/src/+/5466238 (cherry picked from commit 2abb5d1737083241b6b6a4c05d5982693e956a22) * 5513740: Reland "[Extensions] Restructure extensions::ProcessMap" https://chromium-review.googlesource.com/c/chromium/src/+/5513740 (cherry picked from commit 11905a9840f1e8dce21cfdda1a23f328e8ff6a6a) * 5498236: Make browser_tests force full async initialization for OSCrypt Async https://chromium-review.googlesource.com/c/chromium/src/+/5498236 (cherry picked from commit e00faacb58545c37cfbf8a38a0cbe4ccb9f9df06) * fixup: only disable enterprise_cloud_content_analysis The original commita5480accc2
, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ | https://chromium-review.googlesource.com/c/chromium/src/+/5527572 (cherry picked from commit b0e2a7eab6c0decf982f913a892d5dfdb2501084) * chore: update patches * fixup: 5539888: [api] Remove several APIs deprecated in version 12.6 (cherry picked from commit ae65fea668baad44cac7073cbe0a64bca36bccac) * views: use CalculatePreferredSize(SizeBounds) in '/chrome/browser/ui/views/[frame, infobars, /test]'. https://chromium-review.googlesource.com/c/chromium/src/+/5493169 Needed because of 5504212: views: remove CalculatePreferredSize() | https://chromium-review.googlesource.com/c/chromium/src/+/5504212 * fixup: views: use CalculatePreferredSize(SizeBounds) * 5499157: Enable kBlockMidiByDefault by default https://chromium-review.googlesource.com/c/chromium/src/+/5499157 * 5518756: Reland^2: [heap] Add shared trusted spaces | https://chromium-review.googlesource.com/c/v8/v8/+/5518756ececfe7aea
* chore: bump chromium in DEPS to 126.0.6478.36 * chore: update patches * chore: add currently-unused should_include_device_status arg to GetPermissionStatusForCurrentDocument() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5545382 (cherry picked from commit bc35c93efd2d3301e33116d2dd09abaf8eddbf70) --------- 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: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
222 lines
7.7 KiB
C++
222 lines
7.7 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|
|
#define ELECTRON_SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|
|
|
|
#include <optional>
|
|
#include <string_view>
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
#include "gin/dictionary.h"
|
|
#include "shell/common/gin_converters/std_converter.h"
|
|
#include "shell/common/gin_helper/accessor.h"
|
|
#include "shell/common/gin_helper/function_template.h"
|
|
|
|
namespace gin_helper {
|
|
|
|
// Adds a few more extends methods to gin::Dictionary.
|
|
//
|
|
// Note that as the destructor of gin::Dictionary is not virtual, and we want to
|
|
// convert between 2 types, we must not add any member.
|
|
class Dictionary : public gin::Dictionary {
|
|
public:
|
|
Dictionary() : gin::Dictionary(nullptr) {}
|
|
Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object)
|
|
: gin::Dictionary(isolate, object) {}
|
|
|
|
// Allow implicitly converting from gin::Dictionary, as it is absolutely
|
|
// safe in this case.
|
|
Dictionary(const gin::Dictionary& dict) // NOLINT(runtime/explicit)
|
|
: gin::Dictionary(dict) {}
|
|
|
|
static Dictionary CreateEmpty(v8::Isolate* isolate) {
|
|
return gin::Dictionary::CreateEmpty(isolate);
|
|
}
|
|
|
|
// Differences from the Get method in gin::Dictionary:
|
|
// 1. This is a const method;
|
|
// 2. It checks whether the key exists before reading;
|
|
// 3. It accepts arbitrary type of key.
|
|
template <typename K, typename V>
|
|
bool Get(const K& key, V* out) const {
|
|
// Check for existence before getting, otherwise this method will always
|
|
// returns true when T == v8::Local<v8::Value>.
|
|
v8::Local<v8::Context> context = isolate()->GetCurrentContext();
|
|
v8::Local<v8::Value> v8_key = gin::ConvertToV8(isolate(), key);
|
|
v8::Local<v8::Value> value;
|
|
v8::Maybe<bool> result = GetHandle()->Has(context, v8_key);
|
|
if (result.IsJust() && result.FromJust() &&
|
|
GetHandle()->Get(context, v8_key).ToLocal(&value))
|
|
return gin::ConvertFromV8(isolate(), value, out);
|
|
return false;
|
|
}
|
|
|
|
// Differences from the Set method in gin::Dictionary:
|
|
// 1. It accepts arbitrary type of key.
|
|
template <typename K, typename V>
|
|
bool Set(const K& key, const V& val) {
|
|
v8::Local<v8::Value> v8_value;
|
|
if (!gin::TryConvertToV8(isolate(), val, &v8_value))
|
|
return false;
|
|
v8::Maybe<bool> result =
|
|
GetHandle()->Set(isolate()->GetCurrentContext(),
|
|
gin::ConvertToV8(isolate(), key), v8_value);
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
// Like normal Get but put result in an std::optional.
|
|
template <typename T>
|
|
bool GetOptional(const std::string_view key, std::optional<T>* out) const {
|
|
T ret;
|
|
if (Get(key, &ret)) {
|
|
out->emplace(std::move(ret));
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
template <typename T>
|
|
bool GetHidden(std::string_view key, T* out) const {
|
|
v8::Local<v8::Context> context = isolate()->GetCurrentContext();
|
|
v8::Local<v8::Private> privateKey =
|
|
v8::Private::ForApi(isolate(), gin::StringToV8(isolate(), key));
|
|
v8::Local<v8::Value> value;
|
|
v8::Maybe<bool> result = GetHandle()->HasPrivate(context, privateKey);
|
|
if (result.IsJust() && result.FromJust() &&
|
|
GetHandle()->GetPrivate(context, privateKey).ToLocal(&value))
|
|
return gin::ConvertFromV8(isolate(), value, out);
|
|
return false;
|
|
}
|
|
|
|
template <typename T>
|
|
bool SetHidden(std::string_view key, T val) {
|
|
v8::Local<v8::Value> v8_value;
|
|
if (!gin::TryConvertToV8(isolate(), val, &v8_value))
|
|
return false;
|
|
v8::Local<v8::Context> context = isolate()->GetCurrentContext();
|
|
v8::Local<v8::Private> privateKey =
|
|
v8::Private::ForApi(isolate(), gin::StringToV8(isolate(), key));
|
|
v8::Maybe<bool> result =
|
|
GetHandle()->SetPrivate(context, privateKey, v8_value);
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
template <typename T>
|
|
bool SetMethod(std::string_view key, const T& callback) {
|
|
auto context = isolate()->GetCurrentContext();
|
|
auto templ = CallbackTraits<T>::CreateTemplate(isolate(), callback);
|
|
return GetHandle()
|
|
->Set(context, gin::StringToV8(isolate(), key),
|
|
templ->GetFunction(context).ToLocalChecked())
|
|
.ToChecked();
|
|
}
|
|
|
|
template <typename K, typename V>
|
|
bool SetGetter(const K& key,
|
|
const V& val,
|
|
v8::PropertyAttribute attribute = v8::None) {
|
|
AccessorValue<V> acc_value;
|
|
acc_value.Value = val;
|
|
|
|
v8::Local<v8::Value> v8_value_accessor;
|
|
if (!gin::TryConvertToV8(isolate(), acc_value, &v8_value_accessor))
|
|
return false;
|
|
|
|
auto context = isolate()->GetCurrentContext();
|
|
|
|
return GetHandle()
|
|
->SetNativeDataProperty(
|
|
context, gin::StringToV8(isolate(), key),
|
|
[](v8::Local<v8::Name> property_name,
|
|
const v8::PropertyCallbackInfo<v8::Value>& info) {
|
|
AccessorValue<V> acc_value;
|
|
if (!gin::ConvertFromV8(info.GetIsolate(), info.Data(),
|
|
&acc_value))
|
|
return;
|
|
|
|
V val = acc_value.Value;
|
|
v8::Local<v8::Value> v8_value;
|
|
if (gin::TryConvertToV8(info.GetIsolate(), val, &v8_value))
|
|
info.GetReturnValue().Set(v8_value);
|
|
},
|
|
nullptr, v8_value_accessor, attribute)
|
|
.ToChecked();
|
|
}
|
|
|
|
template <typename T>
|
|
bool SetReadOnly(std::string_view key, const T& val) {
|
|
v8::Local<v8::Value> v8_value;
|
|
if (!gin::TryConvertToV8(isolate(), val, &v8_value))
|
|
return false;
|
|
v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
|
|
isolate()->GetCurrentContext(), gin::StringToV8(isolate(), key),
|
|
v8_value, v8::ReadOnly);
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
// Note: If we plan to add more Set methods, consider adding an option instead
|
|
// of copying code.
|
|
template <typename T>
|
|
bool SetReadOnlyNonConfigurable(std::string_view key, T val) {
|
|
v8::Local<v8::Value> v8_value;
|
|
if (!gin::TryConvertToV8(isolate(), val, &v8_value))
|
|
return false;
|
|
v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
|
|
isolate()->GetCurrentContext(), gin::StringToV8(isolate(), key),
|
|
v8_value,
|
|
static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete));
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
bool Has(std::string_view key) const {
|
|
v8::Maybe<bool> result = GetHandle()->Has(isolate()->GetCurrentContext(),
|
|
gin::StringToV8(isolate(), key));
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
bool Delete(std::string_view key) {
|
|
v8::Maybe<bool> result = GetHandle()->Delete(
|
|
isolate()->GetCurrentContext(), gin::StringToV8(isolate(), key));
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
bool IsEmpty() const { return isolate() == nullptr || GetHandle().IsEmpty(); }
|
|
|
|
v8::Local<v8::Object> GetHandle() const {
|
|
return gin::ConvertToV8(isolate(),
|
|
*static_cast<const gin::Dictionary*>(this))
|
|
.As<v8::Object>();
|
|
}
|
|
|
|
private:
|
|
// DO NOT ADD ANY DATA MEMBER.
|
|
};
|
|
|
|
} // namespace gin_helper
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<gin_helper::Dictionary> {
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
gin_helper::Dictionary val) {
|
|
return val.GetHandle();
|
|
}
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
gin_helper::Dictionary* out) {
|
|
gin::Dictionary gdict(isolate);
|
|
if (!ConvertFromV8(isolate, val, &gdict))
|
|
return false;
|
|
*out = gin_helper::Dictionary(gdict);
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
#endif // ELECTRON_SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|