fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)

Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25

1 files changed, 13 insertions, 7 deletions

diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h
index 1b4a310008ad..d92cfb03d718 100644
--- a/include/utils/RefBase.h
+++ b/include/utils/RefBase.h
@@ -112,16 +112,22 @@ public:
         getWeakRefs()->trackMe(enable, retain); 
     }
 
-protected:
-                            RefBase();
-    virtual                 ~RefBase();
+    // used to override the RefBase destruction.
+    class Destroyer {
+        friend class RefBase;
+    public:
+        virtual ~Destroyer();
+    private:
+        virtual void destroy(RefBase const* base) = 0;
+    };
 
-    // called when the last reference goes away. this is responsible for
-    // calling the destructor. The default implementation just does
-    // "delete this;".
     // Make sure to never acquire a strong reference from this function. The
     // same restrictions than for destructors apply.
-    virtual void            destroy() const;
+    void setDestroyer(Destroyer* destroyer);
+
+protected:
+                            RefBase();
+    virtual                 ~RefBase();
 
     //! Flags for extendObjectLifetime()
     enum {