Revert of Rearrange SkRecord with small N in mind

src/core/SkRecord.cpp

-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
 #include "SkRecord.h"
 
 SkRecord::~SkRecord() {
     Destroyer destroyer;
     for (unsigned i = 0; i < this->count(); i++) {
         this->mutate<void>(i, destroyer);
     }
 }
 
 void SkRecord::grow() {
     SkASSERT(fCount == fReserved);
-    SkASSERT(fReserved > 0);
-    fReserved *= 2;
+    fReserved = SkTMax<unsigned>(kFirstReserveCount, fReserved*2);
     fRecords.realloc(fReserved);
+    fTypes.realloc(fReserved);
 }
 
 size_t SkRecord::bytesUsed() const {
     return fAlloc.approxBytesAllocated() +
-           (fReserved - kInlineRecords) * sizeof(Record) +
+           fReserved * (sizeof(Record) + sizeof(Type8)) +
            sizeof(SkRecord);
 }