Move Alternate Family Logic into separate header

Source/core/platform/graphics/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "SkFontMgr.h"
 #include "SkTypeface.h"
-#include "platform/NotImplemented.h"
+#include "core/platform/graphics/AlternateFontFamily.h"
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/FontCache.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/SimpleFontData.h"
+#include "platform/NotImplemented.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include <unicode/locid.h>
 
 namespace WebCore {
 
 void FontCache::platformInit()
 {
 }
@@ skipping 38 matching lines @@
 
 #endif // !OS(WINDOWNS) && !OS(ANDROID)
 
 PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& font)
 {
     return 0;
 }
 
 PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain)
 {
-    const FontPlatformData* fontPlatformData = getFallbackFontData(description);
+    const AtomicString fallbackFontFamily = getFallbackFontFamily(description);
+    const FontPlatformData* fontPlatformData = 0;
+    if (!fallbackFontFamily.isEmpty())
+        fontPlatformData = getFontResourcePlatformData(description, fallbackFontFamily);
+
     if (!fontPlatformData) {
         // we should at least have Arial; this is the SkFontHost_fontconfig last resort fallback
         DEFINE_STATIC_LOCAL(const AtomicString, arialStr, ("Arial", AtomicString::ConstructFromLiteral));
         fontPlatformData = getFontResourcePlatformData(description, arialStr);
     }
 
     ASSERT(fontPlatformData);
     return getFontResourceData(fontPlatformData, shouldRetain);
 }
 
@@ skipping 60 matching lines @@
         name.data(),
         fontSize,
         fontDescription.weight() >= FontWeightBold && !tf->isBold(),
         fontDescription.italic() && !tf->isItalic(),
         fontDescription.orientation());
     return result;
 }
 #endif // !OS(WINDOWNS)
 
 } // namespace WebCore