fix compilation for 7-1-x

electron · Jan 15, 2020 · ac99384 · ac99384
1 parent 0a2f98a
commit ac99384
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/native_mate/native_mate/converter.h b/native_mate/native_mate/converter.h
@@ -241,6 +241,34 @@ struct Converter<std::vector<T>> {
   }
 };
 
+template <typename T1, typename T2>
+struct Converter<std::pair<T1, T2>> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   const std::pair<T1, T2>& val) {
+    v8::Local<v8::Array> result(v8::Array::New(isolate, 2));
+    auto context = isolate->GetCurrentContext();
+    result->Set(context, 0, Converter<T1>::ToV8(isolate, val.first)).Check();
+    result->Set(context, 1, Converter<T2>::ToV8(isolate, val.second)).Check();
+    return result;
+  }
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     std::pair<T1, T2>* out) {
+    if (!val->IsArray())
+      return false;
+
+    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
+    if (array->Length() != 2)
+      return false;
+
+    auto context = isolate->GetCurrentContext();
+    return Converter<T1>::FromV8(
+               isolate, array->Get(context, 0).ToLocalChecked(), &out->first) &&
+           Converter<T2>::FromV8(
+               isolate, array->Get(context, 1).ToLocalChecked(), &out->second);
+  }
+};
+
 template <typename T>
 struct Converter<std::set<T>> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,

diff --git a/shell/browser/api/atom_api_url_loader.cc b/shell/browser/api/atom_api_url_loader.cc
@@ -33,21 +33,21 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/promise_util.h"
 
-namespace gin {
+namespace mate {
 
 template <>
 struct Converter<network::mojom::HttpRawHeaderPairPtr> {
   static v8::Local<v8::Value> ToV8(
       v8::Isolate* isolate,
       const network::mojom::HttpRawHeaderPairPtr& pair) {
-    gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
+    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("key", base::ToLowerASCII(pair->key));
     dict.Set("value", pair->value);
     return dict.GetHandle();
   }
 };
 
-}  // namespace gin
+}  // namespace mate
 
 namespace electron {
 

diff --git a/shell/common/api/atom_api_v8_util.cc b/shell/common/api/atom_api_v8_util.cc
@@ -28,30 +28,6 @@ struct hash<std::pair<Type1, Type2>> {
 
 }  // namespace std
 
-namespace mate {
-
-template <typename Type1, typename Type2>
-struct Converter<std::pair<Type1, Type2>> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     std::pair<Type1, Type2>* out) {
-    if (!val->IsArray())
-      return false;
-
-    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
-    if (array->Length() != 2)
-      return false;
-
-    auto context = isolate->GetCurrentContext();
-    return Converter<Type1>::FromV8(
-               isolate, array->Get(context, 0).ToLocalChecked(), &out->first) &&
-           Converter<Type2>::FromV8(
-               isolate, array->Get(context, 1).ToLocalChecked(), &out->second);
-  }
-};
-
-}  // namespace mate
-
 namespace {
 
 v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,