Avoid heap allocation in SkPictureStateTree constructor

src/core/SkPictureStateTree.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureStateTree_DEFINED
 #define SkPictureStateTree_DEFINED
@@ skipping 97 matching lines @@
         bool fValid;
 
         friend class SkPictureStateTree;
     };
 
 private:
 
     void appendNode(uint32_t offset);
 
     SkChunkAlloc fAlloc;
-    Node* fRoot;
     // Needed by saveCollapsed() because nodes do not currently store
     // references to their children.  If they did, we could just retrieve the
     // last added child.
     Node* fLastRestoredNode;
 
     // The currently active state
     Draw fCurrentState;
     // A stack of states for tracking save/restores
     SkDeque fStateStack;
 
     // Represents a notable piece of state that requires an offset into the command buffer,
     // corresponding to a clip/saveLayer/etc call, to apply.
     struct Node {
         Node* fParent;
         uint32_t fOffset;
         uint16_t fLevel;
         uint16_t fFlags;
         SkMatrix* fMatrix;
         enum Flags {
             kSave_Flag      = 0x1,
             kSaveLayer_Flag = 0x2
         };
     };
 
+    Node fRoot;
+    SkMatrix fRootMatrix;
+
     typedef SkRefCnt INHERITED;
 };
 
 #endif