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

Unified Diff: Source/core/rendering/RenderInline.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/RenderGeometryMap.cpp ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderInline.cpp
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
index 280a5a89f94ad814b2969eb38bd2fffb49cd4184..8f0f4dde2fd607b942e9c793c3749d2bb120c6e2 100644
--- a/Source/core/rendering/RenderInline.cpp
+++ b/Source/core/rendering/RenderInline.cpp
@@ -1024,9 +1024,6 @@ LayoutRect RenderInline::clippedOverflowRectForRepaint(const RenderLayerModelObj
if (hitRepaintContainer || !cb)
return repaintRect;
- if (cb->hasColumns())
- cb->adjustRectForColumns(repaintRect);
-
if (cb->hasOverflowClip())
cb->applyCachedClipAndScrollOffsetForRepaint(repaintRect);
@@ -1080,16 +1077,6 @@ void RenderInline::computeRectForRepaint(const RenderLayerModelObject* repaintCo
LayoutPoint topLeft = rect.location();
- if (o->isRenderBlockFlow() && !style()->hasOutOfFlowPosition()) {
- RenderBlock* cb = toRenderBlock(o);
- if (cb->hasColumns()) {
- LayoutRect repaintRect(topLeft, rect.size());
- cb->adjustRectForColumns(repaintRect);
- topLeft = repaintRect.location();
- rect = repaintRect;
- }
- }
-
if (style()->hasInFlowPosition() && layer()) {
// Apply the in-flow position offset when invalidating a rectangle. The layer
// is translated, but the render box isn't, so we need to do this to get the
@@ -1126,14 +1113,11 @@ LayoutSize RenderInline::offsetFromContainer(RenderObject* container, const Layo
if (isInFlowPositioned())
offset += offsetForInFlowPosition();
- container->adjustForColumns(offset, point);
-
if (container->hasOverflowClip())
offset -= toRenderBox(container)->scrolledContentOffset();
if (offsetDependsOnPoint) {
- *offsetDependsOnPoint = container->hasColumns()
- || (container->isBox() && container->style()->isFlippedBlocksWritingMode())
+ *offsetDependsOnPoint = (container->isBox() && container->style()->isFlippedBlocksWritingMode())
|| container->isRenderFlowThread();
}
@@ -1164,7 +1148,7 @@ void RenderInline::mapLocalToContainer(const RenderLayerModelObject* repaintCont
if (mode & ApplyContainerFlip && o->isBox()) {
if (o->style()->isFlippedBlocksWritingMode()) {
IntPoint centerPoint = roundedIntPoint(transformState.mappedPoint());
- transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(centerPoint) - centerPoint);
+ transformState.move(LayoutPoint() - centerPoint);
}
mode &= ~ApplyContainerFlip;
}
« no previous file with comments | « Source/core/rendering/RenderGeometryMap.cpp ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698