| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index aec7897bd7a05b7d2ddeb79e0ff2b82a5640f26b..75b14d1daa64068bec24bb2d074d9ba0ef1a818b 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -107,6 +107,7 @@ class CSSTransitionData;
|
| class CSSVariableData;
|
| class Font;
|
| class FontMetrics;
|
| +class Hyphenation;
|
| class RotateTransformOperation;
|
| class ScaleTransformOperation;
|
| class ShadowList;
|
| @@ -888,7 +889,7 @@ public:
|
| const AtomicString& highlight() const { return m_rareInheritedData->highlight; }
|
| Hyphens getHyphens() const { return static_cast<Hyphens>(m_rareInheritedData->hyphens); }
|
| const AtomicString& hyphenationString() const { return m_rareInheritedData->hyphenationString; }
|
| - const AtomicString& locale() const { return getFontDescription().locale(false); }
|
| + const AtomicString& locale() const { return getFontDescription().localeString(); }
|
| EResize resize() const { return static_cast<EResize>(m_rareNonInheritedData->m_resize); }
|
| bool hasInlinePaginationAxis() const
|
| {
|
| @@ -1622,6 +1623,7 @@ public:
|
| QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }
|
| void setQuotes(PassRefPtr<QuotesData>);
|
|
|
| + Hyphenation* getHyphenation() const;
|
| const AtomicString& hyphenString() const;
|
|
|
| bool inheritedEqual(const ComputedStyle&) const;
|
|
|