mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Support converting v8 value to arbitrary vector or map.

Browse source
This commit is contained in:
Cheng Zhao 2014-01-07 20:23:46 +08:00
parent 4ae2738ce5
commit bcdc44c1c6
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
common/v8/native_type_conversions.h
View file

@ -17,7 +17,6 @@
#include "common/swap_or_assign.h" #include "common/swap_or_assign.h"
#include "common/v8/scoped_persistent.h" #include "common/v8/scoped_persistent.h"
#include "common/v8/v8_value_converter.h" #include "common/v8/v8_value_converter.h"
#include "content/public/renderer/v8_value_converter.h"
#include "ui/gfx/point.h" #include "ui/gfx/point.h"
#include "ui/gfx/rect.h" #include "ui/gfx/rect.h"
#include "ui/gfx/size.h" #include "ui/gfx/size.h"
@ -73,8 +72,9 @@ struct FromV8Value {
converter->FromV8Value(value_, v8::Context::GetCurrent())); converter->FromV8Value(value_, v8::Context::GetCurrent()));
} }
operator std::vector<std::string>() { template<class T>
std::vector<std::string> array; operator std::vector<T>() {
std::vector<T> array;
v8::Handle<v8::Array> v8_array = v8::Handle<v8::Array>::Cast(value_); v8::Handle<v8::Array> v8_array = v8::Handle<v8::Array>::Cast(value_);
for (uint32_t i = 0; i < v8_array->Length(); ++i) for (uint32_t i = 0; i < v8_array->Length(); ++i)
array.push_back(FromV8Value(v8_array->Get(i))); array.push_back(FromV8Value(v8_array->Get(i)));
@ -82,14 +82,15 @@ struct FromV8Value {
return array; return array;
} }
operator std::map<std::string, std::string>() { template<class K, class V>
std::map<std::string, std::string> dict; operator std::map<K, V>() {
std::map<K, V> dict;
v8::Handle<v8::Object> v8_dict = value_->ToObject(); v8::Handle<v8::Object> v8_dict = value_->ToObject();
v8::Handle<v8::Array> v8_keys = v8_dict->GetOwnPropertyNames(); v8::Handle<v8::Array> v8_keys = v8_dict->GetOwnPropertyNames();
for (uint32_t i = 0; i < v8_keys->Length(); ++i) { for (uint32_t i = 0; i < v8_keys->Length(); ++i) {
v8::Handle<v8::Value> v8_key = v8_keys->Get(i); v8::Handle<v8::Value> v8_key = v8_keys->Get(i);
std::string key = FromV8Value(v8_key); K key = FromV8Value(v8_key);
dict[key] = std::string(FromV8Value(v8_dict->Get(v8_key))); dict[key] = V(FromV8Value(v8_dict->Get(v8_key)));
} }
return dict; return dict;
@ -156,11 +157,11 @@ inline v8::Handle<v8::Value> ToV8Value(void* whatever) {
return v8::Undefined(); return v8::Undefined();
} }
inline template<class T> inline
v8::Handle<v8::Value> ToV8Value(const std::vector<base::FilePath>& paths) { v8::Handle<v8::Value> ToV8Value(const std::vector<T>& arr) {
v8::Handle<v8::Array> result = v8::Array::New(paths.size()); v8::Handle<v8::Array> result = v8::Array::New(arr.size());
for (size_t i = 0; i < paths.size(); ++i) for (size_t i = 0; i < arr.size(); ++i)
result->Set(i, ToV8Value(paths[i])); result->Set(i, ToV8Value(arr[i]));
return result; return result;
} }