Stop overloading internal_dispose in SkTextBlob and SkData

include/core/SkData.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
@@ skipping 150 matching lines @@
     ReleaseProc fReleaseProc;
     void*       fReleaseProcContext;
 
     void*       fPtr;
     size_t      fSize;
 
     SkData(const void* ptr, size_t size, ReleaseProc, void* context);
     SkData(size_t size);   // inplace new/delete
     virtual ~SkData();
 
-    virtual void internal_dispose() const SK_OVERRIDE;
+
+    // Objects of this type are sometimes created in a custom fashion using sk_malloc_throw and
+    // therefore must be sk_freed. We overload new to also call sk_malloc_throw so that memory
+    // can unconditionally released using sk_free in and overloaded delete. Overloading regular

[mtklein, 2014/11/19 21:56:59]

and -> an

[bsalomon, 2014/11/20 14:49:57]

Done, and also asserted that text blobs are always placment newed.

+    // new means we must also overload placement new.
+    void* operator new(size_t size) { return sk_malloc_throw(size); }
+    void* operator new(size_t, void* p) { return p; }
+    void operator delete(void* p) { sk_free(p); }
 
     // Called the first time someone calls NewEmpty to initialize the singleton.
     friend SkData* sk_new_empty_data();
 
     // shared internal factory
     static SkData* PrivateNewWithCopy(const void* srcOrNull, size_t length);
 
     typedef SkRefCnt INHERITED;
 };
 
 /** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
 typedef SkAutoTUnref<SkData> SkAutoDataUnref;
 
 #endif