Implement onCountGlyphs and onGetUPEM on Windows.

src/core/SkTypeface.cpp

 /*
  * Copyright 2011 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 "SkAdvancedTypefaceMetrics.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost.h"
@@ skipping 196 matching lines @@
 
 int SkTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
                                 uint16_t glyphs[], int glyphCount) const {
     SkDebugf("onCharsToGlyphs unimplemented\n");
     if (glyphs && glyphCount > 0) {
         sk_bzero(glyphs, glyphCount * sizeof(glyphs[0]));
     }
     return 0;
 }
 
-int SkTypeface::onCountGlyphs() const {
-    SkDebugf("onCountGlyphs unimplemented\n");
-    return 0;
-}
-
 int SkTypeface::onGetUPEM() const {

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

Did you mean to remove this implementation as well since you made the method
pure virtual?

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

Yes. I'm fairly certain the only reason this is here is to make things compile
on Windows. All of these 'on' guys should be pure virtual on SkTypeface, as the
entire point is to force subclasses to implement them.

     int upem = 0;
 
     SkAdvancedTypefaceMetrics* metrics;
     metrics = this->getAdvancedTypefaceMetrics(
                              SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
                              NULL, 0);
     if (metrics) {
         upem = metrics->fEmSize;
         metrics->unref();
     }
     return upem;
 }
 
 int SkTypeface::onGetTableTags(SkFontTableTag tags[]) const {
     int ttcIndex;
     SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
     return stream.get() ? SkFontStream::GetTableTags(stream, ttcIndex, tags) : 0;
 }
 
 size_t SkTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
                                   size_t length, void* data) const {
     int ttcIndex;
     SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
     return stream.get()
         ? SkFontStream::GetTableData(stream, ttcIndex, tag, offset, length, data)
         : 0;
 }