Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 148823002: *** DO NOT LAND *** Measure the size and complexity of the old multicol implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index 1d15878e9d682af4c0fd407a9e3f44c23492fe5d..f9792e48051282243b0b8c548406354ad9371073 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -29,7 +29,6 @@
#include "core/html/HTMLIFrameElement.h"
#include "core/frame/Frame.h"
#include "core/page/Page.h"
-#include "core/rendering/ColumnInfo.h"
#include "core/rendering/CompositedLayerMapping.h"
#include "core/rendering/FlowThreadController.h"
#include "core/rendering/GraphicsContextAnnotator.h"
@@ -104,14 +103,6 @@ void RenderView::updateLogicalWidth()
setLogicalWidth(viewLogicalWidth());
}
-LayoutUnit RenderView::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 RenderBlock::availableLogicalHeight(heightType);
-}
-
bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
{
return child->isBox();
@@ -397,24 +388,6 @@ bool RenderView::requiresColumns(int desiredColumnCount) const
return RenderBlock::requiresColumns(desiredColumnCount);
}
-void RenderView::calcColumnWidth()
-{
- int columnWidth = contentLogicalWidth();
- if (m_frameView && style()->hasInlineColumnAxis()) {
- if (int pageLength = m_frameView->pagination().pageLength)
- columnWidth = pageLength;
- }
- setDesiredColumnCountAndWidth(1, columnWidth);
-}
-
-ColumnInfo::PaginationUnit RenderView::paginationUnit() const
-{
- if (m_frameView)
- return m_frameView->pagination().behavesLikeColumns ? ColumnInfo::Column : ColumnInfo::Page;
-
- return ColumnInfo::Page;
-}
-
void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
// If we ever require layout but receive a paint anyway, something has gone horribly wrong.
@@ -921,16 +894,7 @@ bool RenderView::rootBackgroundIsEntirelyFixed() const
LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
{
- if (!hasColumns())
- return unscaledDocumentRect();
-
- ColumnInfo* columnInfo = this->columnInfo();
- LayoutRect backgroundRect(0, 0, columnInfo->desiredColumnWidth(), columnInfo->columnHeight() * columnInfo->columnCount());
- if (!isHorizontalWritingMode())
- backgroundRect = backgroundRect.transposedRect();
- backgroundRenderer->flipForWritingMode(backgroundRect);
-
- return backgroundRect;
+ return unscaledDocumentRect();
}
IntRect RenderView::documentRect() const
@@ -961,14 +925,7 @@ int RenderView::viewWidth(ScrollableArea::IncludeScrollbarsInRect scrollbarInclu
int RenderView::viewLogicalHeight(ScrollableArea::IncludeScrollbarsInRect scrollbarInclusion) const
{
- int height = style()->isHorizontalWritingMode() ? viewHeight(scrollbarInclusion) : viewWidth(scrollbarInclusion);
-
- if (hasColumns() && !style()->hasInlineColumnAxis()) {
- if (int pageLength = m_frameView->pagination().pageLength)
- height = pageLength;
- }
-
- return height;
+ return style()->isHorizontalWritingMode() ? viewHeight(scrollbarInclusion) : viewWidth(scrollbarInclusion);
}
float RenderView::zoomFactor() const
@@ -989,7 +946,7 @@ bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject* renderer) cons
{
RenderObject* o = renderer;
while (o) {
- if (o->hasColumns() || o->hasTransform() || o->hasReflection())
+ if (o->hasTransform() || o->hasReflection())
return true;
o = o->container();
}
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698