Stop overloading internal_dispose in SkTextBlob and SkData

Review URL: https://codereview.chromium.org/737093002

1 files changed, 9 insertions, 1 deletions

diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index 8ee1d19196..334cfb98c4 100644
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -79,7 +79,15 @@ private:
     SkTextBlob(int runCount, const SkRect& bounds);
 
     virtual ~SkTextBlob();
-    virtual void internal_dispose() const SK_OVERRIDE;
+
+    // Memory for objects of this class is created with sk_malloc rather than operator new and must
+    // be freed with sk_free.
+    void operator delete(void* p) { sk_free(p); }
+    void* operator new(size_t) {
+        SkFAIL("All blobs are created by placement new.");
+        return sk_malloc_throw(0);
+    }
+    void* operator new(size_t, void* p) { return p; }
 
     static unsigned ScalarsPerGlyph(GlyphPositioning pos);