Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()."

include/core/SkWeakRefCnt.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkWeakRefCnt_DEFINED
 #define SkWeakRefCnt_DEFINED
 
@@ skipping 42 matching lines @@
 public:
     SK_DECLARE_INST_COUNT(SkWeakRefCnt)
 
     /** Default construct, initializing the reference counts to 1.
         The strong references collectively hold one weak reference. When the
         strong reference count goes to zero, the collectively held weak
         reference is released.
     */
     SkWeakRefCnt() : SkRefCnt(), fWeakCnt(1) {}
 
-#ifdef SK_DEBUG
     /** Destruct, asserting that the weak reference count is 1.
     */
     virtual ~SkWeakRefCnt() {
+#ifdef SK_DEBUG
         SkASSERT(fWeakCnt == 1);
         fWeakCnt = 0;
+#endif
     }
 
     /** Return the weak reference count.
     */
     int32_t getWeakCnt() const { return fWeakCnt; }
 
+#ifdef SK_DEBUG
     void validate() const {
         this->INHERITED::validate();
         SkASSERT(fWeakCnt > 0);
     }
 #endif
 
     /** Creates a strong reference from a weak reference, if possible. The
         caller must already be an owner. If try_ref() returns true the owner
         is in posession of an additional strong reference. Both the original
         reference and new reference must be properly unreferenced. If try_ref()
@@ skipping 61 matching lines @@
         collectively by the strong references.
     */
     virtual void internal_dispose() const SK_OVERRIDE {
         weak_dispose();
         weak_unref();
     }
 
     /* Invariant: fWeakCnt = #weak + (fRefCnt > 0 ? 1 : 0) */
     mutable int32_t fWeakCnt;
 
-    // Used by tests.
-    friend bool WeakRefCntIs(const SkWeakRefCnt&, int32_t);
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif