Optimize Complex Text Shaping and Caching

Source/platform/fonts/FontFallbackList.h

 /*
  * Copyright (C) 2006, 2010 Apple 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef FontFallbackList_h
 #define FontFallbackList_h
 
 #include "platform/fonts/FontSelector.h"
 #include "platform/fonts/SimpleFontData.h"
-#include "platform/fonts/WidthCache.h"
+#include "platform/fonts/shaping/CachingWordShaper.h"
 #include "wtf/Forward.h"
 #include "wtf/MainThread.h"
 
 namespace blink {
 
 class GlyphPageTreeNodeBase;
 class FontDescription;
 
 const int cAllFamiliesScanned = -1;
 
@@ skipping 30 matching lines @@
     void invalidate(PassRefPtrWillBeRawPtr<FontSelector>);
 
     bool loadingCustomFonts() const;
     bool shouldSkipDrawing() const;
 
     FontSelector* fontSelector() const { return m_fontSelector.get(); }
     // FIXME: It should be possible to combine fontSelectorVersion and generation.
     unsigned fontSelectorVersion() const { return m_fontSelectorVersion; }
     unsigned generation() const { return m_generation; }
 
-    WidthCache& widthCache() const { return m_widthCache; }
+    CachingWordShaper& cachingWordShaper() const { return m_cachingWordShaper; }
 
     const SimpleFontData* primarySimpleFontData(const FontDescription& fontDescription)
     {
         ASSERT(isMainThread());
         if (!m_cachedPrimarySimpleFontData)
             m_cachedPrimarySimpleFontData = determinePrimarySimpleFontData(fontDescription);
         return m_cachedPrimarySimpleFontData;
     }
     const FontData* fontDataAt(const FontDescription&, unsigned index) const;
 
@@ skipping 17 matching lines @@
 
     const SimpleFontData* determinePrimarySimpleFontData(const FontDescription&) const;
 
     void releaseFontData();
 
     mutable Vector<RefPtr<FontData>, 1> m_fontList;
     GlyphPages m_pages;
     GlyphPageTreeNodeBase* m_pageZero;
     mutable const SimpleFontData* m_cachedPrimarySimpleFontData;
     RefPtrWillBePersistent<FontSelector> m_fontSelector;
-    mutable WidthCache m_widthCache;
+    mutable CachingWordShaper m_cachingWordShaper;
     unsigned m_fontSelectorVersion;
     mutable int m_familyIndex;
     unsigned short m_generation;
     mutable bool m_hasLoadingFallback : 1;
 };
 
 } // namespace blink
 
 #endif