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

Unified Diff: Source/core/layout/LayoutBlock.cpp

Issue 1343163005: Remove special pagination code for floats and out-of-flow objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | « no previous file | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlock.cpp
diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp
index f1a16e36f0ccc7825328e57370ca33ba0e78a378..95658e3b4527fc6f429409f16a967be97a54f3f6 100644
--- a/Source/core/layout/LayoutBlock.cpp
+++ b/Source/core/layout/LayoutBlock.cpp
@@ -1261,28 +1261,12 @@ void LayoutBlock::layoutPositionedObjects(bool relayoutChildren, PositionedLayou
if (!positionedObject->needsLayout())
positionedObject->markForPaginationRelayoutIfNeeded(layoutScope);
- // If we are paginated or in a line grid, go ahead and compute a vertical position for our object now.
- // If it's wrong we'll lay out again.
- LayoutUnit oldLogicalTop = 0;
- bool needsBlockDirectionLocationSetBeforeLayout = positionedObject->needsLayout() && view()->layoutState()->needsBlockDirectionLocationSetBeforeLayout();
- if (needsBlockDirectionLocationSetBeforeLayout) {
- if (isHorizontalWritingMode() == positionedObject->isHorizontalWritingMode())
- positionedObject->updateLogicalHeight();
- else
- positionedObject->updateLogicalWidth();
- oldLogicalTop = logicalTopForChild(*positionedObject);
- }
-
// FIXME: We should be able to do a r->setNeedsPositionedMovementLayout() here instead of a full layout. Need
// to investigate why it does not trigger the correct invalidations in that case. crbug.com/350756
if (info == ForcedLayoutAfterContainingBlockMoved)
positionedObject->setNeedsLayout(LayoutInvalidationReason::AncestorMoved, MarkOnlyThis);
positionedObject->layoutIfNeeded();
-
- // Lay out again if our estimate was wrong.
- if (needsBlockDirectionLocationSetBeforeLayout && logicalTopForChild(*positionedObject) != oldLogicalTop)
- positionedObject->forceChildLayout();
}
}
« no previous file with comments | « no previous file | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698