Use Local instead of Handle
This commit is contained in:
parent
b169ac016e
commit
d78efe7c22
54 changed files with 185 additions and 185 deletions
|
@ -42,7 +42,7 @@ namespace mate {
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
template<>
|
template<>
|
||||||
struct Converter<Browser::UserTask> {
|
struct Converter<Browser::UserTask> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
Browser::UserTask* out) {
|
Browser::UserTask* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -277,8 +277,8 @@ void DockSetMenu(atom::api::Menu* menu) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
auto command_line = base::CommandLine::ForCurrentProcess();
|
auto command_line = base::CommandLine::ForCurrentProcess();
|
||||||
|
|
||||||
|
|
|
@ -77,8 +77,8 @@ mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("autoUpdater", atom::api::AutoUpdater::Create(isolate));
|
dict.Set("autoUpdater", atom::api::AutoUpdater::Create(isolate));
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::trace_event::CategoryFilter> {
|
struct Converter<base::trace_event::CategoryFilter> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::trace_event::CategoryFilter* out) {
|
base::trace_event::CategoryFilter* out) {
|
||||||
std::string filter;
|
std::string filter;
|
||||||
if (!ConvertFromV8(isolate, val, &filter))
|
if (!ConvertFromV8(isolate, val, &filter))
|
||||||
|
@ -33,7 +33,7 @@ struct Converter<base::trace_event::CategoryFilter> {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::trace_event::TraceOptions> {
|
struct Converter<base::trace_event::TraceOptions> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::trace_event::TraceOptions* out) {
|
base::trace_event::TraceOptions* out) {
|
||||||
std::string options;
|
std::string options;
|
||||||
if (!ConvertFromV8(isolate, val, &options))
|
if (!ConvertFromV8(isolate, val, &options))
|
||||||
|
@ -46,8 +46,8 @@ struct Converter<base::trace_event::TraceOptions> {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
auto controller = base::Unretained(TracingController::GetInstance());
|
auto controller = base::Unretained(TracingController::GetInstance());
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("getCategories", base::Bind(
|
dict.SetMethod("getCategories", base::Bind(
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<file_dialog::Filter> {
|
struct Converter<file_dialog::Filter> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
file_dialog::Filter* out) {
|
file_dialog::Filter* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -52,7 +52,7 @@ void ShowMessageBox(int type,
|
||||||
const std::string& message = texts[1];
|
const std::string& message = texts[1];
|
||||||
const std::string& detail = texts[2];
|
const std::string& detail = texts[2];
|
||||||
|
|
||||||
v8::Handle<v8::Value> peek = args->PeekNext();
|
v8::Local<v8::Value> peek = args->PeekNext();
|
||||||
atom::MessageBoxCallback callback;
|
atom::MessageBoxCallback callback;
|
||||||
if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(),
|
if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(),
|
||||||
peek,
|
peek,
|
||||||
|
@ -72,7 +72,7 @@ void ShowOpenDialog(const std::string& title,
|
||||||
int properties,
|
int properties,
|
||||||
atom::NativeWindow* window,
|
atom::NativeWindow* window,
|
||||||
mate::Arguments* args) {
|
mate::Arguments* args) {
|
||||||
v8::Handle<v8::Value> peek = args->PeekNext();
|
v8::Local<v8::Value> peek = args->PeekNext();
|
||||||
file_dialog::OpenDialogCallback callback;
|
file_dialog::OpenDialogCallback callback;
|
||||||
if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
|
if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
|
||||||
peek,
|
peek,
|
||||||
|
@ -92,7 +92,7 @@ void ShowSaveDialog(const std::string& title,
|
||||||
const file_dialog::Filters& filters,
|
const file_dialog::Filters& filters,
|
||||||
atom::NativeWindow* window,
|
atom::NativeWindow* window,
|
||||||
mate::Arguments* args) {
|
mate::Arguments* args) {
|
||||||
v8::Handle<v8::Value> peek = args->PeekNext();
|
v8::Local<v8::Value> peek = args->PeekNext();
|
||||||
file_dialog::SaveDialogCallback callback;
|
file_dialog::SaveDialogCallback callback;
|
||||||
if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
|
if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
|
||||||
peek,
|
peek,
|
||||||
|
@ -106,8 +106,8 @@ void ShowSaveDialog(const std::string& title,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("showMessageBox", &ShowMessageBox);
|
dict.SetMethod("showMessageBox", &ShowMessageBox);
|
||||||
dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
|
dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
|
||||||
|
|
|
@ -86,8 +86,8 @@ mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
|
dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
|
||||||
|
|
|
@ -58,7 +58,7 @@ bool Menu::GetAcceleratorForCommandId(int command_id,
|
||||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||||
v8::Locker locker(isolate);
|
v8::Locker locker(isolate);
|
||||||
v8::HandleScope handle_scope(isolate);
|
v8::HandleScope handle_scope(isolate);
|
||||||
v8::Handle<v8::Value> val = get_accelerator_.Run(command_id);
|
v8::Local<v8::Value> val = get_accelerator_.Run(command_id);
|
||||||
return mate::ConvertFromV8(isolate, val, accelerator);
|
return mate::ConvertFromV8(isolate, val, accelerator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ bool Menu::IsVisibleAt(int index) const {
|
||||||
|
|
||||||
// static
|
// static
|
||||||
void Menu::BuildPrototype(v8::Isolate* isolate,
|
void Menu::BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype) {
|
v8::Local<v8::ObjectTemplate> prototype) {
|
||||||
mate::ObjectTemplateBuilder(isolate, prototype)
|
mate::ObjectTemplateBuilder(isolate, prototype)
|
||||||
.SetMethod("insertItem", &Menu::InsertItemAt)
|
.SetMethod("insertItem", &Menu::InsertItemAt)
|
||||||
.SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
|
.SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
|
||||||
|
@ -180,14 +180,14 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
using atom::api::Menu;
|
using atom::api::Menu;
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
v8::Local<v8::Function> constructor = mate::CreateConstructor<Menu>(
|
v8::Local<v8::Function> constructor = mate::CreateConstructor<Menu>(
|
||||||
isolate, "Menu", base::Bind(&Menu::Create));
|
isolate, "Menu", base::Bind(&Menu::Create));
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("Menu", static_cast<v8::Handle<v8::Value>>(constructor));
|
dict.Set("Menu", static_cast<v8::Local<v8::Value>>(constructor));
|
||||||
#if defined(OS_MACOSX)
|
#if defined(OS_MACOSX)
|
||||||
dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
|
dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
|
||||||
dict.SetMethod("sendActionToFirstResponder",
|
dict.SetMethod("sendActionToFirstResponder",
|
||||||
|
|
|
@ -23,7 +23,7 @@ class Menu : public mate::Wrappable,
|
||||||
static mate::Wrappable* Create();
|
static mate::Wrappable* Create();
|
||||||
|
|
||||||
static void BuildPrototype(v8::Isolate* isolate,
|
static void BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype);
|
v8::Local<v8::ObjectTemplate> prototype);
|
||||||
|
|
||||||
#if defined(OS_MACOSX)
|
#if defined(OS_MACOSX)
|
||||||
// Set the global menubar.
|
// Set the global menubar.
|
||||||
|
@ -88,7 +88,7 @@ class Menu : public mate::Wrappable,
|
||||||
base::Callback<bool(int)> is_checked_;
|
base::Callback<bool(int)> is_checked_;
|
||||||
base::Callback<bool(int)> is_enabled_;
|
base::Callback<bool(int)> is_enabled_;
|
||||||
base::Callback<bool(int)> is_visible_;
|
base::Callback<bool(int)> is_visible_;
|
||||||
base::Callback<v8::Handle<v8::Value>(int)> get_accelerator_;
|
base::Callback<v8::Local<v8::Value>(int)> get_accelerator_;
|
||||||
base::Callback<void(int)> execute_command_;
|
base::Callback<void(int)> execute_command_;
|
||||||
base::Callback<void()> menu_will_show_;
|
base::Callback<void()> menu_will_show_;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ void PowerMonitor::OnResume() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
// static
|
||||||
v8::Handle<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
|
v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
|
||||||
if (!Browser::Get()->is_ready()) {
|
if (!Browser::Get()->is_ready()) {
|
||||||
node::ThrowError("Cannot initialize \"power-monitor\" module"
|
node::ThrowError("Cannot initialize \"power-monitor\" module"
|
||||||
"before app is ready");
|
"before app is ready");
|
||||||
|
@ -56,8 +56,8 @@ v8::Handle<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
#if defined(OS_MACOSX)
|
#if defined(OS_MACOSX)
|
||||||
base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
|
base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -17,7 +17,7 @@ namespace api {
|
||||||
class PowerMonitor : public mate::EventEmitter,
|
class PowerMonitor : public mate::EventEmitter,
|
||||||
public base::PowerObserver {
|
public base::PowerObserver {
|
||||||
public:
|
public:
|
||||||
static v8::Handle<v8::Value> Create(v8::Isolate* isolate);
|
static v8::Local<v8::Value> Create(v8::Isolate* isolate);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
PowerMonitor();
|
PowerMonitor();
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<const net::URLRequest*> {
|
struct Converter<const net::URLRequest*> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const net::URLRequest* val) {
|
const net::URLRequest* val) {
|
||||||
return mate::ObjectTemplateBuilder(isolate)
|
return mate::ObjectTemplateBuilder(isolate)
|
||||||
.SetValue("method", val->method())
|
.SetValue("method", val->method())
|
||||||
|
@ -63,7 +63,7 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
|
||||||
// Call the JS handler.
|
// Call the JS handler.
|
||||||
Protocol::JsProtocolHandler callback =
|
Protocol::JsProtocolHandler callback =
|
||||||
registry_->GetProtocolHandler(request()->url().scheme());
|
registry_->GetProtocolHandler(request()->url().scheme());
|
||||||
v8::Handle<v8::Value> result = callback.Run(request());
|
v8::Local<v8::Value> result = callback.Run(request());
|
||||||
|
|
||||||
// Determine the type of the job we are going to create.
|
// Determine the type of the job we are going to create.
|
||||||
if (result->IsString()) {
|
if (result->IsString()) {
|
||||||
|
@ -73,7 +73,7 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
|
||||||
GetWeakPtr(), "text/plain", "UTF-8", data));
|
GetWeakPtr(), "text/plain", "UTF-8", data));
|
||||||
return;
|
return;
|
||||||
} else if (result->IsObject()) {
|
} else if (result->IsObject()) {
|
||||||
v8::Handle<v8::Object> obj = result->ToObject();
|
v8::Local<v8::Object> obj = result->ToObject();
|
||||||
mate::Dictionary dict(isolate, obj);
|
mate::Dictionary dict(isolate, obj);
|
||||||
std::string name = mate::V8ToString(obj->GetConstructorName());
|
std::string name = mate::V8ToString(obj->GetConstructorName());
|
||||||
if (name == "RequestStringJob") {
|
if (name == "RequestStringJob") {
|
||||||
|
@ -88,7 +88,7 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
|
||||||
return;
|
return;
|
||||||
} else if (name == "RequestBufferJob") {
|
} else if (name == "RequestBufferJob") {
|
||||||
std::string mime_type, encoding;
|
std::string mime_type, encoding;
|
||||||
v8::Handle<v8::Value> buffer;
|
v8::Local<v8::Value> buffer;
|
||||||
dict.Get("mimeType", &mime_type);
|
dict.Get("mimeType", &mime_type);
|
||||||
dict.Get("encoding", &encoding);
|
dict.Get("encoding", &encoding);
|
||||||
dict.Get("data", &buffer);
|
dict.Get("data", &buffer);
|
||||||
|
@ -339,8 +339,8 @@ mate::Handle<Protocol> Protocol::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("protocol", atom::api::Protocol::Create(isolate));
|
dict.Set("protocol", atom::api::Protocol::Create(isolate));
|
||||||
|
|
|
@ -24,7 +24,7 @@ namespace api {
|
||||||
|
|
||||||
class Protocol : public mate::EventEmitter {
|
class Protocol : public mate::EventEmitter {
|
||||||
public:
|
public:
|
||||||
typedef base::Callback<v8::Handle<v8::Value>(const net::URLRequest*)>
|
typedef base::Callback<v8::Local<v8::Value>(const net::URLRequest*)>
|
||||||
JsProtocolHandler;
|
JsProtocolHandler;
|
||||||
|
|
||||||
static mate::Handle<Protocol> Create(v8::Isolate* isolate);
|
static mate::Handle<Protocol> Create(v8::Isolate* isolate);
|
||||||
|
|
|
@ -111,7 +111,7 @@ mate::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
// static
|
||||||
v8::Handle<v8::Value> Screen::Create(v8::Isolate* isolate) {
|
v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
|
||||||
if (!Browser::Get()->is_ready()) {
|
if (!Browser::Get()->is_ready()) {
|
||||||
node::ThrowError("Cannot initialize \"screen\" module before app is ready");
|
node::ThrowError("Cannot initialize \"screen\" module before app is ready");
|
||||||
return v8::Null(isolate);
|
return v8::Null(isolate);
|
||||||
|
@ -132,8 +132,8 @@ v8::Handle<v8::Value> Screen::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.Set("screen", atom::api::Screen::Create(context->GetIsolate()));
|
dict.Set("screen", atom::api::Screen::Create(context->GetIsolate()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ namespace api {
|
||||||
class Screen : public mate::EventEmitter,
|
class Screen : public mate::EventEmitter,
|
||||||
public gfx::DisplayObserver {
|
public gfx::DisplayObserver {
|
||||||
public:
|
public:
|
||||||
static v8::Handle<v8::Value> Create(v8::Isolate* isolate);
|
static v8::Local<v8::Value> Create(v8::Isolate* isolate);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
explicit Screen(gfx::Screen* screen);
|
explicit Screen(gfx::Screen* screen);
|
||||||
|
|
|
@ -128,7 +128,7 @@ bool Tray::CheckTrayLife(mate::Arguments* args) {
|
||||||
|
|
||||||
// static
|
// static
|
||||||
void Tray::BuildPrototype(v8::Isolate* isolate,
|
void Tray::BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype) {
|
v8::Local<v8::ObjectTemplate> prototype) {
|
||||||
mate::ObjectTemplateBuilder(isolate, prototype)
|
mate::ObjectTemplateBuilder(isolate, prototype)
|
||||||
.SetMethod("destroy", &Tray::Destroy)
|
.SetMethod("destroy", &Tray::Destroy)
|
||||||
.SetMethod("setImage", &Tray::SetImage)
|
.SetMethod("setImage", &Tray::SetImage)
|
||||||
|
@ -147,14 +147,14 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
using atom::api::Tray;
|
using atom::api::Tray;
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
v8::Handle<v8::Function> constructor = mate::CreateConstructor<Tray>(
|
v8::Local<v8::Function> constructor = mate::CreateConstructor<Tray>(
|
||||||
isolate, "Tray", base::Bind(&Tray::New));
|
isolate, "Tray", base::Bind(&Tray::New));
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("Tray", static_cast<v8::Handle<v8::Value>>(constructor));
|
dict.Set("Tray", static_cast<v8::Local<v8::Value>>(constructor));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -34,7 +34,7 @@ class Tray : public mate::EventEmitter,
|
||||||
static mate::Wrappable* New(const gfx::Image& image);
|
static mate::Wrappable* New(const gfx::Image& image);
|
||||||
|
|
||||||
static void BuildPrototype(v8::Isolate* isolate,
|
static void BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype);
|
v8::Local<v8::ObjectTemplate> prototype);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
explicit Tray(const gfx::Image& image);
|
explicit Tray(const gfx::Image& image);
|
||||||
|
|
|
@ -751,8 +751,8 @@ mate::Handle<WebContents> WebContents::Create(
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.SetMethod("create", &atom::api::WebContents::Create);
|
dict.SetMethod("create", &atom::api::WebContents::Create);
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<content::WebContents*> {
|
struct Converter<content::WebContents*> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
content::WebContents** out) {
|
content::WebContents** out) {
|
||||||
atom::api::WebContents* contents;
|
atom::api::WebContents* contents;
|
||||||
if (!Converter<atom::api::WebContents*>::FromV8(isolate, val, &contents))
|
if (!Converter<atom::api::WebContents*>::FromV8(isolate, val, &contents))
|
||||||
|
@ -27,7 +27,7 @@ struct Converter<content::WebContents*> {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<atom::WebViewManager::WebViewInfo> {
|
struct Converter<atom::WebViewManager::WebViewInfo> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
atom::WebViewManager::WebViewInfo* out) {
|
atom::WebViewManager::WebViewInfo* out) {
|
||||||
Dictionary options;
|
Dictionary options;
|
||||||
if (!ConvertFromV8(isolate, val, &options))
|
if (!ConvertFromV8(isolate, val, &options))
|
||||||
|
@ -81,8 +81,8 @@ void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
|
||||||
manager->RemoveGuest(guest_instance_id);
|
manager->RemoveGuest(guest_instance_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("addGuest", &AddGuest);
|
dict.SetMethod("addGuest", &AddGuest);
|
||||||
dict.SetMethod("removeGuest", &RemoveGuest);
|
dict.SetMethod("removeGuest", &RemoveGuest);
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<PrintSettings> {
|
struct Converter<PrintSettings> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
PrintSettings* out) {
|
PrintSettings* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -462,7 +462,7 @@ mate::Handle<WebContents> Window::GetDevToolsWebContents(
|
||||||
|
|
||||||
// static
|
// static
|
||||||
void Window::BuildPrototype(v8::Isolate* isolate,
|
void Window::BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype) {
|
v8::Local<v8::ObjectTemplate> prototype) {
|
||||||
mate::ObjectTemplateBuilder(isolate, prototype)
|
mate::ObjectTemplateBuilder(isolate, prototype)
|
||||||
.SetMethod("destroy", &Window::Destroy)
|
.SetMethod("destroy", &Window::Destroy)
|
||||||
.SetMethod("close", &Window::Close)
|
.SetMethod("close", &Window::Close)
|
||||||
|
@ -542,14 +542,14 @@ void Window::BuildPrototype(v8::Isolate* isolate,
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
using atom::api::Window;
|
using atom::api::Window;
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
v8::Local<v8::Function> constructor = mate::CreateConstructor<Window>(
|
v8::Local<v8::Function> constructor = mate::CreateConstructor<Window>(
|
||||||
isolate, "BrowserWindow", base::Bind(&Window::New));
|
isolate, "BrowserWindow", base::Bind(&Window::New));
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("BrowserWindow", static_cast<v8::Handle<v8::Value>>(constructor));
|
dict.Set("BrowserWindow", static_cast<v8::Local<v8::Value>>(constructor));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Window : public mate::EventEmitter,
|
||||||
const mate::Dictionary& options);
|
const mate::Dictionary& options);
|
||||||
|
|
||||||
static void BuildPrototype(v8::Isolate* isolate,
|
static void BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype);
|
v8::Local<v8::ObjectTemplate> prototype);
|
||||||
|
|
||||||
NativeWindow* window() const { return window_.get(); }
|
NativeWindow* window() const { return window_.get(); }
|
||||||
|
|
||||||
|
@ -160,7 +160,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<atom::NativeWindow*> {
|
struct Converter<atom::NativeWindow*> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
atom::NativeWindow** out) {
|
atom::NativeWindow** out) {
|
||||||
// null would be tranfered to NULL.
|
// null would be tranfered to NULL.
|
||||||
if (val->IsNull()) {
|
if (val->IsNull()) {
|
||||||
|
|
|
@ -43,13 +43,13 @@ bool EventEmitter::CallEmit(v8::Isolate* isolate,
|
||||||
content::WebContents* sender,
|
content::WebContents* sender,
|
||||||
IPC::Message* message,
|
IPC::Message* message,
|
||||||
ValueArray args) {
|
ValueArray args) {
|
||||||
v8::Handle<v8::Object> event;
|
v8::Local<v8::Object> event;
|
||||||
bool use_native_event = sender && message;
|
bool use_native_event = sender && message;
|
||||||
|
|
||||||
if (use_native_event) {
|
if (use_native_event) {
|
||||||
mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
|
mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
|
||||||
native_event->SetSenderAndMessage(sender, message);
|
native_event->SetSenderAndMessage(sender, message);
|
||||||
event = v8::Handle<v8::Object>::Cast(native_event.ToV8());
|
event = v8::Local<v8::Object>::Cast(native_event.ToV8());
|
||||||
} else {
|
} else {
|
||||||
event = CreateEventObject(isolate);
|
event = CreateEventObject(isolate);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace mate {
|
||||||
// Provide helperers to emit event in JavaScript.
|
// Provide helperers to emit event in JavaScript.
|
||||||
class EventEmitter : public Wrappable {
|
class EventEmitter : public Wrappable {
|
||||||
public:
|
public:
|
||||||
typedef std::vector<v8::Handle<v8::Value>> ValueArray;
|
typedef std::vector<v8::Local<v8::Value>> ValueArray;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
EventEmitter();
|
EventEmitter();
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace {
|
||||||
|
|
||||||
class Archive : public mate::Wrappable {
|
class Archive : public mate::Wrappable {
|
||||||
public:
|
public:
|
||||||
static v8::Handle<v8::Value> Create(v8::Isolate* isolate,
|
static v8::Local<v8::Value> Create(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
scoped_ptr<asar::Archive> archive(new asar::Archive(path));
|
scoped_ptr<asar::Archive> archive(new asar::Archive(path));
|
||||||
if (!archive->Init())
|
if (!archive->Init())
|
||||||
|
@ -34,7 +34,7 @@ class Archive : public mate::Wrappable {
|
||||||
: archive_(archive.Pass()) {}
|
: archive_(archive.Pass()) {}
|
||||||
|
|
||||||
// Reads the offset and size of file.
|
// Reads the offset and size of file.
|
||||||
v8::Handle<v8::Value> GetFileInfo(v8::Isolate* isolate,
|
v8::Local<v8::Value> GetFileInfo(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
asar::Archive::FileInfo info;
|
asar::Archive::FileInfo info;
|
||||||
if (!archive_ || !archive_->GetFileInfo(path, &info))
|
if (!archive_ || !archive_->GetFileInfo(path, &info))
|
||||||
|
@ -47,7 +47,7 @@ class Archive : public mate::Wrappable {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns a fake result of fs.stat(path).
|
// Returns a fake result of fs.stat(path).
|
||||||
v8::Handle<v8::Value> Stat(v8::Isolate* isolate,
|
v8::Local<v8::Value> Stat(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
asar::Archive::Stats stats;
|
asar::Archive::Stats stats;
|
||||||
if (!archive_ || !archive_->Stat(path, &stats))
|
if (!archive_ || !archive_->Stat(path, &stats))
|
||||||
|
@ -62,7 +62,7 @@ class Archive : public mate::Wrappable {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns all files under a directory.
|
// Returns all files under a directory.
|
||||||
v8::Handle<v8::Value> Readdir(v8::Isolate* isolate,
|
v8::Local<v8::Value> Readdir(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
std::vector<base::FilePath> files;
|
std::vector<base::FilePath> files;
|
||||||
if (!archive_ || !archive_->Readdir(path, &files))
|
if (!archive_ || !archive_->Readdir(path, &files))
|
||||||
|
@ -71,7 +71,7 @@ class Archive : public mate::Wrappable {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the path of file with symbol link resolved.
|
// Returns the path of file with symbol link resolved.
|
||||||
v8::Handle<v8::Value> Realpath(v8::Isolate* isolate,
|
v8::Local<v8::Value> Realpath(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
base::FilePath realpath;
|
base::FilePath realpath;
|
||||||
if (!archive_ || !archive_->Realpath(path, &realpath))
|
if (!archive_ || !archive_->Realpath(path, &realpath))
|
||||||
|
@ -80,7 +80,7 @@ class Archive : public mate::Wrappable {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy the file out into a temporary file and returns the new path.
|
// Copy the file out into a temporary file and returns the new path.
|
||||||
v8::Handle<v8::Value> CopyFileOut(v8::Isolate* isolate,
|
v8::Local<v8::Value> CopyFileOut(v8::Isolate* isolate,
|
||||||
const base::FilePath& path) {
|
const base::FilePath& path) {
|
||||||
base::FilePath new_path;
|
base::FilePath new_path;
|
||||||
if (!archive_ || !archive_->CopyFileOut(path, &new_path))
|
if (!archive_ || !archive_->CopyFileOut(path, &new_path))
|
||||||
|
@ -120,8 +120,8 @@ class Archive : public mate::Wrappable {
|
||||||
};
|
};
|
||||||
|
|
||||||
void InitAsarSupport(v8::Isolate* isolate,
|
void InitAsarSupport(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> process,
|
v8::Local<v8::Value> process,
|
||||||
v8::Handle<v8::Value> require) {
|
v8::Local<v8::Value> require) {
|
||||||
// Evaluate asar_init.coffee.
|
// Evaluate asar_init.coffee.
|
||||||
v8::Local<v8::Script> asar_init = v8::Script::Compile(v8::String::NewFromUtf8(
|
v8::Local<v8::Script> asar_init = v8::Script::Compile(v8::String::NewFromUtf8(
|
||||||
isolate,
|
isolate,
|
||||||
|
@ -131,8 +131,8 @@ void InitAsarSupport(v8::Isolate* isolate,
|
||||||
v8::Local<v8::Value> result = asar_init->Run();
|
v8::Local<v8::Value> result = asar_init->Run();
|
||||||
|
|
||||||
// Initialize asar support.
|
// Initialize asar support.
|
||||||
base::Callback<void(v8::Handle<v8::Value>,
|
base::Callback<void(v8::Local<v8::Value>,
|
||||||
v8::Handle<v8::Value>,
|
v8::Local<v8::Value>,
|
||||||
std::string)> init;
|
std::string)> init;
|
||||||
if (mate::ConvertFromV8(isolate, result, &init)) {
|
if (mate::ConvertFromV8(isolate, result, &init)) {
|
||||||
init.Run(process,
|
init.Run(process,
|
||||||
|
@ -141,8 +141,8 @@ void InitAsarSupport(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("createArchive", &Archive::Create);
|
dict.SetMethod("createArchive", &Archive::Create);
|
||||||
dict.SetMethod("initAsarSupport", &InitAsarSupport);
|
dict.SetMethod("initAsarSupport", &InitAsarSupport);
|
||||||
|
|
|
@ -19,7 +19,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<ui::ClipboardType> {
|
struct Converter<ui::ClipboardType> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
ui::ClipboardType* out) {
|
ui::ClipboardType* out) {
|
||||||
std::string type;
|
std::string type;
|
||||||
if (!Converter<std::string>::FromV8(isolate, val, &type))
|
if (!Converter<std::string>::FromV8(isolate, val, &type))
|
||||||
|
@ -78,8 +78,8 @@ void Clear(ui::ClipboardType type) {
|
||||||
ui::Clipboard::GetForCurrentThread()->Clear(type);
|
ui::Clipboard::GetForCurrentThread()->Clear(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("_has", &Has);
|
dict.SetMethod("_has", &Has);
|
||||||
dict.SetMethod("_read", &Read);
|
dict.SetMethod("_read", &Read);
|
||||||
|
|
|
@ -16,15 +16,15 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<std::map<std::string, std::string> > {
|
struct Converter<std::map<std::string, std::string> > {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
std::map<std::string, std::string>* out) {
|
std::map<std::string, std::string>* out) {
|
||||||
if (!val->IsObject())
|
if (!val->IsObject())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
v8::Handle<v8::Object> dict = val->ToObject();
|
v8::Local<v8::Object> dict = val->ToObject();
|
||||||
v8::Handle<v8::Array> keys = dict->GetOwnPropertyNames();
|
v8::Local<v8::Array> keys = dict->GetOwnPropertyNames();
|
||||||
for (uint32_t i = 0; i < keys->Length(); ++i) {
|
for (uint32_t i = 0; i < keys->Length(); ++i) {
|
||||||
v8::Handle<v8::Value> key = keys->Get(i);
|
v8::Local<v8::Value> key = keys->Get(i);
|
||||||
(*out)[V8ToString(key)] = V8ToString(dict->Get(key));
|
(*out)[V8ToString(key)] = V8ToString(dict->Get(key));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -35,8 +35,8 @@ struct Converter<std::map<std::string, std::string> > {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
using crash_reporter::CrashReporter;
|
using crash_reporter::CrashReporter;
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("start",
|
dict.SetMethod("start",
|
||||||
|
|
|
@ -23,7 +23,7 @@ IDWeakMap::IDWeakMap()
|
||||||
IDWeakMap::~IDWeakMap() {
|
IDWeakMap::~IDWeakMap() {
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Handle<v8::Object> object) {
|
int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
|
||||||
int32_t key = GetNextID();
|
int32_t key = GetNextID();
|
||||||
object->SetHiddenValue(mate::StringToV8(isolate, "IDWeakMapKey"),
|
object->SetHiddenValue(mate::StringToV8(isolate, "IDWeakMapKey"),
|
||||||
mate::Converter<int32_t>::ToV8(isolate, key));
|
mate::Converter<int32_t>::ToV8(isolate, key));
|
||||||
|
@ -33,7 +33,7 @@ int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Handle<v8::Object> object) {
|
||||||
return key;
|
return key;
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> IDWeakMap::Get(v8::Isolate* isolate, int32_t key) {
|
v8::Local<v8::Value> IDWeakMap::Get(v8::Isolate* isolate, int32_t key) {
|
||||||
if (!Has(key)) {
|
if (!Has(key)) {
|
||||||
node::ThrowError("Invalid key");
|
node::ThrowError("Invalid key");
|
||||||
return v8::Undefined(isolate);
|
return v8::Undefined(isolate);
|
||||||
|
@ -67,7 +67,7 @@ int IDWeakMap::GetNextID() {
|
||||||
|
|
||||||
// static
|
// static
|
||||||
void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
|
void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype) {
|
v8::Local<v8::ObjectTemplate> prototype) {
|
||||||
mate::ObjectTemplateBuilder(isolate, prototype)
|
mate::ObjectTemplateBuilder(isolate, prototype)
|
||||||
.SetMethod("add", &IDWeakMap::Add)
|
.SetMethod("add", &IDWeakMap::Add)
|
||||||
.SetMethod("get", &IDWeakMap::Get)
|
.SetMethod("get", &IDWeakMap::Get)
|
||||||
|
@ -91,8 +91,8 @@ void IDWeakMap::WeakCallback(
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
using atom::api::IDWeakMap;
|
using atom::api::IDWeakMap;
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
v8::Local<v8::Function> constructor = mate::CreateConstructor<IDWeakMap>(
|
v8::Local<v8::Function> constructor = mate::CreateConstructor<IDWeakMap>(
|
||||||
|
|
|
@ -23,13 +23,13 @@ class IDWeakMap : public mate::Wrappable {
|
||||||
IDWeakMap();
|
IDWeakMap();
|
||||||
|
|
||||||
static void BuildPrototype(v8::Isolate* isolate,
|
static void BuildPrototype(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::ObjectTemplate> prototype);
|
v8::Local<v8::ObjectTemplate> prototype);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual ~IDWeakMap();
|
virtual ~IDWeakMap();
|
||||||
|
|
||||||
int32_t Add(v8::Isolate* isolate, v8::Handle<v8::Object> object);
|
int32_t Add(v8::Isolate* isolate, v8::Local<v8::Object> object);
|
||||||
v8::Handle<v8::Value> Get(v8::Isolate* isolate, int32_t key);
|
v8::Local<v8::Value> Get(v8::Isolate* isolate, int32_t key);
|
||||||
bool Has(int32_t key) const;
|
bool Has(int32_t key) const;
|
||||||
std::vector<int32_t> Keys() const;
|
std::vector<int32_t> Keys() const;
|
||||||
void Remove(int32_t key);
|
void Remove(int32_t key);
|
||||||
|
|
|
@ -145,14 +145,14 @@ mate::ObjectTemplateBuilder NativeImage::GetObjectTemplateBuilder(
|
||||||
isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
|
isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
|
v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
|
||||||
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
|
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
|
||||||
return node::Buffer::New(isolate,
|
return node::Buffer::New(isolate,
|
||||||
reinterpret_cast<const char*>(png->front()),
|
reinterpret_cast<const char*>(png->front()),
|
||||||
png->size());
|
png->size());
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
|
v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
|
||||||
std::vector<unsigned char> output;
|
std::vector<unsigned char> output;
|
||||||
gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
|
gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
|
||||||
return node::Buffer::New(isolate,
|
return node::Buffer::New(isolate,
|
||||||
|
@ -225,7 +225,7 @@ mate::Handle<NativeImage> NativeImage::CreateFromPath(
|
||||||
|
|
||||||
// static
|
// static
|
||||||
mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
|
mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
|
||||||
mate::Arguments* args, v8::Handle<v8::Value> buffer) {
|
mate::Arguments* args, v8::Local<v8::Value> buffer) {
|
||||||
double scale_factor = 1.;
|
double scale_factor = 1.;
|
||||||
args->GetNext(&scale_factor);
|
args->GetNext(&scale_factor);
|
||||||
|
|
||||||
|
@ -258,8 +258,8 @@ mate::Handle<NativeImage> NativeImage::CreateFromDataURL(
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("createEmpty", &atom::api::NativeImage::CreateEmpty);
|
dict.SetMethod("createEmpty", &atom::api::NativeImage::CreateEmpty);
|
||||||
dict.SetMethod("createFromPath", &atom::api::NativeImage::CreateFromPath);
|
dict.SetMethod("createFromPath", &atom::api::NativeImage::CreateFromPath);
|
||||||
|
|
|
@ -41,7 +41,7 @@ class NativeImage : public mate::Wrappable {
|
||||||
static mate::Handle<NativeImage> CreateFromPath(
|
static mate::Handle<NativeImage> CreateFromPath(
|
||||||
v8::Isolate* isolate, const base::FilePath& path);
|
v8::Isolate* isolate, const base::FilePath& path);
|
||||||
static mate::Handle<NativeImage> CreateFromBuffer(
|
static mate::Handle<NativeImage> CreateFromBuffer(
|
||||||
mate::Arguments* args, v8::Handle<v8::Value> buffer);
|
mate::Arguments* args, v8::Local<v8::Value> buffer);
|
||||||
static mate::Handle<NativeImage> CreateFromDataURL(
|
static mate::Handle<NativeImage> CreateFromDataURL(
|
||||||
v8::Isolate* isolate, const GURL& url);
|
v8::Isolate* isolate, const GURL& url);
|
||||||
|
|
||||||
|
@ -59,8 +59,8 @@ class NativeImage : public mate::Wrappable {
|
||||||
v8::Isolate* isolate) override;
|
v8::Isolate* isolate) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
v8::Handle<v8::Value> ToPNG(v8::Isolate* isolate);
|
v8::Local<v8::Value> ToPNG(v8::Isolate* isolate);
|
||||||
v8::Handle<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
|
v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
|
||||||
std::string ToDataURL();
|
std::string ToDataURL();
|
||||||
bool IsEmpty();
|
bool IsEmpty();
|
||||||
gfx::Size GetSize();
|
gfx::Size GetSize();
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
|
dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
|
||||||
dict.SetMethod("openItem", &platform_util::OpenItem);
|
dict.SetMethod("openItem", &platform_util::OpenItem);
|
||||||
|
|
|
@ -10,31 +10,31 @@
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
v8::Handle<v8::Object> CreateObjectWithName(v8::Isolate* isolate,
|
v8::Local<v8::Object> CreateObjectWithName(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::String> name) {
|
v8::Local<v8::String> name) {
|
||||||
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(isolate);
|
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(isolate);
|
||||||
t->SetClassName(name);
|
t->SetClassName(name);
|
||||||
return t->GetFunction()->NewInstance();
|
return t->GetFunction()->NewInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> GetHiddenValue(v8::Handle<v8::Object> object,
|
v8::Local<v8::Value> GetHiddenValue(v8::Local<v8::Object> object,
|
||||||
v8::Handle<v8::String> key) {
|
v8::Local<v8::String> key) {
|
||||||
return object->GetHiddenValue(key);
|
return object->GetHiddenValue(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetHiddenValue(v8::Handle<v8::Object> object,
|
void SetHiddenValue(v8::Local<v8::Object> object,
|
||||||
v8::Handle<v8::String> key,
|
v8::Local<v8::String> key,
|
||||||
v8::Handle<v8::Value> value) {
|
v8::Local<v8::Value> value) {
|
||||||
object->SetHiddenValue(key, value);
|
object->SetHiddenValue(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t GetObjectHash(v8::Handle<v8::Object> object) {
|
int32_t GetObjectHash(v8::Local<v8::Object> object) {
|
||||||
return object->GetIdentityHash();
|
return object->GetIdentityHash();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetDestructor(v8::Isolate* isolate,
|
void SetDestructor(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> object,
|
v8::Local<v8::Object> object,
|
||||||
v8::Handle<v8::Function> callback) {
|
v8::Local<v8::Function> callback) {
|
||||||
atom::ObjectLifeMonitor::BindTo(isolate, object, callback);
|
atom::ObjectLifeMonitor::BindTo(isolate, object, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,8 +42,8 @@ void TakeHeapSnapshot(v8::Isolate* isolate) {
|
||||||
isolate->GetHeapProfiler()->TakeHeapSnapshot();
|
isolate->GetHeapProfiler()->TakeHeapSnapshot();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("createObjectWithName", &CreateObjectWithName);
|
dict.SetMethod("createObjectWithName", &CreateObjectWithName);
|
||||||
dict.SetMethod("getHiddenValue", &GetHiddenValue);
|
dict.SetMethod("getHiddenValue", &GetHiddenValue);
|
||||||
|
|
|
@ -49,7 +49,7 @@ AtomBindings::~AtomBindings() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void AtomBindings::BindTo(v8::Isolate* isolate,
|
void AtomBindings::BindTo(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> process) {
|
v8::Local<v8::Object> process) {
|
||||||
v8::V8::SetFatalErrorHandler(FatalErrorCallback);
|
v8::V8::SetFatalErrorHandler(FatalErrorCallback);
|
||||||
|
|
||||||
mate::Dictionary dict(isolate, process);
|
mate::Dictionary dict(isolate, process);
|
||||||
|
|
|
@ -24,7 +24,7 @@ class AtomBindings {
|
||||||
|
|
||||||
// Add process.atomBinding function, which behaves like process.binding but
|
// Add process.atomBinding function, which behaves like process.binding but
|
||||||
// load native code from atom-shell instead.
|
// load native code from atom-shell instead.
|
||||||
void BindTo(v8::Isolate* isolate, v8::Handle<v8::Object> process);
|
void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ActivateUVLoop(v8::Isolate* isolate);
|
void ActivateUVLoop(v8::Isolate* isolate);
|
||||||
|
|
|
@ -11,8 +11,8 @@ namespace atom {
|
||||||
|
|
||||||
// static
|
// static
|
||||||
void ObjectLifeMonitor::BindTo(v8::Isolate* isolate,
|
void ObjectLifeMonitor::BindTo(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> target,
|
v8::Local<v8::Object> target,
|
||||||
v8::Handle<v8::Value> destructor) {
|
v8::Local<v8::Value> destructor) {
|
||||||
target->SetHiddenValue(MATE_STRING_NEW(isolate, "destructor"), destructor);
|
target->SetHiddenValue(MATE_STRING_NEW(isolate, "destructor"), destructor);
|
||||||
|
|
||||||
ObjectLifeMonitor* olm = new ObjectLifeMonitor();
|
ObjectLifeMonitor* olm = new ObjectLifeMonitor();
|
||||||
|
|
|
@ -13,8 +13,8 @@ namespace atom {
|
||||||
class ObjectLifeMonitor {
|
class ObjectLifeMonitor {
|
||||||
public:
|
public:
|
||||||
static void BindTo(v8::Isolate* isolate,
|
static void BindTo(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> target,
|
v8::Local<v8::Object> target,
|
||||||
v8::Handle<v8::Value> destructor);
|
v8::Local<v8::Value> destructor);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ObjectLifeMonitor();
|
ObjectLifeMonitor();
|
||||||
|
|
|
@ -12,7 +12,7 @@ namespace mate {
|
||||||
|
|
||||||
// static
|
// static
|
||||||
bool Converter<ui::Accelerator>::FromV8(
|
bool Converter<ui::Accelerator>::FromV8(
|
||||||
v8::Isolate* isolate, v8::Handle<v8::Value> val, ui::Accelerator* out) {
|
v8::Isolate* isolate, v8::Local<v8::Value> val, ui::Accelerator* out) {
|
||||||
std::string keycode;
|
std::string keycode;
|
||||||
if (!ConvertFromV8(isolate, val, &keycode))
|
if (!ConvertFromV8(isolate, val, &keycode))
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<ui::Accelerator> {
|
struct Converter<ui::Accelerator> {
|
||||||
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
|
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
|
||||||
ui::Accelerator* out);
|
ui::Accelerator* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::FilePath> {
|
struct Converter<base::FilePath> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const base::FilePath& val) {
|
const base::FilePath& val) {
|
||||||
return Converter<base::FilePath::StringType>::ToV8(isolate, val.value());
|
return Converter<base::FilePath::StringType>::ToV8(isolate, val.value());
|
||||||
}
|
}
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::FilePath* out) {
|
base::FilePath* out) {
|
||||||
base::FilePath::StringType path;
|
base::FilePath::StringType path;
|
||||||
if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
|
if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
namespace mate {
|
namespace mate {
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
|
v8::Local<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Point& val) {
|
const gfx::Point& val) {
|
||||||
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
||||||
dict.Set("x", val.x());
|
dict.Set("x", val.x());
|
||||||
|
@ -21,7 +21,7 @@ v8::Handle<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
|
bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Point* out) {
|
gfx::Point* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -33,7 +33,7 @@ bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
|
v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Size& val) {
|
const gfx::Size& val) {
|
||||||
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
||||||
dict.Set("width", val.width());
|
dict.Set("width", val.width());
|
||||||
|
@ -42,7 +42,7 @@ v8::Handle<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
|
bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Size* out) {
|
gfx::Size* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -54,7 +54,7 @@ bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
|
v8::Local<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Rect& val) {
|
const gfx::Rect& val) {
|
||||||
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
||||||
dict.Set("x", val.x());
|
dict.Set("x", val.x());
|
||||||
|
@ -65,7 +65,7 @@ v8::Handle<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Converter<gfx::Rect>::FromV8(v8::Isolate* isolate,
|
bool Converter<gfx::Rect>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Rect* out) {
|
gfx::Rect* out) {
|
||||||
mate::Dictionary dict;
|
mate::Dictionary dict;
|
||||||
if (!ConvertFromV8(isolate, val, &dict))
|
if (!ConvertFromV8(isolate, val, &dict))
|
||||||
|
@ -80,7 +80,7 @@ bool Converter<gfx::Rect>::FromV8(v8::Isolate* isolate,
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Display::TouchSupport> {
|
struct Converter<gfx::Display::TouchSupport> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Display::TouchSupport& val) {
|
const gfx::Display::TouchSupport& val) {
|
||||||
switch (val) {
|
switch (val) {
|
||||||
case gfx::Display::TOUCH_SUPPORT_AVAILABLE:
|
case gfx::Display::TOUCH_SUPPORT_AVAILABLE:
|
||||||
|
@ -93,7 +93,7 @@ struct Converter<gfx::Display::TouchSupport> {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<gfx::Display>::ToV8(v8::Isolate* isolate,
|
v8::Local<v8::Value> Converter<gfx::Display>::ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Display& val) {
|
const gfx::Display& val) {
|
||||||
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
||||||
dict.Set("id", val.id());
|
dict.Set("id", val.id());
|
||||||
|
|
|
@ -18,37 +18,37 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Point> {
|
struct Converter<gfx::Point> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Point& val);
|
const gfx::Point& val);
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Point* out);
|
gfx::Point* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Size> {
|
struct Converter<gfx::Size> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Size& val);
|
const gfx::Size& val);
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Size* out);
|
gfx::Size* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Rect> {
|
struct Converter<gfx::Rect> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Rect& val);
|
const gfx::Rect& val);
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Rect* out);
|
gfx::Rect* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Display> {
|
struct Converter<gfx::Display> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Display& val);
|
const gfx::Display& val);
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Display* out);
|
gfx::Display* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<GURL> {
|
struct Converter<GURL> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const GURL& val) {
|
const GURL& val) {
|
||||||
return ConvertToV8(isolate, val.spec());
|
return ConvertToV8(isolate, val.spec());
|
||||||
}
|
}
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
GURL* out) {
|
GURL* out) {
|
||||||
std::string url;
|
std::string url;
|
||||||
if (Converter<std::string>::FromV8(isolate, val, &url)) {
|
if (Converter<std::string>::FromV8(isolate, val, &url)) {
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
namespace mate {
|
namespace mate {
|
||||||
|
|
||||||
bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
|
bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::ImageSkia* out) {
|
gfx::ImageSkia* out) {
|
||||||
gfx::Image image;
|
gfx::Image image;
|
||||||
if (!ConvertFromV8(isolate, val, &image))
|
if (!ConvertFromV8(isolate, val, &image))
|
||||||
|
@ -22,7 +22,7 @@ bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
|
bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Image* out) {
|
gfx::Image* out) {
|
||||||
if (val->IsNull())
|
if (val->IsNull())
|
||||||
return true;
|
return true;
|
||||||
|
@ -43,7 +43,7 @@ bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<gfx::Image>::ToV8(v8::Isolate* isolate,
|
v8::Local<v8::Value> Converter<gfx::Image>::ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Image& val) {
|
const gfx::Image& val) {
|
||||||
return ConvertToV8(isolate, atom::api::NativeImage::Create(isolate, val));
|
return ConvertToV8(isolate, atom::api::NativeImage::Create(isolate, val));
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,16 +17,16 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::ImageSkia> {
|
struct Converter<gfx::ImageSkia> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::ImageSkia* out);
|
gfx::ImageSkia* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<gfx::Image> {
|
struct Converter<gfx::Image> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
gfx::Image* out);
|
gfx::Image* out);
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const gfx::Image& val);
|
const gfx::Image& val);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -12,13 +12,13 @@ namespace mate {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::string16> {
|
struct Converter<base::string16> {
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const base::string16& val) {
|
const base::string16& val) {
|
||||||
return MATE_STRING_NEW_FROM_UTF16(
|
return MATE_STRING_NEW_FROM_UTF16(
|
||||||
isolate, reinterpret_cast<const uint16_t*>(val.data()), val.size());
|
isolate, reinterpret_cast<const uint16_t*>(val.data()), val.size());
|
||||||
}
|
}
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::string16* out) {
|
base::string16* out) {
|
||||||
if (!val->IsString())
|
if (!val->IsString())
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -46,7 +46,7 @@ class V8ValueConverter::FromV8ValueState {
|
||||||
// other handle B in the map points to the same object as A. Note that A can
|
// other handle B in the map points to the same object as A. Note that A can
|
||||||
// be unique even if there already is another handle with the same identity
|
// be unique even if there already is another handle with the same identity
|
||||||
// hash (key) in the map, because two objects can have the same hash.
|
// hash (key) in the map, because two objects can have the same hash.
|
||||||
bool UpdateAndCheckUniqueness(v8::Handle<v8::Object> handle) {
|
bool UpdateAndCheckUniqueness(v8::Local<v8::Object> handle) {
|
||||||
typedef HashToHandleMap::const_iterator Iterator;
|
typedef HashToHandleMap::const_iterator Iterator;
|
||||||
int hash = handle->GetIdentityHash();
|
int hash = handle->GetIdentityHash();
|
||||||
// We only compare using == with handles to objects with the same identity
|
// We only compare using == with handles to objects with the same identity
|
||||||
|
@ -67,7 +67,7 @@ class V8ValueConverter::FromV8ValueState {
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef std::multimap<int, v8::Handle<v8::Object> > HashToHandleMap;
|
typedef std::multimap<int, v8::Local<v8::Object> > HashToHandleMap;
|
||||||
HashToHandleMap unique_map_;
|
HashToHandleMap unique_map_;
|
||||||
|
|
||||||
int max_recursion_depth_;
|
int max_recursion_depth_;
|
||||||
|
@ -202,7 +202,7 @@ v8::Local<v8::Value> V8ValueConverter::ToV8Object(
|
||||||
|
|
||||||
base::Value* V8ValueConverter::FromV8ValueImpl(
|
base::Value* V8ValueConverter::FromV8ValueImpl(
|
||||||
FromV8ValueState* state,
|
FromV8ValueState* state,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
v8::Isolate* isolate) const {
|
v8::Isolate* isolate) const {
|
||||||
CHECK(!val.IsEmpty());
|
CHECK(!val.IsEmpty());
|
||||||
|
|
||||||
|
@ -267,7 +267,7 @@ base::Value* V8ValueConverter::FromV8ValueImpl(
|
||||||
}
|
}
|
||||||
|
|
||||||
base::Value* V8ValueConverter::FromV8Array(
|
base::Value* V8ValueConverter::FromV8Array(
|
||||||
v8::Handle<v8::Array> val,
|
v8::Local<v8::Array> val,
|
||||||
FromV8ValueState* state,
|
FromV8ValueState* state,
|
||||||
v8::Isolate* isolate) const {
|
v8::Isolate* isolate) const {
|
||||||
if (!state->UpdateAndCheckUniqueness(val))
|
if (!state->UpdateAndCheckUniqueness(val))
|
||||||
|
|
|
@ -43,9 +43,9 @@ class V8ValueConverter {
|
||||||
const base::DictionaryValue* dictionary) const;
|
const base::DictionaryValue* dictionary) const;
|
||||||
|
|
||||||
base::Value* FromV8ValueImpl(FromV8ValueState* state,
|
base::Value* FromV8ValueImpl(FromV8ValueState* state,
|
||||||
v8::Handle<v8::Value> value,
|
v8::Local<v8::Value> value,
|
||||||
v8::Isolate* isolate) const;
|
v8::Isolate* isolate) const;
|
||||||
base::Value* FromV8Array(v8::Handle<v8::Array> array,
|
base::Value* FromV8Array(v8::Local<v8::Array> array,
|
||||||
FromV8ValueState* state,
|
FromV8ValueState* state,
|
||||||
v8::Isolate* isolate) const;
|
v8::Isolate* isolate) const;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
namespace mate {
|
namespace mate {
|
||||||
|
|
||||||
bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
|
bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::DictionaryValue* out) {
|
base::DictionaryValue* out) {
|
||||||
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
||||||
scoped_ptr<base::Value> value(converter->FromV8Value(
|
scoped_ptr<base::Value> value(converter->FromV8Value(
|
||||||
|
@ -24,7 +24,7 @@ bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
|
bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::ListValue* out) {
|
base::ListValue* out) {
|
||||||
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
||||||
scoped_ptr<base::Value> value(converter->FromV8Value(
|
scoped_ptr<base::Value> value(converter->FromV8Value(
|
||||||
|
@ -37,7 +37,7 @@ bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> Converter<base::ListValue>::ToV8(
|
v8::Local<v8::Value> Converter<base::ListValue>::ToV8(
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
const base::ListValue& val) {
|
const base::ListValue& val) {
|
||||||
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
|
||||||
|
|
|
@ -17,16 +17,16 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::DictionaryValue> {
|
struct Converter<base::DictionaryValue> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::DictionaryValue* out);
|
base::DictionaryValue* out);
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct Converter<base::ListValue> {
|
struct Converter<base::ListValue> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
base::ListValue* out);
|
base::ListValue* out);
|
||||||
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||||
const base::ListValue& val);
|
const base::ListValue& val);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -62,8 +62,8 @@ base::string16 SendSync(const base::string16& channel,
|
||||||
return json;
|
return json;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
mate::Dictionary dict(context->GetIsolate(), exports);
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
||||||
dict.SetMethod("send", &Send);
|
dict.SetMethod("send", &Send);
|
||||||
dict.SetMethod("sendSync", &SendSync);
|
dict.SetMethod("sendSync", &SendSync);
|
||||||
|
|
|
@ -41,7 +41,7 @@ bool HasWordCharacters(const base::string16& text, int index) {
|
||||||
SpellCheckClient::SpellCheckClient(const std::string& language,
|
SpellCheckClient::SpellCheckClient(const std::string& language,
|
||||||
bool auto_spell_correct_turned_on,
|
bool auto_spell_correct_turned_on,
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> provider)
|
v8::Local<v8::Object> provider)
|
||||||
: auto_spell_correct_turned_on_(auto_spell_correct_turned_on),
|
: auto_spell_correct_turned_on_(auto_spell_correct_turned_on),
|
||||||
isolate_(isolate),
|
isolate_(isolate),
|
||||||
provider_(isolate, provider) {
|
provider_(isolate, provider) {
|
||||||
|
@ -160,8 +160,8 @@ bool SpellCheckClient::SpellCheckWord(const base::string16& word_to_check) {
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
v8::HandleScope handle_scope(isolate_);
|
v8::HandleScope handle_scope(isolate_);
|
||||||
v8::Handle<v8::Value> word = mate::ConvertToV8(isolate_, word_to_check);
|
v8::Local<v8::Value> word = mate::ConvertToV8(isolate_, word_to_check);
|
||||||
v8::Handle<v8::Value> result = spell_check_.NewHandle()->Call(
|
v8::Local<v8::Value> result = spell_check_.NewHandle()->Call(
|
||||||
provider_.NewHandle(), 1, &word);
|
provider_.NewHandle(), 1, &word);
|
||||||
|
|
||||||
if (result->IsBoolean())
|
if (result->IsBoolean())
|
||||||
|
|
|
@ -22,7 +22,7 @@ class SpellCheckClient : public blink::WebSpellCheckClient {
|
||||||
SpellCheckClient(const std::string& language,
|
SpellCheckClient(const std::string& language,
|
||||||
bool auto_spell_correct_turned_on,
|
bool auto_spell_correct_turned_on,
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Object> provider);
|
v8::Local<v8::Object> provider);
|
||||||
virtual ~SpellCheckClient();
|
virtual ~SpellCheckClient();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -27,7 +27,7 @@ namespace mate {
|
||||||
template<>
|
template<>
|
||||||
struct Converter<WTF::String> {
|
struct Converter<WTF::String> {
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
WTF::String* out) {
|
WTF::String* out) {
|
||||||
if (!val->IsString())
|
if (!val->IsString())
|
||||||
return false;
|
return false;
|
||||||
|
@ -72,8 +72,8 @@ double WebFrame::GetZoomFactor() const {
|
||||||
return blink::WebView::zoomLevelToZoomFactor(GetZoomLevel());
|
return blink::WebView::zoomLevelToZoomFactor(GetZoomLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
v8::Handle<v8::Value> WebFrame::RegisterEmbedderCustomElement(
|
v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
|
||||||
const base::string16& name, v8::Handle<v8::Object> options) {
|
const base::string16& name, v8::Local<v8::Object> options) {
|
||||||
blink::WebExceptionCode c = 0;
|
blink::WebExceptionCode c = 0;
|
||||||
return web_frame_->document().registerEmbedderCustomElement(name, options, c);
|
return web_frame_->document().registerEmbedderCustomElement(name, options, c);
|
||||||
}
|
}
|
||||||
|
@ -85,7 +85,7 @@ void WebFrame::AttachGuest(int id) {
|
||||||
void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
|
void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
|
||||||
const std::string& language,
|
const std::string& language,
|
||||||
bool auto_spell_correct_turned_on,
|
bool auto_spell_correct_turned_on,
|
||||||
v8::Handle<v8::Object> provider) {
|
v8::Local<v8::Object> provider) {
|
||||||
if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
|
if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
|
||||||
args->ThrowError("\"spellCheck\" has to be defined");
|
args->ThrowError("\"spellCheck\" has to be defined");
|
||||||
return;
|
return;
|
||||||
|
@ -123,8 +123,8 @@ mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
||||||
v8::Handle<v8::Context> context, void* priv) {
|
v8::Local<v8::Context> context, void* priv) {
|
||||||
v8::Isolate* isolate = context->GetIsolate();
|
v8::Isolate* isolate = context->GetIsolate();
|
||||||
mate::Dictionary dict(isolate, exports);
|
mate::Dictionary dict(isolate, exports);
|
||||||
dict.Set("webFrame", atom::api::WebFrame::Create(isolate));
|
dict.Set("webFrame", atom::api::WebFrame::Create(isolate));
|
||||||
|
|
|
@ -40,15 +40,15 @@ class WebFrame : public mate::Wrappable {
|
||||||
double SetZoomFactor(double factor);
|
double SetZoomFactor(double factor);
|
||||||
double GetZoomFactor() const;
|
double GetZoomFactor() const;
|
||||||
|
|
||||||
v8::Handle<v8::Value> RegisterEmbedderCustomElement(
|
v8::Local<v8::Value> RegisterEmbedderCustomElement(
|
||||||
const base::string16& name, v8::Handle<v8::Object> options);
|
const base::string16& name, v8::Local<v8::Object> options);
|
||||||
void AttachGuest(int element_instance_id);
|
void AttachGuest(int element_instance_id);
|
||||||
|
|
||||||
// Set the provider that will be used by SpellCheckClient for spell check.
|
// Set the provider that will be used by SpellCheckClient for spell check.
|
||||||
void SetSpellCheckProvider(mate::Arguments* args,
|
void SetSpellCheckProvider(mate::Arguments* args,
|
||||||
const std::string& language,
|
const std::string& language,
|
||||||
bool auto_spell_correct_turned_on,
|
bool auto_spell_correct_turned_on,
|
||||||
v8::Handle<v8::Object> provider);
|
v8::Local<v8::Object> provider);
|
||||||
|
|
||||||
// mate::Wrappable:
|
// mate::Wrappable:
|
||||||
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
||||||
|
|
|
@ -30,21 +30,21 @@ namespace atom {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
bool GetIPCObject(v8::Isolate* isolate,
|
bool GetIPCObject(v8::Isolate* isolate,
|
||||||
v8::Handle<v8::Context> context,
|
v8::Local<v8::Context> context,
|
||||||
v8::Handle<v8::Object>* ipc) {
|
v8::Local<v8::Object>* ipc) {
|
||||||
v8::Handle<v8::String> key = mate::StringToV8(isolate, "ipc");
|
v8::Local<v8::String> key = mate::StringToV8(isolate, "ipc");
|
||||||
v8::Handle<v8::Value> value = context->Global()->GetHiddenValue(key);
|
v8::Local<v8::Value> value = context->Global()->GetHiddenValue(key);
|
||||||
if (value.IsEmpty() || !value->IsObject())
|
if (value.IsEmpty() || !value->IsObject())
|
||||||
return false;
|
return false;
|
||||||
*ipc = value->ToObject();
|
*ipc = value->ToObject();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<v8::Handle<v8::Value>> ListValueToVector(
|
std::vector<v8::Local<v8::Value>> ListValueToVector(
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
const base::ListValue& list) {
|
const base::ListValue& list) {
|
||||||
v8::Handle<v8::Value> array = mate::ConvertToV8(isolate, list);
|
v8::Local<v8::Value> array = mate::ConvertToV8(isolate, list);
|
||||||
std::vector<v8::Handle<v8::Value>> result;
|
std::vector<v8::Local<v8::Value>> result;
|
||||||
mate::ConvertFromV8(isolate, array, &result);
|
mate::ConvertFromV8(isolate, array, &result);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -119,11 +119,11 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
|
||||||
v8::Local<v8::Context> context = frame->mainWorldScriptContext();
|
v8::Local<v8::Context> context = frame->mainWorldScriptContext();
|
||||||
v8::Context::Scope context_scope(context);
|
v8::Context::Scope context_scope(context);
|
||||||
|
|
||||||
std::vector<v8::Handle<v8::Value>> arguments = ListValueToVector(
|
std::vector<v8::Local<v8::Value>> arguments = ListValueToVector(
|
||||||
isolate, args);
|
isolate, args);
|
||||||
arguments.insert(arguments.begin(), mate::ConvertToV8(isolate, channel));
|
arguments.insert(arguments.begin(), mate::ConvertToV8(isolate, channel));
|
||||||
|
|
||||||
v8::Handle<v8::Object> ipc;
|
v8::Local<v8::Object> ipc;
|
||||||
if (GetIPCObject(isolate, context, &ipc))
|
if (GetIPCObject(isolate, context, &ipc))
|
||||||
node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
|
node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
|
||||||
}
|
}
|
||||||
|
|
2
vendor/native_mate
vendored
2
vendor/native_mate
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 047a8de9342a3217a8d8316f77b9276e8eb7a649
|
Subproject commit 269be869988bda9a7e8ad0ef56af178a741af09c
|
Loading…
Reference in a new issue