Stop overloading internal_dispose in SkTextBlob and SkData

src/core/SkData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkLazyPtr.h"
 #include "SkOSFile.h"
 #include "SkReadBuffer.h"
 #include "SkStream.h"
 #include "SkWriteBuffer.h"
 
-static void sk_inplace_sentinel_releaseproc(const void*, size_t, void*) {
-    // we should never get called, as we are just a sentinel
-    sk_throw();
-}
-
 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
     fPtr = const_cast<void*>(ptr);
     fSize = size;
     fReleaseProc = proc;
     fReleaseProcContext = context;
 }
 
 // This constructor means we are inline with our fPtr's contents. Thus we set fPtr
 // to point right after this. We also set our releaseproc to sk_inplace_sentinel_releaseproc,
 // since we need to handle "delete" ourselves. See internal_displose().
 //
 SkData::SkData(size_t size) {
     fPtr = (char*)(this + 1);   // contents are immediately after this
     fSize = size;
-    fReleaseProc = sk_inplace_sentinel_releaseproc;
+    fReleaseProc = NULL;
     fReleaseProcContext = NULL;
 }
 
 SkData::~SkData() {
     if (fReleaseProc) {
         fReleaseProc(fPtr, fSize, fReleaseProcContext);
     }
 }
 
-void SkData::internal_dispose() const {
-    if (sk_inplace_sentinel_releaseproc == fReleaseProc) {
-        const_cast<SkData*>(this)->fReleaseProc = NULL;    // so we don't call it in our destructor
-
-        this->internal_dispose_restore_refcnt_to_1();
-        this->~SkData();        // explicitly call this for refcnt bookkeeping
-
-        sk_free(const_cast<SkData*>(this));
-    } else {
-        this->internal_dispose_restore_refcnt_to_1();
-        SkDELETE(this);
-    }
-}
-
 bool SkData::equals(const SkData* other) const {
     if (NULL == other) {
         return false;
     }
 
     return fSize == other->fSize && !memcmp(fPtr, other->fPtr, fSize);
 }
 
 size_t SkData::copyRange(size_t offset, size_t length, void* buffer) const {
     size_t available = fSize;
@@ skipping 134 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 SkData* SkData::NewFromStream(SkStream* stream, size_t size) {
     SkAutoDataUnref data(SkData::NewUninitialized(size));
     if (stream->read(data->writable_data(), size) != size) {
         return NULL;
     }
     return data.detach();
 }