Switch to one single bitmap text blob cache allocation

src/core/SkDescriptor.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkDescriptor_DEFINED
@@ skipping 116 matching lines @@
     }
 
     // private so no one can create one except our factories
     SkDescriptor() {}
 };
 
 #include "SkScalerContext.h"
 
 class SkAutoDescriptor : SkNoncopyable {
 public:
+    SkAutoDescriptor() : fDesc(NULL) {}
     SkAutoDescriptor(size_t size) {
-        if (size <= sizeof(fStorage)) {
-            fDesc = (SkDescriptor*)(void*)fStorage;
-        } else {
-            fDesc = SkDescriptor::Alloc(size);
-        }
+        this->reset(size);
     }
 
     ~SkAutoDescriptor() {
         if (fDesc != (SkDescriptor*)(void*)fStorage) {
             SkDescriptor::Free(fDesc);
         }
     }
 
-    SkDescriptor* getDesc() const { return fDesc; }
+    void reset(size_t size) {
+        if (size <= sizeof(fStorage)) {

[bsalomon, 2015/03/31 21:19:10]

don't you need to free the old one here?

[joshualitt, 2015/04/01 13:21:17]

Acknowledged.

+            fDesc = (SkDescriptor*)(void*)fStorage;
+        } else {
+            fDesc = SkDescriptor::Alloc(size);
+        }
+    }
+
+    SkDescriptor* getDesc() const { SkASSERT(fDesc); return fDesc; }
 private:
     enum {
         kStorageSize =  sizeof(SkDescriptor)
                         + sizeof(SkDescriptor::Entry) + sizeof(SkScalerContext::Rec)    // for rec
                         + sizeof(SkDescriptor::Entry) + sizeof(void*)                   // for typeface
                         + 32   // slop for occational small extras
     };
     SkDescriptor*   fDesc;
     uint32_t        fStorage[(kStorageSize + 3) >> 2];
 };
 #define SkAutoDescriptor(...) SK_REQUIRE_LOCAL_VAR(SkAutoDescriptor)
 
 
 #endif