mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
519 lines
17 KiB
C++
519 lines
17 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/v8_value_converter.h"
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/logging.h"
|
|
#include "base/values.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/node_bindings.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const int kMaxRecursionDepth = 100;
|
|
|
|
} // namespace
|
|
|
|
// The state of a call to FromV8Value.
|
|
class V8ValueConverter::FromV8ValueState {
|
|
public:
|
|
// Level scope which updates the current depth of some FromV8ValueState.
|
|
class Level {
|
|
public:
|
|
explicit Level(FromV8ValueState* state) : state_(state) {
|
|
state_->max_recursion_depth_--;
|
|
}
|
|
~Level() { state_->max_recursion_depth_++; }
|
|
|
|
private:
|
|
FromV8ValueState* state_;
|
|
};
|
|
|
|
FromV8ValueState() : max_recursion_depth_(kMaxRecursionDepth) {}
|
|
|
|
// If |handle| is not in |unique_map_|, then add it to |unique_map_| and
|
|
// return true.
|
|
//
|
|
// Otherwise do nothing and return false. Here "A is unique" means that no
|
|
// other handle B in the map points to the same object as A. Note that A can
|
|
// be unique even if there already is another handle with the same identity
|
|
// hash (key) in the map, because two objects can have the same hash.
|
|
bool AddToUniquenessCheck(v8::Local<v8::Object> handle) {
|
|
int hash;
|
|
auto iter = GetIteratorInMap(handle, &hash);
|
|
if (iter != unique_map_.end())
|
|
return false;
|
|
|
|
unique_map_.insert(std::make_pair(hash, handle));
|
|
return true;
|
|
}
|
|
|
|
bool RemoveFromUniquenessCheck(v8::Local<v8::Object> handle) {
|
|
int unused_hash;
|
|
auto iter = GetIteratorInMap(handle, &unused_hash);
|
|
if (iter == unique_map_.end())
|
|
return false;
|
|
unique_map_.erase(iter);
|
|
return true;
|
|
}
|
|
|
|
bool HasReachedMaxRecursionDepth() { return max_recursion_depth_ < 0; }
|
|
|
|
private:
|
|
using HashToHandleMap = std::multimap<int, v8::Local<v8::Object>>;
|
|
using Iterator = HashToHandleMap::const_iterator;
|
|
|
|
Iterator GetIteratorInMap(v8::Local<v8::Object> handle, int* hash) {
|
|
*hash = handle->GetIdentityHash();
|
|
// We only compare using == with handles to objects with the same identity
|
|
// hash. Different hash obviously means different objects, but two objects
|
|
// in a couple of thousands could have the same identity hash.
|
|
std::pair<Iterator, Iterator> range = unique_map_.equal_range(*hash);
|
|
for (auto it = range.first; it != range.second; ++it) {
|
|
// Operator == for handles actually compares the underlying objects.
|
|
if (it->second == handle)
|
|
return it;
|
|
}
|
|
// Not found.
|
|
return unique_map_.end();
|
|
}
|
|
|
|
HashToHandleMap unique_map_;
|
|
|
|
int max_recursion_depth_;
|
|
};
|
|
|
|
// A class to ensure that objects/arrays that are being converted by
|
|
// this V8ValueConverterImpl do not have cycles.
|
|
//
|
|
// An example of cycle: var v = {}; v = {key: v};
|
|
// Not an example of cycle: var v = {}; a = [v, v]; or w = {a: v, b: v};
|
|
class V8ValueConverter::ScopedUniquenessGuard {
|
|
public:
|
|
ScopedUniquenessGuard(V8ValueConverter::FromV8ValueState* state,
|
|
v8::Local<v8::Object> value)
|
|
: state_(state),
|
|
value_(value),
|
|
is_valid_(state_->AddToUniquenessCheck(value_)) {}
|
|
~ScopedUniquenessGuard() {
|
|
if (is_valid_) {
|
|
bool removed = state_->RemoveFromUniquenessCheck(value_);
|
|
DCHECK(removed);
|
|
}
|
|
}
|
|
|
|
bool is_valid() const { return is_valid_; }
|
|
|
|
private:
|
|
typedef std::multimap<int, v8::Local<v8::Object>> HashToHandleMap;
|
|
V8ValueConverter::FromV8ValueState* state_;
|
|
v8::Local<v8::Object> value_;
|
|
bool is_valid_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ScopedUniquenessGuard);
|
|
};
|
|
|
|
V8ValueConverter::V8ValueConverter() = default;
|
|
|
|
void V8ValueConverter::SetRegExpAllowed(bool val) {
|
|
reg_exp_allowed_ = val;
|
|
}
|
|
|
|
void V8ValueConverter::SetFunctionAllowed(bool val) {
|
|
function_allowed_ = val;
|
|
}
|
|
|
|
void V8ValueConverter::SetStripNullFromObjects(bool val) {
|
|
strip_null_from_objects_ = val;
|
|
}
|
|
|
|
v8::Local<v8::Value> V8ValueConverter::ToV8Value(
|
|
const base::Value* value,
|
|
v8::Local<v8::Context> context) const {
|
|
v8::Context::Scope context_scope(context);
|
|
v8::EscapableHandleScope handle_scope(context->GetIsolate());
|
|
return handle_scope.Escape(ToV8ValueImpl(context->GetIsolate(), value));
|
|
}
|
|
|
|
std::unique_ptr<base::Value> V8ValueConverter::FromV8Value(
|
|
v8::Local<v8::Value> val,
|
|
v8::Local<v8::Context> context) const {
|
|
v8::Context::Scope context_scope(context);
|
|
v8::HandleScope handle_scope(context->GetIsolate());
|
|
FromV8ValueState state;
|
|
return FromV8ValueImpl(&state, val, context->GetIsolate());
|
|
}
|
|
|
|
v8::Local<v8::Value> V8ValueConverter::ToV8ValueImpl(
|
|
v8::Isolate* isolate,
|
|
const base::Value* value) const {
|
|
switch (value->type()) {
|
|
case base::Value::Type::NONE:
|
|
return v8::Null(isolate);
|
|
|
|
case base::Value::Type::BOOLEAN: {
|
|
bool val = value->GetBool();
|
|
return v8::Boolean::New(isolate, val);
|
|
}
|
|
|
|
case base::Value::Type::INTEGER: {
|
|
int val = value->GetInt();
|
|
return v8::Integer::New(isolate, val);
|
|
}
|
|
|
|
case base::Value::Type::DOUBLE: {
|
|
double val = value->GetDouble();
|
|
return v8::Number::New(isolate, val);
|
|
}
|
|
|
|
case base::Value::Type::STRING: {
|
|
std::string val = value->GetString();
|
|
return v8::String::NewFromUtf8(isolate, val.c_str(),
|
|
v8::NewStringType::kNormal, val.length())
|
|
.ToLocalChecked();
|
|
}
|
|
|
|
case base::Value::Type::LIST:
|
|
return ToV8Array(isolate, static_cast<const base::ListValue*>(value));
|
|
|
|
case base::Value::Type::DICTIONARY:
|
|
return ToV8Object(isolate,
|
|
static_cast<const base::DictionaryValue*>(value));
|
|
|
|
case base::Value::Type::BINARY:
|
|
return ToArrayBuffer(isolate, static_cast<const base::Value*>(value));
|
|
|
|
default:
|
|
LOG(ERROR) << "Unexpected value type: " << value->type();
|
|
return v8::Null(isolate);
|
|
}
|
|
}
|
|
|
|
v8::Local<v8::Value> V8ValueConverter::ToV8Array(
|
|
v8::Isolate* isolate,
|
|
const base::ListValue* val) const {
|
|
v8::Local<v8::Array> result(v8::Array::New(isolate, val->GetSize()));
|
|
auto context = isolate->GetCurrentContext();
|
|
|
|
for (size_t i = 0; i < val->GetSize(); ++i) {
|
|
const base::Value* child = nullptr;
|
|
val->Get(i, &child);
|
|
|
|
v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, child);
|
|
|
|
v8::TryCatch try_catch(isolate);
|
|
result->Set(context, static_cast<uint32_t>(i), child_v8).Check();
|
|
if (try_catch.HasCaught())
|
|
LOG(ERROR) << "Setter for index " << i << " threw an exception.";
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
v8::Local<v8::Value> V8ValueConverter::ToV8Object(
|
|
v8::Isolate* isolate,
|
|
const base::DictionaryValue* val) const {
|
|
gin_helper::Dictionary result = gin::Dictionary::CreateEmpty(isolate);
|
|
result.SetHidden("simple", true);
|
|
|
|
for (base::DictionaryValue::Iterator iter(*val); !iter.IsAtEnd();
|
|
iter.Advance()) {
|
|
const std::string& key = iter.key();
|
|
v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &iter.value());
|
|
|
|
v8::TryCatch try_catch(isolate);
|
|
result.Set(key, child_v8);
|
|
if (try_catch.HasCaught()) {
|
|
LOG(ERROR) << "Setter for property " << key.c_str() << " threw an "
|
|
<< "exception.";
|
|
}
|
|
}
|
|
|
|
return result.GetHandle();
|
|
}
|
|
|
|
v8::Local<v8::Value> V8ValueConverter::ToArrayBuffer(
|
|
v8::Isolate* isolate,
|
|
const base::Value* value) const {
|
|
const auto* data = reinterpret_cast<const char*>(value->GetBlob().data());
|
|
size_t length = value->GetBlob().size();
|
|
|
|
if (NodeBindings::IsInitialized()) {
|
|
return node::Buffer::Copy(isolate, data, length).ToLocalChecked();
|
|
}
|
|
|
|
if (length > node::Buffer::kMaxLength) {
|
|
return v8::Local<v8::Object>();
|
|
}
|
|
auto context = isolate->GetCurrentContext();
|
|
auto array_buffer = v8::ArrayBuffer::New(isolate, length);
|
|
std::shared_ptr<v8::BackingStore> backing_store =
|
|
array_buffer->GetBackingStore();
|
|
memcpy(backing_store->Data(), data, length);
|
|
// From this point, if something goes wrong(can't find Buffer class for
|
|
// example) we'll simply return a Uint8Array based on the created ArrayBuffer.
|
|
// This can happen if no preload script was specified to the renderer.
|
|
gin_helper::Dictionary global(isolate, context->Global());
|
|
v8::Local<v8::Value> buffer_value;
|
|
|
|
// Get the Buffer class stored as a hidden value in the global object. We'll
|
|
// use it return a browserified Buffer.
|
|
if (!global.GetHidden("Buffer", &buffer_value) ||
|
|
!buffer_value->IsFunction()) {
|
|
return v8::Uint8Array::New(array_buffer, 0, length);
|
|
}
|
|
|
|
gin::Dictionary buffer_class(
|
|
isolate,
|
|
buffer_value->ToObject(isolate->GetCurrentContext()).ToLocalChecked());
|
|
v8::Local<v8::Value> from_value;
|
|
if (!buffer_class.Get("from", &from_value) || !from_value->IsFunction()) {
|
|
return v8::Uint8Array::New(array_buffer, 0, length);
|
|
}
|
|
|
|
v8::Local<v8::Value> args[] = {array_buffer};
|
|
auto func = v8::Local<v8::Function>::Cast(from_value);
|
|
auto result = func->Call(context, v8::Null(isolate), 1, args);
|
|
if (!result.IsEmpty()) {
|
|
return result.ToLocalChecked();
|
|
}
|
|
|
|
return v8::Uint8Array::New(array_buffer, 0, length);
|
|
}
|
|
|
|
std::unique_ptr<base::Value> V8ValueConverter::FromV8ValueImpl(
|
|
FromV8ValueState* state,
|
|
v8::Local<v8::Value> val,
|
|
v8::Isolate* isolate) const {
|
|
FromV8ValueState::Level state_level(state);
|
|
if (state->HasReachedMaxRecursionDepth())
|
|
return nullptr;
|
|
|
|
if (val->IsExternal())
|
|
return std::make_unique<base::Value>();
|
|
|
|
if (val->IsNull())
|
|
return std::make_unique<base::Value>();
|
|
|
|
auto context = isolate->GetCurrentContext();
|
|
|
|
if (val->IsBoolean())
|
|
return std::make_unique<base::Value>(val->ToBoolean(isolate)->Value());
|
|
|
|
if (val->IsInt32())
|
|
return std::make_unique<base::Value>(val.As<v8::Int32>()->Value());
|
|
|
|
if (val->IsNumber()) {
|
|
double val_as_double = val.As<v8::Number>()->Value();
|
|
if (!std::isfinite(val_as_double))
|
|
return nullptr;
|
|
return std::make_unique<base::Value>(val_as_double);
|
|
}
|
|
|
|
if (val->IsString()) {
|
|
v8::String::Utf8Value utf8(isolate, val);
|
|
return std::make_unique<base::Value>(std::string(*utf8, utf8.length()));
|
|
}
|
|
|
|
if (val->IsUndefined())
|
|
// JSON.stringify ignores undefined.
|
|
return nullptr;
|
|
|
|
if (val->IsDate()) {
|
|
v8::Date* date = v8::Date::Cast(*val);
|
|
v8::Local<v8::Value> toISOString =
|
|
date->Get(context, v8::String::NewFromUtf8(isolate, "toISOString",
|
|
v8::NewStringType::kNormal)
|
|
.ToLocalChecked())
|
|
.ToLocalChecked();
|
|
if (toISOString->IsFunction()) {
|
|
v8::MaybeLocal<v8::Value> result =
|
|
toISOString.As<v8::Function>()->Call(context, val, 0, nullptr);
|
|
if (!result.IsEmpty()) {
|
|
v8::String::Utf8Value utf8(isolate, result.ToLocalChecked());
|
|
return std::make_unique<base::Value>(std::string(*utf8, utf8.length()));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (val->IsRegExp()) {
|
|
if (!reg_exp_allowed_)
|
|
// JSON.stringify converts to an object.
|
|
return FromV8Object(val.As<v8::Object>(), state, isolate);
|
|
return std::make_unique<base::Value>(*v8::String::Utf8Value(isolate, val));
|
|
}
|
|
|
|
// v8::Value doesn't have a ToArray() method for some reason.
|
|
if (val->IsArray())
|
|
return FromV8Array(val.As<v8::Array>(), state, isolate);
|
|
|
|
if (val->IsFunction()) {
|
|
if (!function_allowed_)
|
|
// JSON.stringify refuses to convert function(){}.
|
|
return nullptr;
|
|
return FromV8Object(val.As<v8::Object>(), state, isolate);
|
|
}
|
|
|
|
if (node::Buffer::HasInstance(val)) {
|
|
return FromNodeBuffer(val, state, isolate);
|
|
}
|
|
|
|
if (val->IsObject()) {
|
|
return FromV8Object(val.As<v8::Object>(), state, isolate);
|
|
}
|
|
|
|
LOG(ERROR) << "Unexpected v8 value type encountered.";
|
|
return nullptr;
|
|
}
|
|
|
|
std::unique_ptr<base::Value> V8ValueConverter::FromV8Array(
|
|
v8::Local<v8::Array> val,
|
|
FromV8ValueState* state,
|
|
v8::Isolate* isolate) const {
|
|
ScopedUniquenessGuard uniqueness_guard(state, val);
|
|
if (!uniqueness_guard.is_valid())
|
|
return std::make_unique<base::Value>();
|
|
|
|
std::unique_ptr<v8::Context::Scope> scope;
|
|
// If val was created in a different context than our current one, change to
|
|
// that context, but change back after val is converted.
|
|
if (!val->CreationContext().IsEmpty() &&
|
|
val->CreationContext() != isolate->GetCurrentContext())
|
|
scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
|
|
|
|
std::unique_ptr<base::ListValue> result(new base::ListValue());
|
|
|
|
// Only fields with integer keys are carried over to the ListValue.
|
|
for (uint32_t i = 0; i < val->Length(); ++i) {
|
|
v8::TryCatch try_catch(isolate);
|
|
v8::Local<v8::Value> child_v8;
|
|
v8::MaybeLocal<v8::Value> maybe_child =
|
|
val->Get(isolate->GetCurrentContext(), i);
|
|
if (try_catch.HasCaught() || !maybe_child.ToLocal(&child_v8)) {
|
|
LOG(ERROR) << "Getter for index " << i << " threw an exception.";
|
|
child_v8 = v8::Null(isolate);
|
|
}
|
|
|
|
if (!val->HasRealIndexedProperty(isolate->GetCurrentContext(), i)
|
|
.FromMaybe(false)) {
|
|
result->Append(std::make_unique<base::Value>());
|
|
continue;
|
|
}
|
|
|
|
std::unique_ptr<base::Value> child =
|
|
FromV8ValueImpl(state, child_v8, isolate);
|
|
if (child)
|
|
result->Append(std::move(child));
|
|
else
|
|
// JSON.stringify puts null in places where values don't serialize, for
|
|
// example undefined and functions. Emulate that behavior.
|
|
result->Append(std::make_unique<base::Value>());
|
|
}
|
|
return std::move(result);
|
|
}
|
|
|
|
std::unique_ptr<base::Value> V8ValueConverter::FromNodeBuffer(
|
|
v8::Local<v8::Value> value,
|
|
FromV8ValueState* state,
|
|
v8::Isolate* isolate) const {
|
|
std::vector<char> buffer(
|
|
node::Buffer::Data(value),
|
|
node::Buffer::Data(value) + node::Buffer::Length(value));
|
|
return std::make_unique<base::Value>(std::move(buffer));
|
|
}
|
|
|
|
std::unique_ptr<base::Value> V8ValueConverter::FromV8Object(
|
|
v8::Local<v8::Object> val,
|
|
FromV8ValueState* state,
|
|
v8::Isolate* isolate) const {
|
|
ScopedUniquenessGuard uniqueness_guard(state, val);
|
|
if (!uniqueness_guard.is_valid())
|
|
return std::make_unique<base::Value>();
|
|
|
|
std::unique_ptr<v8::Context::Scope> scope;
|
|
// If val was created in a different context than our current one, change to
|
|
// that context, but change back after val is converted.
|
|
if (!val->CreationContext().IsEmpty() &&
|
|
val->CreationContext() != isolate->GetCurrentContext())
|
|
scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
|
|
|
|
auto result = std::make_unique<base::DictionaryValue>();
|
|
v8::Local<v8::Array> property_names;
|
|
if (!val->GetOwnPropertyNames(isolate->GetCurrentContext())
|
|
.ToLocal(&property_names)) {
|
|
return std::move(result);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < property_names->Length(); ++i) {
|
|
v8::Local<v8::Value> key =
|
|
property_names->Get(isolate->GetCurrentContext(), i).ToLocalChecked();
|
|
|
|
// Extend this test to cover more types as necessary and if sensible.
|
|
if (!key->IsString() && !key->IsNumber()) {
|
|
NOTREACHED() << "Key \"" << *v8::String::Utf8Value(isolate, key)
|
|
<< "\" "
|
|
"is neither a string nor a number";
|
|
continue;
|
|
}
|
|
|
|
v8::String::Utf8Value name_utf8(isolate, key);
|
|
|
|
v8::TryCatch try_catch(isolate);
|
|
v8::Local<v8::Value> child_v8;
|
|
v8::MaybeLocal<v8::Value> maybe_child =
|
|
val->Get(isolate->GetCurrentContext(), key);
|
|
if (try_catch.HasCaught() || !maybe_child.ToLocal(&child_v8)) {
|
|
LOG(ERROR) << "Getter for property " << *name_utf8
|
|
<< " threw an exception.";
|
|
child_v8 = v8::Null(isolate);
|
|
}
|
|
|
|
std::unique_ptr<base::Value> child =
|
|
FromV8ValueImpl(state, child_v8, isolate);
|
|
if (!child)
|
|
// JSON.stringify skips properties whose values don't serialize, for
|
|
// example undefined and functions. Emulate that behavior.
|
|
continue;
|
|
|
|
// Strip null if asked (and since undefined is turned into null, undefined
|
|
// too). The use case for supporting this is JSON-schema support,
|
|
// specifically for extensions, where "optional" JSON properties may be
|
|
// represented as null, yet due to buggy legacy code elsewhere isn't
|
|
// treated as such (potentially causing crashes). For example, the
|
|
// "tabs.create" function takes an object as its first argument with an
|
|
// optional "windowId" property.
|
|
//
|
|
// Given just
|
|
//
|
|
// tabs.create({})
|
|
//
|
|
// this will work as expected on code that only checks for the existence of
|
|
// a "windowId" property (such as that legacy code). However given
|
|
//
|
|
// tabs.create({windowId: null})
|
|
//
|
|
// there *is* a "windowId" property, but since it should be an int, code
|
|
// on the browser which doesn't additionally check for null will fail.
|
|
// We can avoid all bugs related to this by stripping null.
|
|
if (strip_null_from_objects_ && child->is_none())
|
|
continue;
|
|
|
|
result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
|
|
std::move(child));
|
|
}
|
|
|
|
return std::move(result);
|
|
}
|
|
|
|
} // namespace electron
|