Move paints to the front of draw structs.

src/record/SkRecordOpts.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRecordOpts.h"
 
 #include "SkRecordPattern.h"
@@ skipping 169 matching lines @@
         SK_COMPILE_ASSERT(sizeof(SkPoint) == 2 * sizeof(SkScalar), SquintingIsNotSafe);
         SkScalar* scalars = &draw->pos[0].fX;
         for (unsigned i = 0; i < 2*points; i += 2) {
             scalars[i/2] = scalars[i];
         }
 
         // Extend lifetime of draw to the end of the loop so we can copy its paint.
         Adopted<DrawPosText> adopted(draw);
         SkNEW_PLACEMENT_ARGS(record->replace<DrawPosTextH>(begin, adopted),
                              DrawPosTextH,
-                             (draw->text, draw->byteLength, scalars, firstY, draw->paint));
+                             (draw->paint, draw->text, draw->byteLength, scalars, firstY));
         return true;
     }
 };
 void SkRecordReduceDrawPosTextStrength(SkRecord* record) {
     StrengthReducer pass;
     apply(&pass, record);
 }
 
 // Tries to replace DrawPosTextH with BoundedDrawPosTextH, which knows conservative upper and lower
 // bounds to use with SkCanvas::quickRejectY.
@@ skipping 74 matching lines @@
     };
 
     SkTDArray<Pair> fPushStack;
     SkRecord* fRecord;
     unsigned fIndex;
 };
 void SkRecordAnnotateCullingPairs(SkRecord* record) {
     CullAnnotator pass;
     pass.apply(record);
 }