4 files changed, 11 insertions, 9 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 83f462534f..9c488491f6 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -19,13 +19,13 @@ enum {
 };
 
 SkPictureRecord::SkPictureRecord(uint32_t flags) :
+        fBoundingHierarchy(NULL),
+        fStateTree(NULL),
         fFlattenableHeap(HEAP_BLOCK_SIZE),
         fMatrices(&fFlattenableHeap),
         fPaints(&fFlattenableHeap),
         fRegions(&fFlattenableHeap),
         fWriter(MIN_WRITER_SIZE),
-        fBoundingHierarchy(NULL),
-        fStateTree(NULL),
         fRecordFlags(flags) {
 #ifdef SK_DEBUG_SIZE
     fPointBytes = fRectBytes = fTextBytes = 0;
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index fc36e4a22c..8426c9e1bb 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -83,9 +83,9 @@ SkPictureStateTree::Iterator::Iterator(const SkTDArray<void*>& draws, SkCanvas*
     : fDraws(draws)
     , fCanvas(canvas)
     , fCurrentNode(root)
+    , fPlaybackMatrix(canvas->getTotalMatrix())
     , fCurrentMatrix(NULL)
     , fPlaybackIndex(0)
-    , fPlaybackMatrix(canvas->getTotalMatrix())
     , fSave(false) {
 }
 
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index 995f3f72ae..8ce3050a91 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -74,20 +74,22 @@ public:
         Iterator(const SkTDArray<void*>& draws, SkCanvas* canvas, Node* root);
         // The draws this iterator is associated with
         const SkTDArray<void*>& fDraws;
-        // The matrix of the canvas we're playing back into
-        const SkMatrix fPlaybackMatrix;
+
+        // canvas this is playing into (so we can insert saves/restores as necessary)
+        SkCanvas* fCanvas;
 
         // current state node
         Node* fCurrentNode;
 
         // List of nodes whose state we need to apply to reach TargetNode
         SkTDArray<Node*> fNodes;
+
+        // The matrix of the canvas we're playing back into
+        const SkMatrix fPlaybackMatrix;
+
         // Cache of current matrix, so we can avoid redundantly setting it
         SkMatrix* fCurrentMatrix;
 
-        // canvas this is playing into (so we can insert saves/restores as necessary)
-        SkCanvas* fCanvas;
-
         // current position in the array of draws
         int fPlaybackIndex;
         // Whether or not we need to do a save next iteration
diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
index 96f6b18c81..42c1c999d4 100644
--- a/src/core/SkRTree.cpp
+++ b/src/core/SkRTree.cpp
@@ -399,7 +399,7 @@ void SkRTree::validate() {
     if (this->isEmpty()) {
         return;
     }
-    SkASSERT(fCount == this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true));
+    SkASSERT(fCount == (size_t)this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true));
 #endif
 }