Refactor InspectorCSSAgent to avoid an intermediate GlyphBuffer

third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 66 matching lines @@
 #include "core/layout/LayoutText.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/Page.h"
 #include "core/style/StyleGeneratedImage.h"
 #include "core/style/StyleImage.h"
 #include "core/svg/SVGElement.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontCache.h"
-#include "platform/fonts/GlyphBuffer.h"
+#include "platform/fonts/shaping/CachingWordShaper.h"
 #include "platform/text/TextRun.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringConcatenate.h"
 
 namespace blink {
 
 namespace {
 
 int s_frontendOperationCounter = 0;
@@ skipping 1031 matching lines @@
   if (!layoutObject->isText())
     return;
 
   FontCachePurgePreventer preventer;
   LayoutText* layoutText = toLayoutText(layoutObject);
   for (InlineTextBox* box = layoutText->firstTextBox(); box;
        box = box->nextTextBox()) {
     const ComputedStyle& style = layoutText->styleRef(box->isFirstLineStyle());
     const Font& font = style.font();
     TextRun run = box->constructTextRunForInspector(style);
-    TextRunPaintInfo paintInfo(run);
-    GlyphBuffer glyphBuffer;
-    font.buildGlyphBuffer(paintInfo, glyphBuffer);
-    for (unsigned i = 0; i < glyphBuffer.size(); ++i) {
-      const SimpleFontData* simpleFontData = glyphBuffer.fontDataAt(i);
+    CachingWordShaper shaper(font);
+    for (const auto& runFontData : shaper.runFontData(run)) {
+      const auto* simpleFontData = runFontData.m_fontData;
       String familyName = simpleFontData->platformData().fontFamilyName();
       if (familyName.isNull())
         familyName = "";
       fontStats->add(
-          std::make_pair(simpleFontData->isCustomFont() ? 1 : 0, familyName));
+          std::make_pair(simpleFontData->isCustomFont() ? 1 : 0, familyName),
+          runFontData.m_glyphCount);
     }
   }
 }
 
 Response InspectorCSSAgent::getPlatformFontsForNode(
     int nodeId,
     std::unique_ptr<protocol::Array<protocol::CSS::PlatformFontUsage>>*
         platformFonts) {
   Node* node = nullptr;
   Response response = m_domAgent->assertNode(nodeId, node);
@@ skipping 1343 matching lines @@
   visitor->trace(m_cssStyleSheetToInspectorStyleSheet);
   visitor->trace(m_documentToCSSStyleSheets);
   visitor->trace(m_invalidatedDocuments);
   visitor->trace(m_nodeToInspectorStyleSheet);
   visitor->trace(m_inspectorUserAgentStyleSheet);
   visitor->trace(m_tracker);
   InspectorBaseAgent::trace(visitor);
 }
 
 }  // namespace blink