onCharsToGlyphs to handle non-bmp on Mac.

tests/FontHostTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkPaint.h"
 #include "SkFontStream.h"
@@ skipping 54 matching lines @@
         tableGlyphs = SkEndian_SwapBE16(rawGlyphs);
     }
 
     if (tableGlyphs >= 0) {
         REPORTER_ASSERT(reporter, tableGlyphs == nativeGlyphs);
     } else {
         // not sure this is a bug, but lets report it for now as info.
         SkDebugf("--- typeface returned 0 glyphs [%X]\n", face->uniqueID());
     }
 }
-#if 0
+
 // The following three are all the same code points in various encodings.
 static uint8_t utf8Chars[] = { 0x61, 0xE4, 0xB8, 0xAD, 0xD0, 0xAF, 0xD7, 0x99, 0xD7, 0x95, 0xF0, 0x9D, 0x84, 0x9E, 0x61 };
 static uint16_t utf16Chars[] = { 0x0061, 0x4E2D, 0x042F, 0x05D9, 0x05D5, 0xD834, 0xDD1E, 0x0061 };
 static uint32_t utf32Chars[] = { 0x00000061, 0x00004E2D, 0x0000042F, 0x000005D9, 0x000005D5, 0x0001D11E, 0x00000061 };
 
 struct CharsToGlyphs_TestData {
     const void* chars;
     int charCount;
     size_t charsByteLength;
     SkTypeface::Encoding typefaceEncoding;
@@ skipping 22 matching lines @@
         for (int i = 0; i < test.charCount; ++i) {
             SkString name;
             face->getFamilyName(&name);
             SkString a;
             a.appendf("%s, paintGlyphIds[%d] = %d, faceGlyphIds[%d] = %d, face = %s",
                       test.name, i, (int)paintGlyphIds[i], i, (int)faceGlyphIds[i], name.c_str());
             REPORTER_ASSERT_MESSAGE(reporter, paintGlyphIds[i] == faceGlyphIds[i], a.c_str());
         }
     }
 }
-#endif
 
 static void test_fontstream(skiatest::Reporter* reporter,
                             SkStream* stream, int ttcIndex) {
     int n = SkFontStream::GetTableTags(stream, ttcIndex, NULL);
     SkAutoTArray<SkFontTableTag> array(n);
 
     int n2 = SkFontStream::GetTableTags(stream, ttcIndex, array.get());
     REPORTER_ASSERT(reporter, n == n2);
 
     for (int i = 0; i < n; ++i) {
@@ skipping 94 matching lines @@
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gNames); ++i) {
         SkAutoTUnref<SkTypeface> face(SkTypeface::CreateFromName(gNames[i], SkTypeface::kNormal));
         if (face) {
 #ifdef DUMP_TABLES
             SkDebugf("%s\n", gNames[i]);
 #endif
             test_tables(reporter, face);
             test_unitsPerEm(reporter, face);
             test_countGlyphs(reporter, face);
-            //test_charsToGlyphs(reporter, face);
+            test_charsToGlyphs(reporter, face);
         }
     }
 }
 
 /*
  * Verifies that the advance values returned by generateAdvance and
  * generateMetrics match.
  */
 static void test_advances(skiatest::Reporter* reporter) {
     static const char* const faces[] = {
@@ skipping 65 matching lines @@
 static void TestFontHost(skiatest::Reporter* reporter) {
     test_tables(reporter);
     test_fontstream(reporter);
     test_advances(reporter);
 }
 
 // need tests for SkStrSearch
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("FontHost", FontHostTestClass, TestFontHost)