commit 621d19b254dc27a490101dcc947c9a29517af899
author Steve Block <steveblock@google.com> Wed Dec 30 13:37:15 2009 +0000
committer Steve Block <steveblock@google.com> Wed Dec 30 13:38:59 2009 +0000
tree f8a9abb3b2be764303443ae1bee0034308236383
parent 84a4799558b021d8ab6c19a7fa787e2731aa1fe3

Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.

Change-Id: I9cc775224edcda65884461eaf0f4ff7efb5922be

V8Binding/jni/jni_instance.cpp

diff --git a/V8Binding/jni/jni_instance.cpp b/V8Binding/jni/jni_instance.cpp
index 6b83764..657b8c4 100644
--- a/V8Binding/jni/jni_instance.cpp
+++ b/V8Binding/jni/jni_instance.cpp
@@ -42,7 +42,6 @@
 {
     _instance = new JObjectWrapper(instance);
     _class = 0;
-    _refCount = 0;
 }
 
 JavaInstance::~JavaInstance () 

V8Binding/jni/jni_instance.h

diff --git a/V8Binding/jni/jni_instance.h b/V8Binding/jni/jni_instance.h
index 94706c8..f8b0d65 100644
--- a/V8Binding/jni/jni_instance.h
+++ b/V8Binding/jni/jni_instance.h
@@ -30,6 +30,7 @@
 #include "jni_utility_private.h"
 
 #include <JavaVM/jni.h>
+#include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 namespace android {
@@ -67,19 +68,12 @@
     jmethodID mWeakRefGet;  // cache WeakReference::Get method id
 };
 
-class JavaInstance
+class JavaInstance : public RefCounted<JavaInstance>
 {
 public:
     JavaInstance(jobject instance);
     ~JavaInstance();
 
-    void ref() { _refCount++; }
-    void deref() 
-    { 
-        if (--_refCount == 0) 
-            delete this; 
-    }
-
     JavaClass* getClass() const;
 
     bool invokeMethod(const char* name, const NPVariant* args, uint32_t argsCount, NPVariant* result);
@@ -92,7 +86,6 @@
 
 private:
     RefPtr<JObjectWrapper> _instance;
-    unsigned int _refCount;
     mutable JavaClass* _class;
 };