| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index e6c38d1478be314701b8b511bebadaad4a60abea..b63388337df13da2fb11621997573a2c382b9530 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -831,7 +831,7 @@ public:
|
| const AtomicString& highlight() const { return rareInheritedData->highlight; }
|
| const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }
|
| const AtomicString& locale() const { return rareInheritedData->locale; }
|
| - EResize resize() const { return static_cast<EResize>(rareInheritedData->resize); }
|
| + EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m_resize); }
|
| bool hasInlinePaginationAxis() const
|
| {
|
| // If the pagination axis is parallel with the writing mode inline axis, columns may be laid
|
| @@ -1315,7 +1315,7 @@ 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 setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
|
| + void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_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); }
|
| void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_count, c); }
|
|
|