Commit ac960efe authored by mstensho@opera.com's avatar mstensho@opera.com

Remove 'paginated line width' from RootInlineBox.

It was set but never used. Probably a relic from CSS regions support.

R=leviw@chromium.org

Review URL: https://codereview.chromium.org/716213002

git-svn-id: svn://svn.chromium.org/blink/trunk@185233 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 96f96b8b
...@@ -1051,7 +1051,6 @@ void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) ...@@ -1051,7 +1051,6 @@ void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState)
LayoutUnit blockLogicalHeight = logicalHeight(); LayoutUnit blockLogicalHeight = logicalHeight();
trailingFloatsLineBox->alignBoxesInBlockDirection(blockLogicalHeight, textBoxDataMap, verticalPositionCache); trailingFloatsLineBox->alignBoxesInBlockDirection(blockLogicalHeight, textBoxDataMap, verticalPositionCache);
trailingFloatsLineBox->setLineTopBottomPositions(blockLogicalHeight, blockLogicalHeight, blockLogicalHeight, blockLogicalHeight); trailingFloatsLineBox->setLineTopBottomPositions(blockLogicalHeight, blockLogicalHeight, blockLogicalHeight, blockLogicalHeight);
trailingFloatsLineBox->setPaginatedLineWidth(availableLogicalWidthForContent());
LayoutRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLayoutOverflow - blockLogicalHeight); LayoutRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLayoutOverflow - blockLogicalHeight);
LayoutRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVisualOverflow - blockLogicalHeight); LayoutRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVisualOverflow - blockLogicalHeight);
trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLineBox->lineBottom()); trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLineBox->lineBottom());
......
...@@ -40,7 +40,7 @@ namespace blink { ...@@ -40,7 +40,7 @@ namespace blink {
struct SameSizeAsRootInlineBox : public InlineFlowBox { struct SameSizeAsRootInlineBox : public InlineFlowBox {
unsigned unsignedVariable; unsigned unsignedVariable;
void* pointers[3]; void* pointers[3];
LayoutUnit layoutVariables[7]; LayoutUnit layoutVariables[6];
}; };
COMPILE_ASSERT(sizeof(RootInlineBox) == sizeof(SameSizeAsRootInlineBox), RootInlineBox_should_stay_small); COMPILE_ASSERT(sizeof(RootInlineBox) == sizeof(SameSizeAsRootInlineBox), RootInlineBox_should_stay_small);
...@@ -58,7 +58,6 @@ RootInlineBox::RootInlineBox(RenderBlockFlow& block) ...@@ -58,7 +58,6 @@ RootInlineBox::RootInlineBox(RenderBlockFlow& block)
, m_lineBottomWithLeading(0) , m_lineBottomWithLeading(0)
, m_selectionBottom(0) , m_selectionBottom(0)
, m_paginationStrut(0) , m_paginationStrut(0)
, m_paginatedLineWidth(0)
{ {
setIsHorizontal(block.isHorizontalWritingMode()); setIsHorizontal(block.isHorizontalWritingMode());
} }
...@@ -235,8 +234,6 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G ...@@ -235,8 +234,6 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G
maxHeight = std::max<LayoutUnit>(0, maxHeight); // FIXME: Is this really necessary? maxHeight = std::max<LayoutUnit>(0, maxHeight); // FIXME: Is this really necessary?
setLineTopBottomPositions(lineTop, lineBottom, heightOfBlock, heightOfBlock + maxHeight, selectionBottom); setLineTopBottomPositions(lineTop, lineBottom, heightOfBlock, heightOfBlock + maxHeight, selectionBottom);
if (block().view()->layoutState()->isPaginated())
setPaginatedLineWidth(block().availableLogicalWidthForContent());
LayoutUnit annotationsAdjustment = beforeAnnotationsAdjustment(); LayoutUnit annotationsAdjustment = beforeAnnotationsAdjustment();
if (annotationsAdjustment) { if (annotationsAdjustment) {
......
...@@ -57,8 +57,6 @@ public: ...@@ -57,8 +57,6 @@ public:
LayoutUnit paginationStrut() const { return m_paginationStrut; } LayoutUnit paginationStrut() const { return m_paginationStrut; }
void setPaginationStrut(LayoutUnit strut) { m_paginationStrut = strut; } void setPaginationStrut(LayoutUnit strut) { m_paginationStrut = strut; }
void setPaginatedLineWidth(LayoutUnit width) { m_paginatedLineWidth = width; }
LayoutUnit selectionTop() const; LayoutUnit selectionTop() const;
LayoutUnit selectionBottom() const; LayoutUnit selectionBottom() const;
LayoutUnit selectionHeight() const { return max<LayoutUnit>(0, selectionBottom() - selectionTop()); } LayoutUnit selectionHeight() const { return max<LayoutUnit>(0, selectionBottom() - selectionTop()); }
...@@ -201,7 +199,6 @@ private: ...@@ -201,7 +199,6 @@ private:
LayoutUnit m_lineBottomWithLeading; LayoutUnit m_lineBottomWithLeading;
LayoutUnit m_selectionBottom; LayoutUnit m_selectionBottom;
LayoutUnit m_paginationStrut; LayoutUnit m_paginationStrut;
LayoutUnit m_paginatedLineWidth;
}; };
} // namespace blink } // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment