Cap SkVarAlloc's desired block at 64K.

src/core/SkVarAlloc.cpp

Index: src/core/SkVarAlloc.cpp
diff --git a/src/core/SkVarAlloc.cpp b/src/core/SkVarAlloc.cpp
index cc1fc1c734113072e9d57f93e75b8c110a626d81..4c570cd9294451e19d2758a57b95999ffb32ae5f 100644
--- a/src/core/SkVarAlloc.cpp
+++ b/src/core/SkVarAlloc.cpp
@@ -37,7 +37,7 @@ SkVarAlloc::~SkVarAlloc() {
 void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) {
     SkASSERT(SkIsAlignPtr(bytes));
 
-    size_t alloc = 1<<(fLgMinSize++);
+    size_t alloc = 1<<fLgMinSize;
     while (alloc < bytes + sizeof(Block)) {
         alloc *= 2;
     }
@@ -45,6 +45,10 @@ void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) {
     fByte = fBlock->data();
     fRemaining = alloc - sizeof(Block);
 
+    if (fLgMinSize < 16) {

[reed1, 2014/11/13 21:40:07]

please add comment + possible a #define with a comment

+        fLgMinSize++;
+    }
+
 #if defined(SK_BUILD_FOR_MAC)
     SkASSERT(alloc == malloc_good_size(alloc));
 #elif defined(SK_BUILD_FOR_LINUX)