Move setting of some layout bits to RenderElement
https://bugs.webkit.org/show_bug.cgi?id=122256
Reviewed by Andreas Kling.
These bits never apply to RenderText nodes:
normalChildNeedsLayout
posChildNeedsLayout
needsSimplifiedNormalFlowLayout
normalChildNeedsLayout
positionedMovementLayout
The code for setting them can be moved to RenderElement.
Also separated the code paths for setting and clearing the bits and uninlined
everything that is not massively popular.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
index a5279d4..1b5b39b 100644
--- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -1273,7 +1273,7 @@
// determineStartPosition can change the fullLayout flag we have to do this here. Failure to call
// determineStartPosition first will break fast/repaint/line-flow-with-floats-9.html.
if (layoutState.isFullLayout() && hasInlineChild && !selfNeedsLayout()) {
- setNeedsLayout(true, MarkOnlyThis); // Mark as needing a full layout to force us to repaint.
+ setNeedsLayout(MarkOnlyThis); // Mark as needing a full layout to force us to repaint.
if (!view().doingFullRepaint() && hasLayer()) {
// Because we waited until we were already inside layout to discover
// that the block really needed a full layout, we missed our chance to repaint the layer
@@ -1874,7 +1874,7 @@
RenderBox* box = toRenderBox(o);
if (relayoutChildren || box->hasRelativeDimensions())
- o->setChildNeedsLayout(true, MarkOnlyThis);
+ box->setChildNeedsLayout(MarkOnlyThis);
// If relayoutChildren is set and the child has percentage padding or an embedded content box, we also need to invalidate the childs pref widths.
if (relayoutChildren && box->needsPreferredWidthsRecalculation())
@@ -1897,7 +1897,7 @@
toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.isFullLayout());
if (layoutState.isFullLayout() || o->selfNeedsLayout())
dirtyLineBoxesForRenderer(o, layoutState.isFullLayout());
- o->setNeedsLayout(false);
+ o->clearNeedsLayout();
}
}
@@ -3461,7 +3461,7 @@
RenderBox* o = &f->renderer();
setLogicalTopForChild(o, logicalTopForChild(o) + marginBeforeForChild(o) + paginationStrut);
if (o->isRenderBlock())
- toRenderBlock(o)->setChildNeedsLayout(true, MarkOnlyThis);
+ toRenderBlock(o)->setChildNeedsLayout(MarkOnlyThis);
o->layoutIfNeeded();
// Save the old logical top before calling removePlacedObject which will set
// isPlaced to false. Otherwise it will trigger an assert in logicalTopForFloat.
