DevTools: CSS.getPlatformFontsForNode to return a cssFamilyName as well

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 1047 matching lines @@
         it.advance(run.length(), &glyphBuffer);
         for (int i = 0; i < glyphBuffer.size(); ++i) {
             String familyName = glyphBuffer.fontDataAt(i)->platformData().fontFamilyName();
             int value = fontStats->contains(familyName) ? fontStats->get(familyName) : 0;
             fontStats->set(familyName, value + 1);
         }
     }
 }
 
 void InspectorCSSAgent::getPlatformFontsForNode(ErrorString* errorString, int nodeId,
-    RefPtr<TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage> >& platformFontUsage)
+    String* cssFamilyName, RefPtr<TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage> >& platformFonts)
 {
     Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
+
+    RefPtr<CSSComputedStyleDeclaration> computedStyleInfo = CSSComputedStyleDeclaration::create(node, true);
+    *cssFamilyName = computedStyleInfo->getPropertyValue(CSSPropertyFontFamily);
+
     Vector<Node*> textNodes;
     if (node->nodeType() == Node::TEXT_NODE) {
         if (node->renderer())
             textNodes.append(node);
     } else {
         for (Node* child = node->firstChild(); child; child = child->nextSibling()) {
             if (child->nodeType() == Node::TEXT_NODE && child->renderer())
                 textNodes.append(child);
         }
     }
 
     HashMap<String, int> fontStats;
     for (size_t i = 0; i < textNodes.size(); ++i) {
         RenderText* renderer = toRenderText(textNodes[i]->renderer());
         collectPlatformFontsForRenderer(renderer, &fontStats);
         if (renderer->isTextFragment()) {
             RenderTextFragment* textFragment = toRenderTextFragment(renderer);
             if (textFragment->firstLetter()) {
                 RenderObject* firstLetter = textFragment->firstLetter();
                 for (RenderObject* current = firstLetter->firstChild(); current; current = current->nextSibling()) {
                     if (current->isText())
                         collectPlatformFontsForRenderer(toRenderText(current), &fontStats);
                 }
             }
         }
     }
 
-    platformFontUsage = TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage>::create();
+    platformFonts = TypeBuilder::Array<TypeBuilder::CSS::PlatformFontUsage>::create();
     for (HashMap<String, int>::iterator it = fontStats.begin(), end = fontStats.end(); it != end; ++it) {
         RefPtr<TypeBuilder::CSS::PlatformFontUsage> platformFont = TypeBuilder::CSS::PlatformFontUsage::create()
             .setFamilyName(it->key)
             .setGlyphCount(it->value);
-        platformFontUsage->addItem(platformFont);
+        platformFonts->addItem(platformFont);
     }
 }
 
 void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSStyleSheetHeader> >& styleInfos)
 {
     styleInfos = TypeBuilder::Array<TypeBuilder::CSS::CSSStyleSheetHeader>::create();
     Vector<InspectorStyleSheet*> styleSheets;
     collectAllStyleSheets(styleSheets);
     for (size_t i = 0; i < styleSheets.size(); ++i)
         styleInfos->addItem(styleSheets.at(i)->buildObjectForStyleSheetInfo());
@@ skipping 657 matching lines @@
             documentsToChange.add(element->ownerDocument());
     }
 
     m_nodeIdToForcedPseudoState.clear();
     for (HashSet<Document*>::iterator it = documentsToChange.begin(), end = documentsToChange.end(); it != end; ++it)
         (*it)->setNeedsStyleRecalc();
 }
 
 } // namespace WebCore