am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2

* commit 'd20d72d193ab0d7f33c839d8bf9573b55abfebdc':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom

1 files changed, 0 insertions, 14 deletions

diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h
index c0be59757011..b31e993d86a6 100644
--- a/include/utils/RefBase.h
+++ b/include/utils/RefBase.h
@@ -117,20 +117,6 @@ public:
 
     typedef RefBase basetype;
 
-    // used to override the RefBase destruction.
-    class Destroyer {
-        friend class RefBase;
-        friend class weakref_type;
-    public:
-        virtual ~Destroyer();
-    private:
-        virtual void destroy(RefBase const* base) = 0;
-    };
-
-    // Make sure to never acquire a strong reference from this function. The
-    // same restrictions than for destructors apply.
-    void setDestroyer(Destroyer* destroyer);
-
 protected:
                             RefBase();
     virtual                 ~RefBase();