Correct order for alignment in name iterator record.

src/sfnt/SkOTTable_name.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 SkOTTable_name_DEFINED
 #define SkOTTable_name_DEFINED
 
@@ skipping 529 matching lines @@
             /** The length of the string in SK_OT_BYTEs. */
             SK_OT_USHORT length;
 
             /** Offset in SK_OT_BYTEs from start of string storage area
              *  (see SkOTTableName::stringOffset).
              */
             SK_OT_USHORT offset;
         }; //langTagRecord[langTagCount]
     }; //format1ext (if format == format_1)
 
     class Iterator {

[mtklein, 2014/08/15 19:45:06]

Follow up by moving the Iterator out?

     public:
         Iterator(const SkOTTableName& name) : fName(name), fIndex(0), fType(-1) { }
         Iterator(const SkOTTableName& name, SkOTTableName::Record::NameID::Predefined::Value type)
             : fName(name), fIndex(0), fType(type)
         { }
 
         void reset(SkOTTableName::Record::NameID::Predefined::Value type) {
             fIndex = 0;
             fType = type;
         }
 
         struct Record {
-            SK_OT_USHORT type;
             SkString name;
             SkString language;
+            SK_OT_USHORT type;
         };
         bool next(Record&);
 
     private:
         const SkOTTableName& fName;
         size_t fIndex;
         int fType;
     };
 };
 
 #pragma pack(pop)
 
 
 SK_COMPILE_ASSERT(sizeof(SkOTTableName) == 6, sizeof_SkOTTableName_not_6);
 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext) == 2, sizeof_SkOTTableNameF1_not_2);
 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext::LangTagRecord) == 4, sizeof_SkOTTableNameLangTagRecord_not_4);
 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Record) == 12, sizeof_SkOTTableNameRecord_not_12);
 
 #endif