Pass DOM locale to Skia in FontCache::getFontDataForCharacter

Source/core/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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
@@ skipping 25 matching lines @@
 #include "core/css/CSSValueList.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/Frame.h"
 #include "core/page/Settings.h"
 #include "core/platform/graphics/FontCache.h"
 #include "core/platform/graphics/SimpleFontData.h"
+#include "core/platform/text/LocaleToScriptMapping.h"
 #include "wtf/text/AtomicString.h"
 
 using namespace std;
 
 namespace WebCore {
 
 CSSFontSelector::CSSFontSelector(Document* document)
     : m_document(document)
     , m_beginLoadingTimer(this, &CSSFontSelector::beginLoadTimerFired)
     , m_version(0)
@@ skipping 105 matching lines @@
 static PassRefPtr<FontData> fontDataForGenericFamily(Document* document, const FontDescription& fontDescription, const AtomicString& familyName)
 {
     if (!document || !document->frame())
         return 0;
 
     const Settings* settings = document->frame()->settings();
     if (!settings)
         return 0;
 
     AtomicString genericFamily;
-    UScriptCode script = fontDescription.script();
+    UScriptCode script = localeToScriptCodeForFontSelection(fontDescription.locale());
 
     if (familyName == serifFamily)
          genericFamily = settings->serifFontFamily(script);
     else if (familyName == sansSerifFamily)
          genericFamily = settings->sansSerifFontFamily(script);
     else if (familyName == cursiveFamily)
          genericFamily = settings->cursiveFontFamily(script);
     else if (familyName == fantasyFamily)
          genericFamily = settings->fantasyFontFamily(script);
     else if (familyName == monospaceFamily)
@@ skipping 218 matching lines @@
     }
     // Ensure that if the request count reaches zero, the frame loader will know about it.
     fetcher->didLoadResource(0);
     // New font loads may be triggered by layout after the document load is complete but before we have dispatched
     // didFinishLoading for the frame. Make sure the delegate is always dispatched by checking explicitly.
     if (m_document && m_document->frame())
         m_document->frame()->loader()->checkLoadComplete();
 }
 
 }