Pass DOM locale to Skia in FontCache::getFontDataForCharacter

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

 /*
  * 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 21 matching lines @@
 #define FontPlatformDataHarfBuzz_h
 
 #include "SkPaint.h"
 #include "core/platform/SharedBuffer.h"
 #include "core/platform/graphics/FontOrientation.h"
 #include "core/platform/graphics/chromium/FontRenderStyle.h"
 #include "core/platform/graphics/opentype/OpenTypeVerticalData.h"
 #include "wtf/Forward.h"
 #include "wtf/HashTableDeletedValueType.h"
 #include "wtf/RefPtr.h"
+#include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringImpl.h"
 
 class SkTypeface;
 typedef uint32_t SkFontID;
 
 namespace WebCore {
 
 class FontDescription;
 class HarfBuzzFace;
 
 // -----------------------------------------------------------------------------
 // FontPlatformData is the handle which WebKit has on a specific face. A face
 // is the tuple of (font, size, ...etc). Here we are just wrapping a Skia
 // SkTypeface pointer and dealing with the reference counting etc.
 // -----------------------------------------------------------------------------
 class FontPlatformData {
 public:
     // Used for deleted values in the font cache's hash tables. The hash table
     // will create us with this structure, and it will compare other values
     // to this "Deleted" one. It expects the Deleted one to be differentiable
     // from the 0 one (created with the empty constructor), so we can't just
     // set everything to 0.
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
     FontPlatformData(float textSize, bool fakeBold, bool fakeItalic);
     FontPlatformData(const FontPlatformData&);
-    FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal);
+    FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal, const AtomicString& locale = AtomicString());
     FontPlatformData(const FontPlatformData& src, float textSize);
     ~FontPlatformData();
 
     String fontFamilyName() const;
 
     // -------------------------------------------------------------------------
     // Return true iff this font is monospaced (i.e. every glyph has an equal x
     // advance)
     // -------------------------------------------------------------------------
     bool isFixedPitch() const;
@@ skipping 51 matching lines @@
     void querySystemForRenderStyle();
 
     RefPtr<SkTypeface> m_typeface;
     CString m_family;
     float m_textSize;
     mutable int m_emSizeInFontUnits;
     bool m_fakeBold;
     bool m_fakeItalic;
     FontOrientation m_orientation;
     FontRenderStyle m_style;
+    // Only set for platforms (e.g. Android) that FontCache::getFontDataForCharacter() may return different FontData
+    // for different locales of FontDescriptions.
+    AtomicString m_locale;
     mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
     bool m_isHashTableDeletedValue;
 };
 
 } // namespace WebCore
 
 #endif // ifdef FontPlatformDataHarfBuzz_h