Pass DOM locale to Skia in FontCache::getFontDataForCharacter

Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 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 24 matching lines @@
 #include "SkPaint.h"
 #include "SkTypeface.h"
 #include "core/platform/NotImplemented.h"
 #include "core/platform/graphics/FontCache.h"
 #include "core/platform/graphics/harfbuzz/HarfBuzzFace.h"
 
 #include "public/platform/linux/WebFontInfo.h"
 #include "public/platform/linux/WebFontRenderStyle.h"
 #include "public/platform/linux/WebSandboxSupport.h"
 #include "public/platform/Platform.h"
+#include "wtf/text/AtomicStringHash.h"
+#include "wtf/text/StringHash.h"
 #include "wtf/text/StringImpl.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;
 static bool useSkiaAutoHint = true;
 static bool useSkiaBitmaps = true;
 static bool useSkiaAntiAlias = true;
 static bool useSkiaSubpixelRendering = false;
@@ skipping 62 matching lines @@
 FontPlatformData::FontPlatformData(const FontPlatformData& src)
     : m_typeface(src.m_typeface)
     , m_family(src.m_family)
     , m_textSize(src.m_textSize)
     , m_emSizeInFontUnits(src.m_emSizeInFontUnits)
     , m_fakeBold(src.m_fakeBold)
     , m_fakeItalic(src.m_fakeItalic)
     , m_orientation(src.m_orientation)
     , m_style(src.m_style)
     , m_harfBuzzFace(src.m_harfBuzzFace)
+    , m_locale(src.m_locale)
     , m_isHashTableDeletedValue(false)
 {
 }
 
-FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
+FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation, const AtomicString& locale)
     : m_typeface(tf)
     , m_family(family)
     , m_textSize(textSize)
     , m_emSizeInFontUnits(0)
     , m_fakeBold(fakeBold)
     , m_fakeItalic(fakeItalic)
     , m_orientation(orientation)
+    , m_locale(locale)
     , m_isHashTableDeletedValue(false)
 {
     querySystemForRenderStyle();
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
     : m_typeface(src.m_typeface)
     , m_family(src.m_family)
     , m_textSize(textSize)
     , m_emSizeInFontUnits(src.m_emSizeInFontUnits)
     , m_fakeBold(src.m_fakeBold)
     , m_fakeItalic(src.m_fakeItalic)
     , m_orientation(src.m_orientation)
     , m_harfBuzzFace(src.m_harfBuzzFace)
+    , m_locale(src.m_locale)
     , m_isHashTableDeletedValue(false)
 {
     querySystemForRenderStyle();
 }
 
 FontPlatformData::~FontPlatformData()
 {
 }
 
 int FontPlatformData::emSizeInFontUnits() const
 {
     if (m_emSizeInFontUnits)
         return m_emSizeInFontUnits;
 
     m_emSizeInFontUnits = m_typeface->getUnitsPerEm();
     return m_emSizeInFontUnits;
 }
 
 FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)
 {
     m_typeface = src.m_typeface;
     m_family = src.m_family;
     m_textSize = src.m_textSize;
     m_fakeBold = src.m_fakeBold;
     m_fakeItalic = src.m_fakeItalic;
     m_harfBuzzFace = src.m_harfBuzzFace;
     m_orientation = src.m_orientation;
     m_style = src.m_style;
+    m_locale = src.m_locale;
     m_emSizeInFontUnits = src.m_emSizeInFontUnits;
 
     return *this;
 }
 
 #ifndef NDEBUG
 String FontPlatformData::description() const
 {
     return String();
 }
@@ skipping 39 matching lines @@
         typefacesEqual = m_typeface == a.m_typeface;
     else
         typefacesEqual = SkTypeface::Equal(m_typeface.get(), a.m_typeface.get());
 
     return typefacesEqual
         && m_textSize == a.m_textSize
         && m_fakeBold == a.m_fakeBold
         && m_fakeItalic == a.m_fakeItalic
         && m_orientation == a.m_orientation
         && m_style == a.m_style
+        && m_locale == a.m_locale
         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue;
 }
 
 unsigned FontPlatformData::hash() const
 {
     unsigned h = SkTypeface::UniqueID(m_typeface.get());
     h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_fakeBold) << 1) | static_cast<int>(m_fakeItalic));
 
     // This memcpy is to avoid a reinterpret_cast that breaks strict-aliasing
     // rules. Memcpy is generally optimized enough so that performance doesn't
     // matter here.
     uint32_t textSizeBytes;
     memcpy(&textSizeBytes, &m_textSize, sizeof(uint32_t));
     h ^= textSizeBytes;
+    h ^= m_locale.isNull() ? 0 : CaseFoldingHash::hash(m_locale);
 
     return h;
 }
 
 bool FontPlatformData::isFixedPitch() const
 {
     notImplemented();
     return false;
 }
 
@@ skipping 42 matching lines @@
         m_style.useAutoHint = useSkiaAutoHint;
     if (m_style.useSubpixelPositioning == FontRenderStyle::NoPreference)
         m_style.useSubpixelPositioning = useSkiaSubpixelPositioning;
     if (m_style.useAntiAlias == FontRenderStyle::NoPreference)
         m_style.useAntiAlias = useSkiaAntiAlias;
     if (m_style.useSubpixelRendering == FontRenderStyle::NoPreference)
         m_style.useSubpixelRendering = useSkiaSubpixelRendering;
 }
 
 } // namespace WebCore