Index: Source/core/rendering/RenderObject.h |
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h |
index c0de169ae7ec0f9b7a3895708c42166f0a5e6e09..b161951bb445ce31a95938187754ff5db2c68858 100644 |
--- a/Source/core/rendering/RenderObject.h |
+++ b/Source/core/rendering/RenderObject.h |
@@ -403,8 +403,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 ancestorLineBoxDirty() const { return m_bitfields.ancestorLineBoxDirty(); } |
void setAncestorLineBoxDirty(bool value = true) |
@@ -496,8 +494,6 @@ public: |
&& !isRenderFullScreen() |
&& !isRenderFullScreenPlaceholder(); |
} |
- bool isAnonymousColumnsBlock() const { return style()->specifiesColumns() && isAnonymousBlock(); } |
- bool isAnonymousColumnSpanBlock() const { return style()->columnSpan() && isAnonymousBlock(); } |
bool isElementContinuation() const { return node() && node()->renderer() != this; } |
bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); } |
virtual RenderBoxModelObject* virtualContinuation() const { return 0; } |
@@ -836,16 +832,6 @@ public: |
virtual void computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed = false) const; |
virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect& repaintRect, bool fixed = false) const; |
- // If multiple-column layout results in applying an offset to the given point, add the same |
- // offset to the given size. |
- virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const { } |
- LayoutSize offsetForColumns(const LayoutPoint& point) const |
- { |
- LayoutSize offset; |
- adjustForColumns(offset, point); |
- return offset; |
- } |
- |
virtual unsigned int length() const { return 1; } |
bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOutOfFlowPositioned()); } |
@@ -1127,7 +1113,6 @@ private: |
, m_everHadLayout(false) |
, m_ancestorLineBoxDirty(false) |
, m_childrenInline(false) |
- , m_hasColumns(false) |
, m_layoutDidGetCalled(false) |
, m_positionedState(IsStaticallyPositioned) |
, m_selectionState(SelectionNone) |
@@ -1167,7 +1152,6 @@ private: |
// from RenderBlock |
ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline); |
- ADD_BOOLEAN_BITFIELD(hasColumns, HasColumns); |
ADD_BOOLEAN_BITFIELD(layoutDidGetCalled, LayoutDidGetCalled); |