| Index: Source/core/layout/LayoutObject.h
|
| diff --git a/Source/core/layout/LayoutObject.h b/Source/core/layout/LayoutObject.h
|
| index 1f8e27b76dcb3df6416008c985421f523b32d67d..74e53f17247e9d739eda8d5b1b22a4baeb3ff060 100644
|
| --- a/Source/core/layout/LayoutObject.h
|
| +++ b/Source/core/layout/LayoutObject.h
|
| @@ -407,8 +407,6 @@ public:
|
|
|
| bool childrenInline() const { return m_bitfields.childrenInline(); }
|
| void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); }
|
| - bool hasColumns() const { return m_bitfields.hasColumns(); }
|
| - void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); }
|
|
|
| bool alwaysCreateLineBoxesForLayoutInline() const
|
| {
|
| @@ -1054,7 +1052,7 @@ public:
|
| return layoutDidGetCalledSinceLastFrame() || mayNeedPaintInvalidation() || shouldDoFullPaintInvalidation() || shouldInvalidateSelection();
|
| }
|
|
|
| - virtual bool supportsPaintInvalidationStateCachedOffsets() const { return !hasColumns() && !hasTransformRelatedProperty() && !hasReflection() && !style()->isFlippedBlocksWritingMode(); }
|
| + virtual bool supportsPaintInvalidationStateCachedOffsets() const { return !hasTransformRelatedProperty() && !hasReflection() && !style()->isFlippedBlocksWritingMode(); }
|
|
|
| virtual LayoutRect viewRect() const;
|
|
|
| @@ -1324,7 +1322,6 @@ private:
|
| , m_notifiedOfSubtreeChange(false)
|
| , m_consumesSubtreeChangeNotification(false)
|
| , m_childrenInline(false)
|
| - , m_hasColumns(false)
|
| , m_alwaysCreateLineBoxesForLayoutInline(false)
|
| , m_lastBoxDecorationBackgroundObscured(false)
|
| , m_positionedState(IsStaticallyPositioned)
|
| @@ -1334,7 +1331,7 @@ private:
|
| {
|
| }
|
|
|
| - // 32 bits have been used in the first word, and 17 in the second.
|
| + // 32 bits have been used in the first word, and 16 in the second.
|
| ADD_BOOLEAN_BITFIELD(selfNeedsLayout, SelfNeedsLayout);
|
| ADD_BOOLEAN_BITFIELD(shouldInvalidateOverflowForPaint, ShouldInvalidateOverflowForPaint);
|
| ADD_BOOLEAN_BITFIELD(mayNeedPaintInvalidation, MayNeedPaintInvalidation);
|
| @@ -1378,7 +1375,6 @@ private:
|
|
|
| // from LayoutBlock
|
| ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline);
|
| - ADD_BOOLEAN_BITFIELD(hasColumns, HasColumns);
|
|
|
| // from LayoutInline
|
| ADD_BOOLEAN_BITFIELD(alwaysCreateLineBoxesForLayoutInline, AlwaysCreateLineBoxesForLayoutInline);
|
|
|