DevTools: generalize getPlatformFonts code

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 802 matching lines @@
 {
     Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
 
     RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> computedStyleInfo = CSSComputedStyleDeclaration::create(node, true);
     RefPtrWillBeRawPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(0, computedStyleInfo, 0);
     style = inspectorStyle->buildArrayForComputedStyle();
 }
 
-void InspectorCSSAgent::collectPlatformFontsForLayoutObject(LayoutText* layoutObject, HashCountedSet<String>* fontStats)
+void InspectorCSSAgent::collectPlatformFontsForLayoutObject(LayoutObject* layoutObject, HashCountedSet<String>* fontStats)
 {
-    for (InlineTextBox* box = layoutObject->firstTextBox(); box; box = box->nextTextBox()) {
-        const ComputedStyle& style = layoutObject->styleRef(box->isFirstLineStyle());
+    if (!layoutObject->isText())
+        return;
+    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, font);
         SimpleShaper shaper(&font, run);
         GlyphBuffer glyphBuffer;
         shaper.advance(run.length(), &glyphBuffer);
         for (unsigned i = 0; i < glyphBuffer.size(); ++i) {
             String familyName = glyphBuffer.fontDataAt(i)->platformData().fontFamilyName();
             if (familyName.isNull())
                 familyName = "";
             fontStats->add(familyName);
         }
     }
 }
 
 void InspectorCSSAgent::getPlatformFontsForNode(ErrorString* errorString, int nodeId,
     String* cssFamilyName, RefPtr<TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage> >& platformFonts)
 {
     Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
 
     RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> computedStyleInfo = CSSComputedStyleDeclaration::create(node, true);
     *cssFamilyName = computedStyleInfo->getPropertyValue(CSSPropertyFontFamily);
 
-    WillBeHeapVector<RawPtrWillBeMember<Text> > textNodes;
-    if (node->nodeType() == Node::TEXT_NODE) {
-        if (node->layoutObject())
-            textNodes.append(toText(node));
-    } else {
-        for (Node* child = node->firstChild(); child; child = child->nextSibling()) {
-            if (child->nodeType() == Node::TEXT_NODE && child->layoutObject())
-                textNodes.append(toText(child));
+    HashCountedSet<String> fontStats;
+    LayoutObject* root = node->layoutObject();
+    if (root) {
+        collectPlatformFontsForLayoutObject(root, &fontStats);
+        // Iterate upto two layers deep.

[pfeldman, 2015/06/18 06:48:09]

Why not N levels?

[lushnikov, 2015/06/18 10:29:14]

In order to preserve current behavior.

+        for (LayoutObject* child = root->slowFirstChild(); child; child = child->nextSibling()) {
+            collectPlatformFontsForLayoutObject(child, &fontStats);
+            for (LayoutObject* child2 = child->slowFirstChild(); child2; child2 = child2->nextSibling())
+                collectPlatformFontsForLayoutObject(child2, &fontStats);
         }
     }
-
-    HashCountedSet<String> fontStats;
-    for (size_t i = 0; i < textNodes.size(); ++i) {
-        LayoutText* layoutObject = textNodes[i]->layoutObject();
-        collectPlatformFontsForLayoutObject(layoutObject, &fontStats);
-
-        if (!layoutObject->isTextFragment())
-            continue;
-
-        // If we're the remaining text from a first-letter then our previous
-        // sibling has to be the first-letter layoutObject.
-        LayoutObject* previous = layoutObject->previousSibling();
-        if (!previous)
-            continue;
-
-        if (!previous->isPseudoElement() || !previous->node()->isFirstLetterPseudoElement())
-            continue;
-
-        // The first-letter pseudoElement only has one child, which is the
-        // first-letter layoutObject.
-        collectPlatformFontsForLayoutObject(toLayoutText(previous->slowFirstChild()), &fontStats);
-    }
-
     platformFonts = TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage>::create();
     for (auto& font : fontStats) {
         RefPtr<TypeBuilder::CSS::PlatformFontUsage> platformFont = TypeBuilder::CSS::PlatformFontUsage::create()
             .setFamilyName(font.key)
             .setGlyphCount(font.value);
         platformFonts->addItem(platformFont);
     }
 }
 
 void InspectorCSSAgent::getStyleSheetText(ErrorString* errorString, const String& styleSheetId, String* result)
@@ skipping 695 matching lines @@
     visitor->trace(m_invalidatedDocuments);
     visitor->trace(m_nodeToInspectorStyleSheet);
     visitor->trace(m_documentToViaInspectorStyleSheet);
 #endif
     visitor->trace(m_inspectorUserAgentStyleSheet);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink