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

Revert "Generalize this mate converter for reuse."

Browse source 
This reverts commit 92606579d3.
This commit is contained in:
Cheng Zhao 2016-05-05 17:09:42 +09:00
parent c9c4ba39ab
commit 2c31d7c1e8
5 changed files with 18 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_app.cc
View file

@ -20,7 +20,6 @@
#include "atom/common/native_mate_converters/image_converter.h" #include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/net_converter.h" #include "atom/common/native_mate_converters/net_converter.h"
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/native_mate_converters/string_map_converter.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "base/command_line.h" #include "base/command_line.h"

19
atom/common/api/atom_api_crash_reporter.cc
View file

@ -6,7 +6,6 @@
#include <string> #include <string>
#include "atom/common/crash_reporter/crash_reporter.h" #include "atom/common/crash_reporter/crash_reporter.h"
#include "atom/common/native_mate_converters/string_map_converter.h"
#include "base/bind.h" #include "base/bind.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
@ -16,6 +15,24 @@ using crash_reporter::CrashReporter;
namespace mate { namespace mate {
template<>
struct Converter<std::map<std::string, std::string> > {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
std::map<std::string, std::string>* out) {
if (!val->IsObject())
return false;
v8::Local<v8::Object> dict = val->ToObject();
v8::Local<v8::Array> keys = dict->GetOwnPropertyNames();
for (uint32_t i = 0; i < keys->Length(); ++i) {
v8::Local<v8::Value> key = keys->Get(i);
(*out)[V8ToString(key)] = V8ToString(dict->Get(key));
}
return true;
}
};
template<> template<>
struct Converter<CrashReporter::UploadReportResult> { struct Converter<CrashReporter::UploadReportResult> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,

36
atom/common/native_mate_converters/string_map_converter.cc
View file

@ -1,36 +0,0 @@
// Copyright (c) 2014 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/native_mate_converters/string_map_converter.h"
namespace mate {
bool Converter<std::map<std::string, std::string>>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
std::map<std::string, std::string>* out) {
if (!val->IsObject())
return false;
v8::Local<v8::Object> dict = val->ToObject();
v8::Local<v8::Array> keys = dict->GetOwnPropertyNames();
for (uint32_t i = 0; i < keys->Length(); ++i) {
v8::Local<v8::Value> key = keys->Get(i);
(*out)[V8ToString(key)] = V8ToString(dict->Get(key));
}
return true;
}
v8::Local<v8::Value> Converter<std::map<std::string, std::string>>::ToV8(
v8::Isolate* isolate,
const std::map<std::string, std::string>& in) {
mate::Dictionary dict(isolate, v8::Object::New(isolate));
for (auto const &pair : in) {
dict.Set(pair.first, pair.second);
}
return dict.GetHandle();
}
} // namespace mate

28
atom/common/native_mate_converters/string_map_converter.h
View file

@ -1,28 +0,0 @@
// Copyright (c) 2014 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING_MAP_CONVERTER_H_
#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING_MAP_CONVERTER_H_
#include <map>
#include <string>
#include "native_mate/converter.h"
#include "native_mate/dictionary.h"
namespace mate {
template<>
struct Converter<std::map<std::string, std::string>> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
std::map<std::string, std::string>* out);
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const std::map<std::string, std::string>& in);
};
} // namespace mate
#endif // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING_MAP_CONVERTER_H_

2
filenames.gypi
View file

@ -363,8 +363,6 @@
'atom/common/native_mate_converters/image_converter.h', 'atom/common/native_mate_converters/image_converter.h',
'atom/common/native_mate_converters/net_converter.cc', 'atom/common/native_mate_converters/net_converter.cc',
'atom/common/native_mate_converters/net_converter.h', 'atom/common/native_mate_converters/net_converter.h',
'atom/common/native_mate_converters/string_map_converter.cc',
'atom/common/native_mate_converters/string_map_converter.h',
'atom/common/native_mate_converters/string16_converter.h', 'atom/common/native_mate_converters/string16_converter.h',
'atom/common/native_mate_converters/ui_base_types_converter.h', 'atom/common/native_mate_converters/ui_base_types_converter.h',
'atom/common/native_mate_converters/v8_value_converter.cc', 'atom/common/native_mate_converters/v8_value_converter.cc',