Introduce typeface cache in blink::FontCache

third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/RemoteFontFaceSource.h"
 
 #include "core/css/CSSCustomFontData.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
@@ skipping 132 matching lines @@
 {
     if (!isLoaded())
         return createLoadingFallbackFontData(fontDescription);
 
     if (!m_font->ensureCustomFontData() || m_period == FailurePeriod)
         return nullptr;
 
     m_histograms.recordFallbackTime(m_font.get());
 
     return SimpleFontData::create(
-        m_font->platformDataFromCustomData(fontDescription.effectiveFontSize(),
-            fontDescription.isSyntheticBold(), fontDescription.isSyntheticItalic(),
-            fontDescription.orientation()), CustomFontData::create());
+        m_font->platformDataFromCustomData(
+            fontDescription.isSyntheticBold(),
+            fontDescription.isSyntheticItalic(),
+            fontDescription.orientation()),
+        fontDescription.effectiveFontSize(),
+        CustomFontData::create());
 }
 
 PassRefPtr<SimpleFontData> RemoteFontFaceSource::createLoadingFallbackFontData(const FontDescription& fontDescription)
 {
     // This temporary font is not retained and should not be returned.
     FontCachePurgePreventer fontCachePurgePreventer;
     SimpleFontData* temporaryFont = FontCache::fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
     if (!temporaryFont) {
         ASSERT_NOT_REACHED();
         return nullptr;
     }
     RefPtr<CSSCustomFontData> cssFontData = CSSCustomFontData::create(this, m_period == BlockPeriod ? CSSCustomFontData::InvisibleFallback : CSSCustomFontData::VisibleFallback);
-    return SimpleFontData::create(temporaryFont->platformData(), cssFontData);
+    return SimpleFontData::create(temporaryFont->platformData(), fontDescription.effectiveFontSize(), cssFontData);
 }
 
 void RemoteFontFaceSource::beginLoadIfNeeded()
 {
     if (m_fontSelector->document() && m_font->stillNeedsLoad()) {
         m_font->load(m_fontSelector->document()->fetcher());
         m_histograms.loadStarted();
     }
     m_font->startLoadLimitTimersIfNeeded();
 
@@ skipping 104 matching lines @@
         interventionResult |= 1 << 0;
     if (triggered)
         interventionResult |= 1 << 1;
     const int boundary = 1 << 2;
 
     DEFINE_STATIC_LOCAL(EnumerationHistogram, interventionHistogram, ("WebFont.InterventionResult", boundary));
     interventionHistogram.count(interventionResult);
 }
 
 } // namespace blink