Index: Source/core/rendering/RenderView.h |
diff --git a/Source/core/rendering/RenderView.h b/Source/core/rendering/RenderView.h |
index be945cd13d60345bb06100078f15989917d64852..6a6f22c6c1721c101fc273f7a543ccfb36e58b98 100644 |
--- a/Source/core/rendering/RenderView.h |
+++ b/Source/core/rendering/RenderView.h |
@@ -61,8 +61,6 @@ public: |
virtual bool supportsPartialLayout() const OVERRIDE { return true; } |
- virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const OVERRIDE; |
- |
// The same as the FrameView's layoutHeight/layoutWidth but with null check guards. |
int viewHeight(ScrollableArea::IncludeScrollbarsInRect scrollbarInclusion = ScrollableArea::ExcludeScrollbars) const; |
int viewWidth(ScrollableArea::IncludeScrollbarsInRect scrollbarInclusion = ScrollableArea::ExcludeScrollbars) const; |
@@ -209,22 +207,19 @@ private: |
void initializeLayoutState(LayoutState&); |
- virtual void calcColumnWidth() OVERRIDE; |
- virtual ColumnInfo::PaginationUnit paginationUnit() const OVERRIDE; |
- |
bool shouldRepaint(const LayoutRect&) const; |
// These functions may only be accessed by LayoutStateMaintainer. |
- bool pushLayoutState(RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
+ bool pushLayoutState(RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false) |
{ |
// We push LayoutState even if layoutState is disabled because it stores layoutDelta too. |
- if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->hasColumns() || renderer->flowThreadContainingBlock() |
+ if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->flowThreadContainingBlock() |
|| m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isRenderBlockFlow()) |
|| (renderer->isRenderBlock() && toRenderBlock(renderer)->shapeInsideInfo()) |
|| (m_layoutState->shapeInsideInfo() && renderer->isRenderBlock() && !toRenderBlock(renderer)->allowsShapeInsideInfoSharing(m_layoutState->shapeInsideInfo()->owner())) |
) { |
pushLayoutStateForCurrentFlowThread(renderer); |
- m_layoutState = new LayoutState(m_layoutState, renderer, offset, pageHeight, pageHeightChanged, colInfo); |
+ m_layoutState = new LayoutState(m_layoutState, renderer, offset, pageHeight, pageHeightChanged); |
return true; |
} |
return false; |
@@ -293,14 +288,14 @@ class LayoutStateMaintainer { |
WTF_MAKE_NONCOPYABLE(LayoutStateMaintainer); |
public: |
// ctor to push now |
- LayoutStateMaintainer(RenderView* view, RenderBox* root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
+ LayoutStateMaintainer(RenderView* view, RenderBox* root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false) |
: m_view(view) |
, m_disabled(disableState) |
, m_didStart(false) |
, m_didEnd(false) |
, m_didCreateLayoutState(false) |
{ |
- push(root, offset, pageHeight, pageHeightChanged, colInfo); |
+ push(root, offset, pageHeight, pageHeightChanged); |
} |
// ctor to maybe push later |
@@ -318,11 +313,11 @@ public: |
ASSERT(m_didStart == m_didEnd); // if this fires, it means that someone did a push(), but forgot to pop(). |
} |
- void push(RenderBox* root, LayoutSize offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |
+ void push(RenderBox* root, LayoutSize offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false) |
{ |
ASSERT(!m_didStart); |
// We push state even if disabled, because we still need to store layoutDelta |
- m_didCreateLayoutState = m_view->pushLayoutState(root, offset, pageHeight, pageHeightChanged, colInfo); |
+ m_didCreateLayoutState = m_view->pushLayoutState(root, offset, pageHeight, pageHeightChanged); |
if (m_disabled && m_didCreateLayoutState) |
m_view->disableLayoutState(); |
m_didStart = true; |