Introduce typeface cache in blink::FontCache

third_party/WebKit/Source/platform/fonts/Font.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 232 matching lines @@
 enum BlobRotation {
     NoRotation,
     CCWRotation,
 };
 
 class GlyphBufferBloberizer {
     STACK_ALLOCATED()
 public:
     GlyphBufferBloberizer(const GlyphBuffer& buffer, const Font* font, float deviceScaleFactor)
         : m_buffer(buffer)
-        , m_font(font)
         , m_deviceScaleFactor(deviceScaleFactor)
         , m_hasVerticalOffsets(buffer.hasVerticalOffsets())
         , m_index(0)
         , m_blobCount(0)
         , m_rotation(buffer.isEmpty() ? NoRotation : computeBlobRotation(buffer.fontDataAt(0)))
     { }
 
     bool done() const { return m_index >= m_buffer.size(); }
     unsigned blobCount() const { return m_blobCount; }
 
@@ skipping 30 matching lines @@
     {
         // For vertical upright text we need to compensate the inherited 90deg CW rotation
         // (using a 90deg CCW rotation).
         return (font->platformData().isVerticalAnyUpright() && font->verticalData()) ?
             CCWRotation : NoRotation;
     }
 
     void appendRun(unsigned start, unsigned count, const SimpleFontData* fontData)
     {
         SkPaint paint;
-        fontData->platformData().setupPaint(&paint, m_deviceScaleFactor, m_font);
+        fontData->style().apply(&paint, m_deviceScaleFactor);
+        fontData->platformData().setupPaint(&paint);
+        paint.setTextSize(SkFloatToScalar(fontData->size()));
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
         const SkTextBlobBuilder::RunBuffer& buffer = m_hasVerticalOffsets
             ? m_builder.allocRunPos(paint, count)
             : m_builder.allocRunPosH(paint, count, 0);
 
         const uint16_t* glyphs = m_buffer.glyphs(start);
         const float* offsets = m_buffer.offsets(start);
         std::copy(glyphs, glyphs + count, buffer.glyphs);
 
         if (m_rotation == NoRotation) {
             std::copy(offsets, offsets + (m_hasVerticalOffsets ? 2 * count : count), buffer.pos);
         } else {
             ASSERT(m_hasVerticalOffsets);
 
             const float verticalBaselineXOffset = fontData->getFontMetrics().floatAscent()
                 - fontData->getFontMetrics().floatAscent(IdeographicBaseline);
 
             // TODO(fmalita): why don't we apply this adjustment when building the glyph buffer?
             for (unsigned i = 0; i < 2 * count; i += 2) {
                 buffer.pos[i] = SkFloatToScalar(offsets[i] + verticalBaselineXOffset);
                 buffer.pos[i + 1] = SkFloatToScalar(offsets[i + 1]);
             }
         }
     }
 
     const GlyphBuffer& m_buffer;
-    const Font* m_font;
     const float m_deviceScaleFactor;
     const bool m_hasVerticalOffsets;
 
     SkTextBlobBuilder m_builder;
     unsigned m_index;
     unsigned m_blobCount;
     BlobRotation m_rotation;
 };
 
 } // anonymous namespace
@@ skipping 117 matching lines @@
 bool Font::computeCanShapeWordByWord() const
 {
     if (!getFontDescription().getTypesettingFeatures())
         return true;
 
     if (!primaryFont())
         return false;
 
     const FontPlatformData& platformData = primaryFont()->platformData();
     TypesettingFeatures features = getFontDescription().getTypesettingFeatures();
-    return !platformData.hasSpaceInLigaturesOrKerning(features);
+    return !platformData.hasSpaceInLigaturesOrKerning(primaryFont()->size(), primaryFont()->style(), features);
 };
 
 void Font::willUseFontData(UChar32 character) const
 {
     const FontFamily& family = getFontDescription().family();
     if (m_fontFallbackList && m_fontFallbackList->getFontSelector() && !family.familyIsEmpty())
         m_fontFallbackList->getFontSelector()->willUseFontData(getFontDescription(), family.family(), character);
 }
 
 static inline GlyphData glyphDataForNonCJKCharacterWithGlyphOrientation(UChar32 character, bool isUpright, GlyphData& data, unsigned pageNumber)
@@ skipping 362 matching lines @@
 {
     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const
 {
     return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 } // namespace blink