diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/gin/converter.cc | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/gin/converter.cc')
-rw-r--r-- | chromium/gin/converter.cc | 103 |
1 files changed, 55 insertions, 48 deletions
diff --git a/chromium/gin/converter.cc b/chromium/gin/converter.cc index 07437b7edc2..d870bebc4bb 100644 --- a/chromium/gin/converter.cc +++ b/chromium/gin/converter.cc @@ -10,9 +10,9 @@ using v8::ArrayBuffer; using v8::Boolean; using v8::External; using v8::Function; -using v8::Handle; using v8::Integer; using v8::Isolate; +using v8::Local; using v8::Number; using v8::Object; using v8::String; @@ -20,20 +20,21 @@ using v8::Value; namespace gin { -Handle<Value> Converter<bool>::ToV8(Isolate* isolate, bool val) { +Local<Value> Converter<bool>::ToV8(Isolate* isolate, bool val) { return Boolean::New(isolate, val).As<Value>(); } -bool Converter<bool>::FromV8(Isolate* isolate, Handle<Value> val, bool* out) { +bool Converter<bool>::FromV8(Isolate* isolate, Local<Value> val, bool* out) { *out = val->BooleanValue(); return true; } -Handle<Value> Converter<int32_t>::ToV8(Isolate* isolate, int32_t val) { +Local<Value> Converter<int32_t>::ToV8(Isolate* isolate, int32_t val) { return Integer::New(isolate, val).As<Value>(); } -bool Converter<int32_t>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<int32_t>::FromV8(Isolate* isolate, + Local<Value> val, int32_t* out) { if (!val->IsInt32()) return false; @@ -41,11 +42,12 @@ bool Converter<int32_t>::FromV8(Isolate* isolate, Handle<Value> val, return true; } -Handle<Value> Converter<uint32_t>::ToV8(Isolate* isolate, uint32_t val) { +Local<Value> Converter<uint32_t>::ToV8(Isolate* isolate, uint32_t val) { return Integer::NewFromUnsigned(isolate, val).As<Value>(); } -bool Converter<uint32_t>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<uint32_t>::FromV8(Isolate* isolate, + Local<Value> val, uint32_t* out) { if (!val->IsUint32()) return false; @@ -53,11 +55,12 @@ bool Converter<uint32_t>::FromV8(Isolate* isolate, Handle<Value> val, return true; } -Handle<Value> Converter<int64_t>::ToV8(Isolate* isolate, int64_t val) { +Local<Value> Converter<int64_t>::ToV8(Isolate* isolate, int64_t val) { return Number::New(isolate, static_cast<double>(val)).As<Value>(); } -bool Converter<int64_t>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<int64_t>::FromV8(Isolate* isolate, + Local<Value> val, int64_t* out) { if (!val->IsNumber()) return false; @@ -67,11 +70,12 @@ bool Converter<int64_t>::FromV8(Isolate* isolate, Handle<Value> val, return true; } -Handle<Value> Converter<uint64_t>::ToV8(Isolate* isolate, uint64_t val) { +Local<Value> Converter<uint64_t>::ToV8(Isolate* isolate, uint64_t val) { return Number::New(isolate, static_cast<double>(val)).As<Value>(); } -bool Converter<uint64_t>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<uint64_t>::FromV8(Isolate* isolate, + Local<Value> val, uint64_t* out) { if (!val->IsNumber()) return false; @@ -79,23 +83,23 @@ bool Converter<uint64_t>::FromV8(Isolate* isolate, Handle<Value> val, return true; } -Handle<Value> Converter<float>::ToV8(Isolate* isolate, float val) { +Local<Value> Converter<float>::ToV8(Isolate* isolate, float val) { return Number::New(isolate, val).As<Value>(); } -bool Converter<float>::FromV8(Isolate* isolate, Handle<Value> val, - float* out) { +bool Converter<float>::FromV8(Isolate* isolate, Local<Value> val, float* out) { if (!val->IsNumber()) return false; *out = static_cast<float>(val->NumberValue()); return true; } -Handle<Value> Converter<double>::ToV8(Isolate* isolate, double val) { +Local<Value> Converter<double>::ToV8(Isolate* isolate, double val) { return Number::New(isolate, val).As<Value>(); } -bool Converter<double>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<double>::FromV8(Isolate* isolate, + Local<Value> val, double* out) { if (!val->IsNumber()) return false; @@ -103,89 +107,92 @@ bool Converter<double>::FromV8(Isolate* isolate, Handle<Value> val, return true; } -Handle<Value> Converter<base::StringPiece>::ToV8( - Isolate* isolate, const base::StringPiece& val) { +Local<Value> Converter<base::StringPiece>::ToV8(Isolate* isolate, + const base::StringPiece& val) { return String::NewFromUtf8(isolate, val.data(), String::kNormalString, static_cast<uint32_t>(val.length())); } -Handle<Value> Converter<std::string>::ToV8(Isolate* isolate, - const std::string& val) { +Local<Value> Converter<std::string>::ToV8(Isolate* isolate, + const std::string& val) { return Converter<base::StringPiece>::ToV8(isolate, val); } -bool Converter<std::string>::FromV8(Isolate* isolate, Handle<Value> val, +bool Converter<std::string>::FromV8(Isolate* isolate, + Local<Value> val, std::string* out) { if (!val->IsString()) return false; - Handle<String> str = Handle<String>::Cast(val); + Local<String> str = Local<String>::Cast(val); int length = str->Utf8Length(); out->resize(length); str->WriteUtf8(&(*out)[0], length, NULL, String::NO_NULL_TERMINATION); return true; } -bool Converter<Handle<Function> >::FromV8(Isolate* isolate, Handle<Value> val, - Handle<Function>* out) { +bool Converter<Local<Function>>::FromV8(Isolate* isolate, + Local<Value> val, + Local<Function>* out) { if (!val->IsFunction()) return false; - *out = Handle<Function>::Cast(val); + *out = Local<Function>::Cast(val); return true; } -Handle<Value> Converter<Handle<Object> >::ToV8(Isolate* isolate, - Handle<Object> val) { +Local<Value> Converter<Local<Object>>::ToV8(Isolate* isolate, + Local<Object> val) { return val.As<Value>(); } -bool Converter<Handle<Object> >::FromV8(Isolate* isolate, Handle<Value> val, - Handle<Object>* out) { +bool Converter<Local<Object>>::FromV8(Isolate* isolate, + Local<Value> val, + Local<Object>* out) { if (!val->IsObject()) return false; - *out = Handle<Object>::Cast(val); + *out = Local<Object>::Cast(val); return true; } -Handle<Value> Converter<Handle<ArrayBuffer> >::ToV8(Isolate* isolate, - Handle<ArrayBuffer> val) { +Local<Value> Converter<Local<ArrayBuffer>>::ToV8(Isolate* isolate, + Local<ArrayBuffer> val) { return val.As<Value>(); } -bool Converter<Handle<ArrayBuffer> >::FromV8(Isolate* isolate, - Handle<Value> val, - Handle<ArrayBuffer>* out) { +bool Converter<Local<ArrayBuffer>>::FromV8(Isolate* isolate, + Local<Value> val, + Local<ArrayBuffer>* out) { if (!val->IsArrayBuffer()) return false; - *out = Handle<ArrayBuffer>::Cast(val); + *out = Local<ArrayBuffer>::Cast(val); return true; } -Handle<Value> Converter<Handle<External> >::ToV8(Isolate* isolate, - Handle<External> val) { +Local<Value> Converter<Local<External>>::ToV8(Isolate* isolate, + Local<External> val) { return val.As<Value>(); } -bool Converter<Handle<External> >::FromV8(Isolate* isolate, - v8::Handle<Value> val, - Handle<External>* out) { +bool Converter<Local<External>>::FromV8(Isolate* isolate, + v8::Local<Value> val, + Local<External>* out) { if (!val->IsExternal()) return false; - *out = Handle<External>::Cast(val); + *out = Local<External>::Cast(val); return true; } -Handle<Value> Converter<Handle<Value> >::ToV8(Isolate* isolate, - Handle<Value> val) { +Local<Value> Converter<Local<Value>>::ToV8(Isolate* isolate, Local<Value> val) { return val; } -bool Converter<Handle<Value> >::FromV8(Isolate* isolate, Handle<Value> val, - Handle<Value>* out) { +bool Converter<Local<Value>>::FromV8(Isolate* isolate, + Local<Value> val, + Local<Value>* out) { *out = val; return true; } -v8::Handle<v8::String> StringToSymbol(v8::Isolate* isolate, +v8::Local<v8::String> StringToSymbol(v8::Isolate* isolate, const base::StringPiece& val) { return String::NewFromUtf8(isolate, val.data(), @@ -193,7 +200,7 @@ v8::Handle<v8::String> StringToSymbol(v8::Isolate* isolate, static_cast<uint32_t>(val.length())); } -std::string V8ToString(v8::Handle<v8::Value> value) { +std::string V8ToString(v8::Local<v8::Value> value) { if (value.IsEmpty()) return std::string(); std::string result; |