| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 6a27aaead144d0faca8f577e026e5d30c062ea33..085042b6fc154620ac092ef16644e577d25f9e70 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -832,7 +832,6 @@ public:
|
| const AtomicString& highlight() const { return rareInheritedData->highlight; }
|
| const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }
|
| const AtomicString& locale() const { return rareInheritedData->locale; }
|
| - EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInheritedData->m_borderFit); }
|
| EResize resize() const { return static_cast<EResize>(rareInheritedData->resize); }
|
| bool hasInlinePaginationAxis() const
|
| {
|
| @@ -1319,7 +1318,6 @@ public:
|
| void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
|
| void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenationString, h); }
|
| void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, locale, locale); }
|
| - void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
|
| void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
|
| void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_width, f); }
|
| void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_width, 0); }
|
| @@ -1646,7 +1644,6 @@ public:
|
| static ESpeak initialSpeak() { return SpeakNormal; }
|
| static const AtomicString& initialHyphenationString() { return nullAtom; }
|
| static const AtomicString& initialLocale() { return nullAtom; }
|
| - static EBorderFit initialBorderFit() { return BorderFitBorder; }
|
| static EResize initialResize() { return RESIZE_NONE; }
|
| static ControlPart initialAppearance() { return NoControlPart; }
|
| static bool initialHasAspectRatio() { return false; }
|
|
|