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

Revert "Make BrowserWindow inheritable. Fixed #23."

Browse source 
This reverts commit 5a0aab2e4f.
This commit is contained in:
Cheng Zhao 2013-06-18 21:40:03 +08:00
parent 3d267e2a9f
commit dbaf8860a6
6 changed files with 47 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

27
browser/api/atom_api_event_emitter.cc
View file

@ -20,6 +20,13 @@ namespace api {
EventEmitter::EventEmitter(v8::Handle<v8::Object> wrapper) {
Wrap(wrapper);
// process.emit('ATOM_BROWSER_INTERNAL_NEW', this).
v8::Handle<v8::Value> args[] = {
v8::String::New("ATOM_BROWSER_INTERNAL_NEW"),
wrapper,
};
node::MakeCallback(node::process, "emit", 2, args);
}
EventEmitter::~EventEmitter() {
@ -64,26 +71,6 @@ bool EventEmitter::Emit(const std::string& name, base::ListValue* args) {
return prevent_default;
}
// static
v8::Handle<v8::Value> EventEmitter::FromConstructorTemplate(
v8::Persistent<v8::FunctionTemplate> t,
const v8::Arguments& args) {
v8::Handle<v8::Value> new_object = node::FromConstructorTemplate(t, args);
args.This()->SetHiddenValue(v8::String::New("native_object"), new_object);
return new_object;
}
// static
v8::Handle<v8::Object> EventEmitter::SearchNativeObject(
v8::Handle<v8::Object> handle) {
if (handle->InternalFieldCount() > 0)
return handle;
// If the object is not a native object, we assume the native object is
// stored in it.
return handle->GetHiddenValue(v8::String::New("native_object"))->ToObject();
}
} // namespace api
} // namespace atom