we only need one fontmetrics, since the paint (and fontcache) now know explicitly

src/core/SkGlyphCache.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 "SkGlyphCache.h"
@@ skipping 44 matching lines @@
 
 SkGlyphCache::SkGlyphCache(SkTypeface* typeface, const SkDescriptor* desc)
         : fGlyphAlloc(kMinGlphAlloc)
         , fImageAlloc(kMinImageAlloc) {
     SkASSERT(typeface);
 
     fPrev = fNext = NULL;
 
     fDesc = desc->copy();
     fScalerContext = typeface->createScalerContext(desc);
-    fScalerContext->getFontMetrics(NULL, &fFontMetricsY);
+    fScalerContext->getFontMetrics(&fFontMetrics);
 
     // init to 0 so that all of the pointers will be null
     memset(fGlyphHash, 0, sizeof(fGlyphHash));
     // init with 0xFF so that the charCode field will be -1, which is invalid
     memset(fCharToGlyphHash, 0xFF, sizeof(fCharToGlyphHash));
 
     fMemoryUsed = sizeof(*this) + kMinGlphAlloc + kMinImageAlloc;
 
     fGlyphArray.setReserve(METRICS_RESERVE_COUNT);
 
@@ skipping 666 matching lines @@
     return tls ? tls->getFontCacheLimit() : 0;
 }
 
 void SkGraphics::SetTLSFontCacheLimit(size_t bytes) {
     if (0 == bytes) {
         SkGlyphCache_Globals::DeleteTLS();
     } else {
         SkGlyphCache_Globals::GetTLS().setFontCacheLimit(bytes);
     }
 }