Index: third_party/WebKit/Source/core/css/resolver/FontBuilder.h |
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilder.h b/third_party/WebKit/Source/core/css/resolver/FontBuilder.h |
index 395b3e82c3d46795ee3ae81484c3ad4516b4bd92..540fe11a7b336aa59fde5da95627890241287c53 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/FontBuilder.h |
+++ b/third_party/WebKit/Source/core/css/resolver/FontBuilder.h |
@@ -61,7 +61,7 @@ public: |
void setStretch(FontStretch); |
void setFamilyDescription(const FontDescription::FamilyDescription&); |
void setFeatureSettings(PassRefPtr<FontFeatureSettings>); |
- void setLocale(const AtomicString&); |
+ void setLocale(PassRefPtr<const LayoutLocale>); |
void setStyle(FontStyle); |
void setVariantCaps(FontDescription::FontVariantCaps); |
void setVariantLigatures(const FontDescription::VariantLigatures&); |
@@ -86,7 +86,7 @@ public: |
static FontDescription::FontVariantCaps initialVariantCaps() { return FontDescription::CapsNormal; } |
static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); } |
static FontVariantNumeric initialVariantNumeric() { return FontVariantNumeric(); }; |
- static const AtomicString& initialLocale() { return nullAtom; } |
+ static LayoutLocale* initialLocale() { return nullptr; } |
static FontStyle initialStyle() { return FontStyleNormal; } |
static FontDescription::Kerning initialKerning() { return FontDescription::AutoKerning; } |
static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } |