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

Unified Diff: Source/core/rendering/RenderObject.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/RenderObject.h ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index d6c298a73982a99d637007027bab4d7da285f2b1..a25d232b032e3fc6ab1687a9c5e25b3f926f1cae 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1644,12 +1644,6 @@ void RenderObject::computeRectForRepaint(const RenderLayerModelObject* repaintCo
return;
if (RenderObject* o = parent()) {
- if (o->isRenderBlockFlow()) {
- RenderBlock* cb = toRenderBlock(o);
- if (cb->hasColumns())
- cb->adjustRectForColumns(rect);
- }
-
if (o->hasOverflowClip()) {
RenderBox* boxParent = toRenderBox(o);
boxParent->applyCachedClipAndScrollOffsetForRepaint(rect);
@@ -2223,15 +2217,10 @@ void RenderObject::mapLocalToContainer(const RenderLayerModelObject* repaintCont
LayoutPoint centerPoint = roundedLayoutPoint(transformState.mappedPoint());
if (mode & ApplyContainerFlip && o->isBox()) {
if (o->style()->isFlippedBlocksWritingMode())
- transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint);
+ transformState.move(LayoutPoint() - centerPoint);
mode &= ~ApplyContainerFlip;
}
- LayoutSize columnOffset;
- o->adjustForColumns(columnOffset, roundedLayoutPoint(transformState.mappedPoint()));
- if (!columnOffset.isZero())
- transformState.move(columnOffset);
-
if (o->hasOverflowClip())
transformState.move(-toRenderBox(o)->scrolledContentOffset());
@@ -2251,7 +2240,7 @@ const RenderObject* RenderObject::pushMappingToContainer(const RenderLayerModelO
if (container->hasOverflowClip())
offset = -toRenderBox(container)->scrolledContentOffset();
- geometryMap.push(this, offset, hasColumns());
+ geometryMap.push(this, offset);
return container;
}
@@ -2321,13 +2310,11 @@ LayoutSize RenderObject::offsetFromContainer(RenderObject* o, const LayoutPoint&
LayoutSize offset;
- o->adjustForColumns(offset, point);
-
if (o->hasOverflowClip())
offset -= toRenderBox(o)->scrolledContentOffset();
if (offsetDependsOnPoint)
- *offsetDependsOnPoint = hasColumns() || o->isRenderFlowThread();
+ *offsetDependsOnPoint = o->isRenderFlowThread();
return offset;
}
@@ -2708,7 +2695,7 @@ void RenderObject::destroyAndCleanupAnonymousWrappers()
break;
// Render flow threads are tracked by the FlowThreadController, so we can't destroy them here.
// Column spans are tracked elsewhere.
- if (destroyRootParent->isRenderFlowThread() || destroyRootParent->isAnonymousColumnSpanBlock())
+ if (destroyRootParent->isRenderFlowThread())
break;
if (destroyRootParent->firstChild() != this || destroyRootParent->lastChild() != this)
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698