summaryrefslogtreecommitdiff
path: root/src/tls_wrap.h
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-09-25 12:57:03 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-09-25 19:44:53 +0200
commitc79d5163e530892c62b08d8b814b588220c26ec8 (patch)
tree771823ddf0dac11efe378f8ddc6ddcd0e756a0f0 /src/tls_wrap.h
parent42af62f33adda57d8913768d939c1f4d0f8fe5a3 (diff)
downloadandroid-node-v8-c79d5163e530892c62b08d8b814b588220c26ec8.tar.gz
android-node-v8-c79d5163e530892c62b08d8b814b588220c26ec8.tar.bz2
android-node-v8-c79d5163e530892c62b08d8b814b588220c26ec8.zip
src: remove ObjectWrap dependency from core
Drop the ObjectWrap dependency in favor of an internal WeakObject class. Let's us stop worrying about API and ABI compatibility when making changes to the way node.js deals with weakly persistent handles internally.
Diffstat (limited to 'src/tls_wrap.h')
-rw-r--r--src/tls_wrap.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
index d8f3997923..ec82154230 100644
--- a/src/tls_wrap.h
+++ b/src/tls_wrap.h
@@ -64,8 +64,8 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
int DoShutdown(ShutdownWrap* req_wrap, uv_shutdown_cb cb);
// Just for compliance with Connection
- inline v8::Local<v8::Object> handle(v8::Isolate* isolate) {
- return object(isolate);
+ inline v8::Local<v8::Object> weak_object(v8::Isolate* isolate) {
+ return PersistentToLocal(isolate, persistent());
}
protected:
@@ -123,10 +123,6 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
static int SelectSNIContextCallback(SSL* s, int* ad, void* arg);
#endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
- inline v8::Local<v8::Object> object(v8::Isolate* isolate) {
- return PersistentToLocal(isolate, persistent());
- }
-
inline v8::Persistent<v8::Object>& persistent() {
return object_;
}