Implement onCountGlyphs and onGetUPEM on Windows.

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 11 matching lines @@
 static const struct TagSize {
     SkFontTableTag  fTag;
     size_t          fSize;
 } gKnownTableSizes[] = {
     {   kFontTableTag_head,         54 },
     {   kFontTableTag_hhea,         36 },
     {   kFontTableTag_maxp,         32 },
 };
 
 // Test that getUnitsPerEm() agrees with a direct lookup in the 'head' table
-// (if that table is available.
+// (if that table is available).
 static void test_unitsPerEm(skiatest::Reporter* reporter, SkTypeface* face) {
-    int nativeUPEM = face->getUnitsPerEm();;
+    int nativeUPEM = face->getUnitsPerEm();
 
     int tableUPEM = -1;
     size_t size = face->getTableSize(kFontTableTag_head);
     if (size) {

[vandebo (ex-Chrome), 2013/07/15 17:32:56]

Do you want to check that size >= 20 ?

[bungeman-skia, 2013/07/15 18:21:36]

Already did that in test_tables.

-        SkAutoMalloc storage(size);
-        char* ptr = (char*)storage.get();
-        face->getTableData(kFontTableTag_head, 0, size, ptr);
         // unitsPerEm is at offset 18 into the 'head' table.
-        tableUPEM = SkEndian_SwapBE16(*(uint16_t*)&ptr[18]);
+        uint16_t rawUPEM;
+        face->getTableData(kFontTableTag_head, 18, sizeof(rawUPEM), &rawUPEM);
+        tableUPEM = SkEndian_SwapBE16(rawUPEM);
     }
-//    SkDebugf("--- typeface returned %d upem [%X]\n", nativeUPEM, face->uniqueID());
 
     if (tableUPEM >= 0) {
         REPORTER_ASSERT(reporter, tableUPEM == nativeUPEM);
     } else {
         // not sure this is a bug, but lets report it for now as info.
         SkDebugf("--- typeface returned 0 upem [%X]\n", face->uniqueID());
     }
 }
 
+// Test that countGlyphs() agrees with a direct lookup in the 'maxp' table
+// (if that table is available).
+static void test_countGlyphs(skiatest::Reporter* reporter, SkTypeface* face) {
+    int nativeGlyphs = face->countGlyphs();
+
+    int tableGlyphs = -1;
+    size_t size = face->getTableSize(kFontTableTag_maxp);
+    if (size) {

[vandebo (ex-Chrome), 2013/07/15 17:32:56]

size >= 6 ?

[bungeman-skia, 2013/07/15 18:21:36]

Already did that in test_tables.

+        // glyphs is at offset 4 into the 'maxp' table.
+        uint16_t rawGlyphs;
+        face->getTableData(kFontTableTag_maxp, 4, sizeof(rawGlyphs), &rawGlyphs);
+        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());
+    }
+}
+
 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) {
 #ifdef DUMP_TTC_TABLES
@@ skipping 85 matching lines @@
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gNames); ++i) {
         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);
             face->unref();
         }
     }
 }
 
 /*
  * Verifies that the advance values returned by generateAdvance and
  * generateMetrics match.
  */
 static void test_advances(skiatest::Reporter* reporter) {
@@ skipping 66 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)