8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
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 <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
184 lines
6.4 KiB
C++
184 lines
6.4 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 SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|
|
#define SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|
|
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
#include "gin/dictionary.h"
|
|
#include "shell/common/gin_converters/std_converter.h"
|
|
#include "shell/common/gin_helper/function_template.h"
|
|
#include "third_party/abseil-cpp/absl/types/optional.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) {}
|
|
|
|
// 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 absl::optional.
|
|
template <typename T>
|
|
bool GetOptional(base::StringPiece key, absl::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(base::StringPiece 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(base::StringPiece 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(base::StringPiece 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 T>
|
|
bool SetReadOnly(base::StringPiece 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(base::StringPiece 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(base::StringPiece key) const {
|
|
v8::Maybe<bool> result = GetHandle()->Has(isolate()->GetCurrentContext(),
|
|
gin::StringToV8(isolate(), key));
|
|
return !result.IsNothing() && result.FromJust();
|
|
}
|
|
|
|
bool Delete(base::StringPiece 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 // SHELL_COMMON_GIN_HELPER_DICTIONARY_H_
|