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

Unified Diff: Source/core/rendering/RenderBox.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/RenderBox.h ('k') | Source/core/rendering/RenderBoxModelObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 6dab61653e325531de3df6e28b81637c559736d9..fa846a9f26b031eb1857024f7b5070febbe360da 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -1993,22 +1993,8 @@ LayoutSize RenderBox::offsetFromContainer(RenderObject* o, const LayoutPoint& po
if (isInFlowPositioned())
offset += offsetForInFlowPosition();
- if (!isInline() || isReplaced()) {
- if (!style()->hasOutOfFlowPosition() && o->hasColumns()) {
- RenderBlock* block = toRenderBlock(o);
- LayoutRect columnRect(frameRect());
- block->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
- offset += toSize(columnRect.location());
- LayoutPoint columnPoint = block->flipForWritingModeIncludingColumns(point + offset);
- offset = toLayoutSize(block->flipForWritingModeIncludingColumns(toLayoutPoint(offset)));
- o->adjustForColumns(offset, columnPoint);
- offset = block->flipForWritingMode(offset);
-
- if (offsetDependsOnPoint)
- *offsetDependsOnPoint = true;
- } else
- offset += topLeftLocationOffset();
- }
+ if (!isInline() || isReplaced())
+ offset += topLeftLocationOffset();
if (o->hasOverflowClip())
offset -= toRenderBox(o)->scrolledContentOffset();
@@ -2180,9 +2166,8 @@ void RenderBox::computeRectForRepaint(const RenderLayerModelObject* repaintConta
topLeft += layer()->offsetForInFlowPosition();
}
- if (position != AbsolutePosition && position != FixedPosition && o->hasColumns() && o->isRenderBlockFlow()) {
+ if (position != AbsolutePosition && position != FixedPosition && o->isRenderBlockFlow()) {
LayoutRect repaintRect(topLeft, rect.size());
- toRenderBlock(o)->adjustRectForColumns(repaintRect);
topLeft = repaintRect.location();
rect = repaintRect;
}
@@ -4467,13 +4452,6 @@ void RenderBox::addLayoutOverflow(const LayoutRect& rect)
hasTopOverflow = true;
}
- if (hasColumns() && style()->columnProgression() == ReverseColumnProgression) {
- if (isHorizontalWritingMode() ^ !style()->hasInlineColumnAxis())
- hasLeftOverflow = !hasLeftOverflow;
- else
- hasTopOverflow = !hasTopOverflow;
- }
-
if (!hasTopOverflow)
overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y()));
else
@@ -4802,13 +4780,6 @@ LayoutPoint RenderBox::flipForWritingMode(const LayoutPoint& position) const
return isHorizontalWritingMode() ? LayoutPoint(position.x(), height() - position.y()) : LayoutPoint(width() - position.x(), position.y());
}
-LayoutPoint RenderBox::flipForWritingModeIncludingColumns(const LayoutPoint& point) const
-{
- if (!hasColumns() || !style()->isFlippedBlocksWritingMode())
- return flipForWritingMode(point);
- return toRenderBlock(this)->flipForWritingModeIncludingColumns(point);
-}
-
LayoutSize RenderBox::flipForWritingMode(const LayoutSize& offset) const
{
if (!style()->isFlippedBlocksWritingMode())
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698