Pass DOM locale to Skia in FontCache::getFontDataForCharacter

Source/core/css/resolver/FontBuilder.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 430 matching lines @@
 
     scope.fontDescription().setCommonLigaturesState(commonLigaturesState);
     scope.fontDescription().setDiscretionaryLigaturesState(discretionaryLigaturesState);
     scope.fontDescription().setHistoricalLigaturesState(historicalLigaturesState);
 }
 
 void FontBuilder::setScript(const String& locale)
 {
     FontDescriptionChangeScope scope(this);
 
-    scope.fontDescription().setScript(localeToScriptCodeForFontSelection(locale));
+    scope.fontDescription().setLocale(AtomicString(locale));
 }
 
 void FontBuilder::setItalic(FontItalic italic)
 {
     FontDescriptionChangeScope scope(this);
 
     scope.fontDescription().setItalic(italic);
 }
 
 void FontBuilder::setSmallCaps(FontSmallCaps smallCaps)
@@ skipping 177 matching lines @@
     checkForGenericFamilyChange(style, parentStyle);
     checkForZoomChange(style, parentStyle);
     checkForOrientationChange(style);
     style->font().update(fontSelector);
     m_fontDirty = false;
 }
 
 void FontBuilder::createFontForDocument(PassRefPtr<FontSelector> fontSelector, RenderStyle* documentStyle)
 {
     FontDescription fontDescription = FontDescription();
-    fontDescription.setScript(localeToScriptCodeForFontSelection(documentStyle->locale()));
+    UScriptCode script = localeToScriptCodeForFontSelection(documentStyle->locale());
+    fontDescription.setLocale(documentStyle->locale());
     if (Settings* settings = m_document->settings()) {
         fontDescription.setUsePrinterFont(m_document->printing());
-        const AtomicString& standardFont = settings->standardFontFamily(fontDescription.script());
+        const AtomicString& standardFont = settings->standardFontFamily(script);
         if (!standardFont.isEmpty()) {
             fontDescription.setGenericFamily(FontDescription::StandardFamily);
             fontDescription.firstFamily().setFamily(standardFont);
             fontDescription.firstFamily().appendFamily(0);
         }
         fontDescription.setKeywordSize(CSSValueMedium - CSSValueXxSmall + 1);
         int size = FontSize::fontSizeForKeyword(m_document, CSSValueMedium, false);
         fontDescription.setSpecifiedSize(size);
         fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(fontDescription, documentStyle->effectiveZoom(), size));
     } else {
         fontDescription.setUsePrinterFont(m_document->printing());
     }
 
     FontOrientation fontOrientation;
     NonCJKGlyphOrientation glyphOrientation;
     getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation);
     fontDescription.setOrientation(fontOrientation);
     fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
     documentStyle->setFontDescription(fontDescription);
     documentStyle->font().update(fontSelector);
 }
 
 }