| Index: Source/core/rendering/RenderBlock.h
|
| diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
|
| index 2d84e53d41cf65609ca516434cd1bcfe757992c7..b71c1f29151d54c39533286ae523bf07c97dd167 100644
|
| --- a/Source/core/rendering/RenderBlock.h
|
| +++ b/Source/core/rendering/RenderBlock.h
|
| @@ -23,7 +23,6 @@
|
| #ifndef RenderBlock_h
|
| #define RenderBlock_h
|
|
|
| -#include "core/rendering/ColumnInfo.h"
|
| #include "core/rendering/FloatingObjects.h"
|
| #include "core/rendering/GapRects.h"
|
| #include "core/rendering/RenderBox.h"
|
| @@ -148,12 +147,6 @@ public:
|
|
|
| virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE;
|
|
|
| - // Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.)
|
| - virtual LayoutUnit availableLogicalWidth() const OVERRIDE FINAL;
|
| -
|
| - LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
|
| - void adjustStartEdgeForWritingModeIncludingColumns(LayoutRect&) const;
|
| -
|
| LayoutUnit blockDirectionOffset(const LayoutSize& offsetFromBlock) const;
|
| LayoutUnit inlineDirectionOffset(const LayoutSize& offsetFromBlock) const;
|
|
|
| @@ -176,10 +169,6 @@ public:
|
| int heightForLineCount(int);
|
| void clearTruncation();
|
|
|
| - void adjustRectForColumns(LayoutRect&) const;
|
| - virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const OVERRIDE FINAL;
|
| - void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInContainer) const;
|
| -
|
| void addContinuationWithOutline(RenderInline*);
|
| bool paintsContinuationOutline(RenderInline*);
|
|
|
| @@ -192,23 +181,12 @@ public:
|
| using RenderBoxModelObject::setContinuation;
|
|
|
| static RenderBlock* createAnonymousWithParentRendererAndDisplay(const RenderObject*, EDisplay = BLOCK);
|
| - static RenderBlockFlow* createAnonymousColumnsWithParentRenderer(const RenderObject*);
|
| - static RenderBlockFlow* createAnonymousColumnSpanWithParentRenderer(const RenderObject*);
|
| RenderBlock* createAnonymousBlock(EDisplay display = BLOCK) const { return createAnonymousWithParentRendererAndDisplay(this, display); }
|
| - RenderBlockFlow* createAnonymousColumnsBlock() const { return createAnonymousColumnsWithParentRenderer(this); }
|
| - RenderBlockFlow* createAnonymousColumnSpanBlock() const { return createAnonymousColumnSpanWithParentRenderer(this); }
|
|
|
| virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE;
|
|
|
| - ColumnInfo* columnInfo() const;
|
| int columnGap() const;
|
|
|
| - void updateColumnInfoFromStyle(RenderStyle*);
|
| -
|
| - // These two functions take the ColumnInfo* to avoid repeated lookups of the info in the global HashMap.
|
| - unsigned columnCount(ColumnInfo*) const;
|
| - LayoutRect columnRectAt(ColumnInfo*, unsigned) const;
|
| -
|
| LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_paginationStrut : LayoutUnit(); }
|
| void setPaginationStrut(LayoutUnit);
|
|
|
| @@ -371,8 +349,6 @@ protected:
|
| bool simplifiedLayout();
|
| virtual void simplifiedNormalFlowLayout();
|
|
|
| - void setDesiredColumnCountAndWidth(int, LayoutUnit);
|
| -
|
| public:
|
| virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false);
|
| protected:
|
| @@ -416,7 +392,6 @@ private:
|
|
|
| void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);
|
| virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild) OVERRIDE;
|
| - void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild);
|
|
|
| void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);
|
|
|
| @@ -436,17 +411,12 @@ private:
|
| // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
|
| virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool) { }
|
| void paintContents(PaintInfo&, const LayoutPoint&);
|
| - void paintColumnContents(PaintInfo&, const LayoutPoint&, bool paintFloats = false);
|
| - void paintColumnRules(PaintInfo&, const LayoutPoint&);
|
| void paintSelection(PaintInfo&, const LayoutPoint&);
|
| void paintCaret(PaintInfo&, const LayoutPoint&, CaretType);
|
|
|
| bool hasCaret() const { return hasCaret(CursorCaret) || hasCaret(DragCaret); }
|
| bool hasCaret(CaretType) const;
|
|
|
| - virtual bool avoidsFloats() const OVERRIDE;
|
| -
|
| - bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
|
| virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&) { return false; }
|
| @@ -489,14 +459,10 @@ private:
|
| virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE;
|
| virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE;
|
|
|
| - LayoutUnit desiredColumnWidth() const;
|
| -
|
| void paintContinuationOutlines(PaintInfo&, const LayoutPoint&);
|
|
|
| virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE FINAL;
|
|
|
| - void adjustPointToColumnContents(LayoutPoint&) const;
|
| -
|
| void fitBorderToLinesIfNeeded(); // Shrink the box in which the border paints if border-fit is set.
|
| virtual void adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const; // Helper function for borderFitAdjust
|
|
|
| @@ -505,19 +471,10 @@ private:
|
| Position positionForBox(InlineBox*, bool start = true) const;
|
| PositionWithAffinity positionForPointWithInlineChildren(const LayoutPoint&);
|
|
|
| - virtual void calcColumnWidth();
|
| - void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBlockFlow* newBlockBox, RenderObject* newChild);
|
| -
|
| bool expandsToEncloseOverhangingFloats() const;
|
|
|
| - void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
|
| - RenderObject* beforeChild, RenderBoxModelObject* oldCont);
|
| - void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
|
| - RenderObject* newChild, RenderBoxModelObject* oldCont);
|
| RenderBlock* clone() const;
|
| RenderBlock* continuationBefore(RenderObject* beforeChild);
|
| - RenderBlockFlow* containingColumnsBlock(bool allowAnonymousColumnBlock = true);
|
| - RenderBlockFlow* columnsBlockForSpanningElement(RenderObject* newChild);
|
|
|
| // End helper functions and structs used by layoutBlockChildren.
|
|
|
| @@ -536,8 +493,6 @@ protected:
|
| LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule = ExcludePageBoundary) const;
|
| bool hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule = ExcludePageBoundary) const;
|
|
|
| - virtual ColumnInfo::PaginationUnit paginationUnit() const;
|
| -
|
| public:
|
| LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
|
| LayoutUnit pageLogicalHeightForOffset(LayoutUnit offset) const;
|
|
|