Adding WebFallbackFont and renaming SimpleFontFamily

Source/platform/fonts/linux/FontCacheLinux.cpp

 /*
  * Copyright (C) 2012 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 16 matching lines @@
 #include "platform/fonts/FontCache.h"
 
 #include "public/platform/linux/WebFontFamily.h"
 #include "public/platform/linux/WebFontInfo.h"
 #include "public/platform/linux/WebSandboxSupport.h"
 #include "public/platform/Platform.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
-void FontCache::getFontFamilyForCharacter(UChar32 c, const char* preferredLocale, FontCache::SimpleFontFamily* family)
+void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)
 {
-    blink::WebFontFamily webFamily;
-    if (blink::Platform::current()->sandboxSupport())
+
+    if (blink::Platform::current()->sandboxSupport()) {
+        // TODO(dro): crbug.com/382411 Change this to using new getFallbackFontForCharacter sandbox API
+        // and WebFallbackFont class to complete the rename, and pull WebFallbackFont out of the if statement again.
+        blink::WebFontFamily webFamily;
         blink::Platform::current()->sandboxSupport()->getFontFamilyForCharacter(c, preferredLocale, &webFamily);
-    else
-        blink::WebFontInfo::familyForChar(c, preferredLocale, &webFamily);
-    family->name = String::fromUTF8(CString(webFamily.name));
-    family->isBold = webFamily.isBold;
-    family->isItalic = webFamily.isItalic;
+        fallbackFont->name = String::fromUTF8(CString(webFamily.name));
+        fallbackFont->isBold = webFamily.isBold;
+        fallbackFont->isItalic = webFamily.isItalic;
+    } else {
+        blink::WebFallbackFont webFallbackFont;
+        blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
+        fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
+        fallbackFont->filename = CString(webFallbackFont.filename);
+        fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
+        fallbackFont->isBold = webFallbackFont.isBold;
+        fallbackFont->isItalic = webFallbackFont.isItalic;
+    }
 }
 
 }