Correct glyph with non-bmp from typeface on Mac.

src/ports/SkFontHost_mac.cpp

 
 /*
  * 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.
  */
 
 #include <vector>
 #ifdef SK_BUILD_FOR_MAC
@@ skipping 1963 matching lines @@
     // If 'glyphs' is NULL, then compact glyphStorage in-place.
     // If all are bmp and 'glyphs' is non-NULL, 'glyphs' already contains the compact glyphs.
     // If some are non-bmp and 'glyphs' is non-NULL, copy and compact into 'glyphs'.
     uint16_t* compactedGlyphs = glyphs;
     if (NULL == compactedGlyphs) {
         compactedGlyphs = macGlyphs;
     }
     if (srcCount > glyphCount) {
         int extra = 0;
         for (int i = 0; i < glyphCount; ++i) {
+            compactedGlyphs[i] = macGlyphs[i + extra];
             if (SkUTF16_IsHighSurrogate(src[i + extra])) {
                 ++extra;
             }
-            compactedGlyphs[i] = macGlyphs[i + extra];
         }
     }
 
     if (allEncoded) {
         return glyphCount;
     }
 
     // If we got false, then we need to manually look for first failure.
     for (int i = 0; i < glyphCount; ++i) {
         if (0 == compactedGlyphs[i]) {
@@ skipping 311 matching lines @@
         return create_typeface(NULL, familyName, (SkTypeface::Style)styleBits);
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgr_Mac);
 }
 #endif