Rearrange SkRecord with small N in mind

This rearranges the record pointers and types so they can go in a single array, then preallocates some space for them and for the SkVarAlloc.

picture_overhead_draw bench drops from ~1000ns to 500-600ns, with no effect on picture_overhead_nodraw.

I don't see any significant effect on large picture recording times from our .skps.

BUG=chromium:470553

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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/core/SkRecord.cpp b/src/core/SkRecord.cpp
index e2d919b777..c2008a850a 100644
--- a/src/core/SkRecord.cpp
+++ b/src/core/SkRecord.cpp
@@ -1,3 +1,10 @@
+/*
+ * 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() {
@@ -9,13 +16,13 @@ SkRecord::~SkRecord() {
 
 void SkRecord::grow() {
     SkASSERT(fCount == fReserved);
-    fReserved = SkTMax<unsigned>(kFirstReserveCount, fReserved*2);
+    SkASSERT(fReserved > 0);
+    fReserved *= 2;
     fRecords.realloc(fReserved);
-    fTypes.realloc(fReserved);
 }
 
 size_t SkRecord::bytesUsed() const {
     return fAlloc.approxBytesAllocated() +
-           fReserved * (sizeof(Record) + sizeof(Type8)) +
+           (fReserved - kInlineRecords) * sizeof(Record) +
            sizeof(SkRecord);
 }