Make the glyph array entries inline.

src/core/SkGlyph.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGlyph_DEFINED
 #define SkGlyph_DEFINED
 
@@ skipping 86 matching lines @@
     enum {
         kSubBits = 2,
         kSubMask = ((1 << kSubBits) - 1),
         kSubShift = 24, // must be large enough for glyphs and unichars
         kCodeMask = ((1 << kSubShift) - 1),
         // relative offsets for X and Y subpixel bits
         kSubShiftX = kSubBits,
         kSubShiftY = 0
     };
 
+    // The code is increased by one in MakeID. Adjust back. This allows the zero
+    // id to be the invalid id.
     static unsigned ID2Code(uint32_t id) {
-        return id & kCodeMask;
+        return (id & kCodeMask) - 1;
     }
 
     static unsigned ID2SubX(uint32_t id) {
         return id >> (kSubShift + kSubShiftX);
     }
 
     static unsigned ID2SubY(uint32_t id) {
         return (id >> (kSubShift + kSubShiftY)) & kSubMask;
     }
 
     static unsigned FixedToSub(SkFixed n) {
         return (n >> (16 - kSubBits)) & kSubMask;
     }
 
     static SkFixed SubToFixed(unsigned sub) {
         SkASSERT(sub <= kSubMask);
         return sub << (16 - kSubBits);
     }
 
+    // This and the MakeID below must not return an id of zero. Zero is used as
+    // the invalid id.
     static uint32_t MakeID(unsigned code) {

[reed1, 2015/02/02 11:49:36]

can we add?

SkASSERT(0 == (code & kCodeMask));

[herb_g, 2015/02/02 13:39:03]

This assert doesn't make sense to me. Do you mean (code + 1) <= kCodeMask?

[herb_g, 2015/02/02 15:34:11]

Done.

I think your intent was to check the pre-condition that code is in the 24-bit
range. Add assert to do this.

-        return code;
+        return code + 1;
     }
 
+    // See comment for MakeID above.
     static uint32_t MakeID(unsigned code, SkFixed x, SkFixed y) {
         SkASSERT(code <= kCodeMask);
         x = FixedToSub(x);
         y = FixedToSub(y);
         return (x << (kSubShift + kSubShiftX)) |
                (y << (kSubShift + kSubShiftY)) |
-               code;
+               (code + 1);
     }
 
     void toMask(SkMask* mask) const;
 };
 
 #endif