| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index db5d1ec8dc4b8ca3eabb2d5a0b3c34223bd4cd4f..0dd234465915190e752b5eb8a3e6cadcae2057a7 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -846,9 +846,6 @@ public:
|
| EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakBefore); }
|
| EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakInside); }
|
| EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakAfter); }
|
| - EPageBreak regionBreakBefore() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakBefore); }
|
| - EPageBreak regionBreakInside() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakInside); }
|
| - EPageBreak regionBreakAfter() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakAfter); }
|
| const TransformOperations& transform() const { return rareNonInheritedData->m_transform->m_operations; }
|
| Length transformOriginX() const { return rareNonInheritedData->m_transform->m_x; }
|
| Length transformOriginY() const { return rareNonInheritedData->m_transform->m_y; }
|
| @@ -885,11 +882,6 @@ public:
|
|
|
| // End CSS3 Getters
|
|
|
| - const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
|
| - bool hasFlowFrom() const { return !rareNonInheritedData->m_regionThread.isNull(); }
|
| - const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
|
| - RegionFragment regionFragment() const { return static_cast<RegionFragment>(rareNonInheritedData->m_regionFragment); }
|
| -
|
| const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
|
| LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData->m_lineSnap); }
|
| LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedData->m_lineAlign); }
|
| @@ -1313,9 +1305,6 @@ public:
|
| // For valid values of column-break-inside see http://www.w3.org/TR/css3-multicol/#break-before-break-after-break-inside
|
| void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); }
|
| void setColumnBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakAfter, p); }
|
| - void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_regionBreakBefore, p); }
|
| - void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); }
|
| - void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_regionBreakAfter, p); }
|
| void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData.access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
|
| void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_transform, m_operations, ops); }
|
| void setTransformOriginX(Length l) { SET_VAR(rareNonInheritedData.access()->m_transform, m_x, l); }
|
| @@ -1346,10 +1335,6 @@ public:
|
| void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
|
| void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAlign, lineAlign); }
|
|
|
| - void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
|
| - void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
|
| - void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInheritedData, m_regionFragment, regionFragment); }
|
| -
|
| void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
|
| void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
|
|
|
| @@ -1504,12 +1489,6 @@ public:
|
| bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
|
| bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
|
| bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
|
| - bool isDisplayRegionType() const
|
| - {
|
| - return display() == BLOCK || display() == INLINE_BLOCK
|
| - || display() == TABLE_CELL || display() == TABLE_CAPTION
|
| - || display() == LIST_ITEM;
|
| - }
|
|
|
| bool setWritingMode(WritingMode v)
|
| {
|
| @@ -1718,10 +1697,6 @@ public:
|
| static LineSnap initialLineSnap() { return LineSnapNone; }
|
| static LineAlign initialLineAlign() { return LineAlignNone; }
|
|
|
| - static const AtomicString& initialFlowThread() { return nullAtom; }
|
| - static const AtomicString& initialRegionThread() { return nullAtom; }
|
| - static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
|
| -
|
| static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
|
| static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
|
|
|
|
|