Merge commit 'goog/master' into merge_master

1 files changed, 28 insertions, 4 deletions

diff --git a/libs/rs/rsObjectBase.h b/libs/rs/rsObjectBase.h
index 7761e49..b2c3338 100644
--- a/libs/rs/rsObjectBase.h
+++ b/libs/rs/rsObjectBase.h
@@ -33,7 +33,14 @@ public:
     void incRef() const;
     void decRef() const;
 
+    const char * getName() const {
+        return mName;
+    }
+    void setName(const char *);
+    void setName(const char *, uint32_t len);
+
 private:
+    char * mName;
     mutable int32_t mRefCount;
 
 
@@ -47,6 +54,20 @@ public:
         mRef = NULL;
     }
 
+    ObjectBaseRef(const ObjectBaseRef &ref) {
+        mRef = ref.get();
+        if (mRef) {
+            mRef->incRef();
+        }
+    }
+
+    ObjectBaseRef(T *ref) {
+        mRef = ref;
+        if (mRef) {
+            ref->incRef();
+        }
+    }
+
     ~ObjectBaseRef() {
         clear();
     }
@@ -55,10 +76,16 @@ public:
         if (mRef != ref) {
             clear();
             mRef = ref;
-            ref->incRef();
+            if (mRef) {
+                ref->incRef();
+            }
         }
     }
 
+    void set(const ObjectBaseRef &ref) {
+        set(ref.mRef);
+    }
+
     void clear() {
         if (mRef) {
             mRef->decRef();
@@ -77,9 +104,6 @@ public:
 protected:
     T * mRef;
 
-private:
-    ObjectBaseRef(const ObjectBaseRef &) {};
-
 };