| Index: Source/core/layout/LayoutView.cpp
|
| diff --git a/Source/core/layout/LayoutView.cpp b/Source/core/layout/LayoutView.cpp
|
| index 420970ec29130aae75e4a59fb122f13e96c79aa8..8fbd32b56764b1565f5ebb9ff7fd9e4f62baacc3 100644
|
| --- a/Source/core/layout/LayoutView.cpp
|
| +++ b/Source/core/layout/LayoutView.cpp
|
| @@ -28,7 +28,6 @@
|
| #include "core/frame/Settings.h"
|
| #include "core/html/HTMLFrameOwnerElement.h"
|
| #include "core/html/HTMLIFrameElement.h"
|
| -#include "core/layout/ColumnInfo.h"
|
| #include "core/layout/HitTestResult.h"
|
| #include "core/layout/LayoutFlowThread.h"
|
| #include "core/layout/LayoutGeometryMap.h"
|
| @@ -152,14 +151,6 @@ void LayoutView::updateLogicalWidth()
|
| setLogicalWidth(viewLogicalWidthForBoxSizing());
|
| }
|
|
|
| -LayoutUnit LayoutView::availableLogicalHeight(AvailableLogicalHeightType heightType) const
|
| -{
|
| - // If we have columns, then the available logical height is reduced to the column height.
|
| - if (hasColumns())
|
| - return columnInfo()->columnHeight();
|
| - return LayoutBlockFlow::availableLogicalHeight(heightType);
|
| -}
|
| -
|
| bool LayoutView::isChildAllowed(LayoutObject* child, const ComputedStyle&) const
|
| {
|
| return child->isBox();
|
| @@ -869,16 +860,7 @@ LayoutObject* LayoutView::backgroundLayoutObject() const
|
|
|
| LayoutRect LayoutView::backgroundRect(LayoutBox* backgroundLayoutObject) const
|
| {
|
| - if (!hasColumns())
|
| - return LayoutRect(unscaledDocumentRect());
|
| -
|
| - ColumnInfo* columnInfo = this->columnInfo();
|
| - LayoutRect backgroundRect(0, 0, columnInfo->desiredColumnWidth(), columnInfo->columnHeight() * columnInfo->columnCount());
|
| - if (!isHorizontalWritingMode())
|
| - backgroundRect = backgroundRect.transposedRect();
|
| - backgroundLayoutObject->flipForWritingMode(backgroundRect);
|
| -
|
| - return backgroundRect;
|
| + return LayoutRect(unscaledDocumentRect());
|
| }
|
|
|
| IntRect LayoutView::documentRect() const
|
|
|