Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Unified Diff: Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h

Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fontcleanup
Patch Set: Pure Android only Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
diff --git a/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h b/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
index 7f94d604ea1e6ed5c6f58fea232fe9828c391748..b7aa6132077f0aa41414fbb687410a0f9b8e2f26 100644
--- a/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
+++ b/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
@@ -39,6 +39,7 @@
#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"
@@ -66,7 +67,7 @@ public:
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();
@@ -138,6 +139,9 @@ private:
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;
};

Powered by Google App Engine
This is Rietveld 408576698