Revert of gin: Use V8 Maybe APIs

gin/converter.cc

Index: gin/converter.cc
diff --git a/gin/converter.cc b/gin/converter.cc
index 9a3462d5a2dd44b2734ea7731b445f9feb471a64..d870bebc4bb816e49612b15df3039c43286b4998 100644
--- a/gin/converter.cc
+++ b/gin/converter.cc
@@ -10,29 +10,13 @@
 using v8::Boolean;
 using v8::External;
 using v8::Function;
-using v8::Int32;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
-using v8::Maybe;
-using v8::MaybeLocal;
 using v8::Number;
 using v8::Object;
 using v8::String;
-using v8::Uint32;
 using v8::Value;
-
-namespace {
-
-template <typename T, typename U>
-bool FromMaybe(Maybe<T> maybe, U* out) {
-  if (maybe.IsNothing())
-    return false;
-  *out = static_cast<U>(maybe.FromJust());
-  return true;
-}
-
-}  // namespace
 
 namespace gin {
 
@@ -41,7 +25,8 @@
 }
 
 bool Converter<bool>::FromV8(Isolate* isolate, Local<Value> val, bool* out) {
-  return FromMaybe(val->BooleanValue(isolate->GetCurrentContext()), out);
+  *out = val->BooleanValue();
+  return true;
 }
 
 Local<Value> Converter<int32_t>::ToV8(Isolate* isolate, int32_t val) {
@@ -53,7 +38,7 @@
                                 int32_t* out) {
   if (!val->IsInt32())
     return false;
-  *out = val.As<Int32>()->Value();
+  *out = val->Int32Value();
   return true;
 }
 
@@ -66,7 +51,7 @@
                                  uint32_t* out) {
   if (!val->IsUint32())
     return false;
-  *out = val.As<Uint32>()->Value();
+  *out = val->Uint32Value();
   return true;
 }
 
@@ -81,7 +66,8 @@
     return false;
   // Even though IntegerValue returns int64_t, JavaScript cannot represent
   // the full precision of int64_t, which means some rounding might occur.
-  return FromMaybe(val->IntegerValue(isolate->GetCurrentContext()), out);
+  *out = val->IntegerValue();
+  return true;
 }
 
 Local<Value> Converter<uint64_t>::ToV8(Isolate* isolate, uint64_t val) {
@@ -93,7 +79,8 @@
                                  uint64_t* out) {
   if (!val->IsNumber())
     return false;
-  return FromMaybe(val->IntegerValue(isolate->GetCurrentContext()), out);
+  *out = static_cast<uint64_t>(val->IntegerValue());
+  return true;
 }
 
 Local<Value> Converter<float>::ToV8(Isolate* isolate, float val) {
@@ -103,7 +90,7 @@
 bool Converter<float>::FromV8(Isolate* isolate, Local<Value> val, float* out) {
   if (!val->IsNumber())
     return false;
-  *out = static_cast<float>(val.As<Number>()->Value());
+  *out = static_cast<float>(val->NumberValue());
   return true;
 }
 
@@ -116,16 +103,14 @@
                                double* out) {
   if (!val->IsNumber())
     return false;
-  *out = val.As<Number>()->Value();
+  *out = val->NumberValue();
   return true;
 }
 
 Local<Value> Converter<base::StringPiece>::ToV8(Isolate* isolate,
                                                 const base::StringPiece& val) {
-  return String::NewFromUtf8(isolate, val.data(),
-                             v8::NewStringType::kNormal,
-                             static_cast<uint32_t>(val.length()))
-      .ToLocalChecked();
+  return String::NewFromUtf8(isolate, val.data(), String::kNormalString,
+                             static_cast<uint32_t>(val.length()));
 }
 
 Local<Value> Converter<std::string>::ToV8(Isolate* isolate,
@@ -209,10 +194,10 @@
 
 v8::Local<v8::String> StringToSymbol(v8::Isolate* isolate,
                                       const base::StringPiece& val) {
-  return String::NewFromUtf8(isolate, val.data(),
-                             v8::NewStringType::kInternalized,
-                             static_cast<uint32_t>(val.length()))
-      .ToLocalChecked();
+  return String::NewFromUtf8(isolate,
+                             val.data(),
+                             String::kInternalizedString,
+                             static_cast<uint32_t>(val.length()));
 }
 
 std::string V8ToString(v8::Local<v8::Value> value) {