Ignore:
Timestamp:
Oct 2, 2013, 10:59:22 PM (12 years ago)
Author:
[email protected]
Message:

Unreviewed, rolling out r156816.
​http://trac.webkit.org/changeset/156816
​https://bugs.webkit.org/show_bug.cgi?id=122259

broke 8 tests (Requested by kling on #webkit).

  • html/HTMLFrameSetElement.cpp:

(WebCore::HTMLFrameSetElement::willRecalcStyle):

  • html/RangeInputType.cpp:

(WebCore::RangeInputType::listAttributeTargetChanged):

  • html/shadow/SliderThumbElement.cpp:

(WebCore::RenderSliderContainer::layout):
(WebCore::SliderThumbElement::setPositionFromValue):
(WebCore::SliderThumbElement::setPositionFromPoint):
(WebCore::SliderThumbElement::stopDragging):

  • page/FrameView.cpp:

(WebCore::FrameView::setHeaderHeight):
(WebCore::FrameView::setFooterHeight):
(WebCore::FrameView::layout):
(WebCore::FrameView::setViewportConstrainedObjectsNeedLayout):
(WebCore::FrameView::scheduleRelayout):
(WebCore::FrameView::setNeedsLayout):

  • page/Page.cpp:

(WebCore::Page::setPageScaleFactor):

  • rendering/FlowThreadController.h:

(WebCore::FlowThreadController::setIsRenderNamedFlowThreadOrderDirty):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::relayoutShapeDescendantIfMoved):
(WebCore::RenderBlock::markShapeInsideDescendantsForLayout):
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::updateBlockChildDirtyBitsBeforeLayout):
(WebCore::RenderBlock::dirtyForLayoutFromPercentageHeightDescendants):
(WebCore::RenderBlock::simplifiedNormalFlowLayout):
(WebCore::RenderBlock::simplifiedLayout):
(WebCore::RenderBlock::markFixedPositionObjectForLayoutIfNeeded):
(WebCore::RenderBlock::layoutPositionedObjects):
(WebCore::RenderBlock::markPositionedObjectsForLayout):
(WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
(WebCore::RenderBlock::removePositionedObjects):
(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::positionNewFloats):
(WebCore::RenderBlock::markAllDescendantsWithFloatsForLayout):
(WebCore::RenderBlock::getClearDelta):

  • rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::layoutBlockChild):
(WebCore::RenderBlockFlow::adjustPositionedBlock):
(WebCore::RenderBlockFlow::adjustBlockChildForPagination):

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutRunsAndFloats):
(WebCore::RenderBlockFlow::layoutInlineChildren):
(WebCore::RenderBlock::positionNewFloatOnLine):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::styleWillChange):
(WebCore::RenderBox::styleDidChange):
(WebCore::RenderBox::layout):
(WebCore::RenderBox::positionLineBox):

  • rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
(WebCore::gatherFlexChildrenInfo):
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
(WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
(WebCore::RenderDeprecatedFlexibleBox::clearLineClamp):

  • rendering/RenderElement.cpp:

(WebCore::RenderElement::insertChildInternal):

  • rendering/RenderElement.h:

(WebCore::RenderElement::setAncestorLineBoxDirty):
(WebCore::RenderObject::setNeedsLayout):

  • rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::layout):

  • rendering/RenderFieldset.cpp:

(WebCore::RenderFieldset::layoutSpecialExcludedChild):

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::styleDidChange):
(WebCore::RenderFlexibleBox::layoutBlock):
(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
(WebCore::RenderFlexibleBox::prepareChildForPositionedLayout):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
(WebCore::RenderFlexibleBox::applyStretchAlignmentToChild):

  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::invalidateRegions):
(WebCore::RenderFlowThread::markAutoLogicalHeightRegionsForLayout):

  • rendering/RenderFrameBase.cpp:

(WebCore::RenderFrameBase::layoutWithFlattening):

  • rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::layout):
(WebCore::RenderFrameSet::positionFrames):
(WebCore::RenderFrameSet::positionFramesWithFlattening):
(WebCore::RenderFrameSet::continueResizing):

  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutBlock):
(WebCore::RenderGrid::logicalContentHeightForChild):
(WebCore::RenderGrid::layoutGridItems):

  • rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::canvasSizeChanged):

  • rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::layout):

  • rendering/RenderImage.cpp:

(WebCore::RenderImage::imageDimensionsChanged):

  • rendering/RenderInline.cpp:

(WebCore::RenderInline::styleDidChange):

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateScrollbarsAfterLayout):

  • rendering/RenderLayerModelObject.cpp:

(WebCore::RenderLayerModelObject::styleDidChange):

  • rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::layout):

  • rendering/RenderMarquee.cpp:

(WebCore::RenderMarquee::updateMarqueeStyle):

  • rendering/RenderMedia.cpp:

(WebCore::RenderMedia::layout):

  • rendering/RenderMultiColumnBlock.cpp:

(WebCore::RenderMultiColumnBlock::relayoutForPagination):
(WebCore::RenderMultiColumnBlock::layoutSpecialExcludedChild):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::markContainingBlocksForLayout):
(WebCore::RenderObject::layout):

  • rendering/RenderObject.h:

(WebCore::RenderObject::setNeedsLayoutAndPrefWidthsRecalc):
(WebCore::RenderObject::setNeedsPositionedMovementLayout):
(WebCore::RenderObject::setNormalChildNeedsLayout):
(WebCore::RenderObject::setPosChildNeedsLayout):
(WebCore::RenderObject::setNeedsSimplifiedNormalFlowLayout):
(WebCore::RenderObject::setChildNeedsLayout):

  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::layout):

  • rendering/RenderReplica.cpp:

(WebCore::RenderReplica::layout):

  • rendering/RenderRubyRun.cpp:

(WebCore::RenderRubyRun::layoutSpecialExcludedChild):

  • rendering/RenderScrollbar.cpp:

(WebCore::RenderScrollbar::updateScrollbarParts):

  • rendering/RenderScrollbarPart.cpp:

(WebCore::RenderScrollbarPart::layout):

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::layout):

  • rendering/RenderTable.h:

(WebCore::RenderTable::setNeedsSectionRecalc):

  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::computeIntrinsicPadding):
(WebCore::RenderTableCell::setCellLogicalWidth):
(WebCore::RenderTableCell::layout):

  • rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::styleDidChange):
(WebCore::RenderTableRow::layout):

  • rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::calcRowLogicalHeight):
(WebCore::RenderTableSection::layout):
(WebCore::RenderTableSection::layoutRows):
(WebCore::RenderTableSection::recalcCells):

  • rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::layoutSpecialExcludedChild):

  • rendering/RenderTextControlSingleLine.cpp:

(WebCore::setNeedsLayoutOnAncestors):
(WebCore::RenderTextControlSingleLine::layout):
(WebCore::RenderTextControlSingleLine::styleDidChange):

  • rendering/RenderVideo.cpp:

(WebCore::RenderVideo::updateIntrinsicSize):

  • rendering/RenderView.cpp:

(WebCore::RenderView::layout):

  • rendering/RenderWidget.cpp:

(WebCore::RenderWidget::layout):

  • rendering/mathml/RenderMathMLBlock.cpp:

(WebCore::RenderMathMLBlock::computeChildrenPreferredLogicalHeights):

  • rendering/mathml/RenderMathMLScripts.cpp:

(WebCore::RenderMathMLScripts::layout):

  • rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::layout):

  • rendering/svg/RenderSVGGradientStop.cpp:

(WebCore::RenderSVGGradientStop::layout):

  • rendering/svg/RenderSVGHiddenContainer.cpp:

(WebCore::RenderSVGHiddenContainer::layout):

  • rendering/svg/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::layout):

  • rendering/svg/RenderSVGResource.cpp:

(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):

  • rendering/svg/RenderSVGResourceContainer.cpp:

(WebCore::RenderSVGResourceContainer::registerResource):

  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::layout):

  • rendering/svg/RenderSVGShape.cpp:

(WebCore::RenderSVGShape::layout):

  • rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::layout):

  • rendering/svg/SVGRenderSupport.cpp:

(WebCore::SVGRenderSupport::layoutChildren):

  • svg/SVGClipPathElement.cpp:

(WebCore::SVGClipPathElement::svgAttributeChanged):
(WebCore::SVGClipPathElement::childrenChanged):

  • svg/SVGFilterElement.cpp:

(WebCore::SVGFilterElement::setFilterRes):
(WebCore::SVGFilterElement::svgAttributeChanged):
(WebCore::SVGFilterElement::childrenChanged):

  • svg/SVGGradientElement.cpp:

(WebCore::SVGGradientElement::svgAttributeChanged):
(WebCore::SVGGradientElement::childrenChanged):

  • svg/SVGLinearGradientElement.cpp:

(WebCore::SVGLinearGradientElement::svgAttributeChanged):

  • svg/SVGMarkerElement.cpp:

(WebCore::SVGMarkerElement::svgAttributeChanged):
(WebCore::SVGMarkerElement::childrenChanged):

  • svg/SVGMaskElement.cpp:

(WebCore::SVGMaskElement::svgAttributeChanged):
(WebCore::SVGMaskElement::childrenChanged):

  • svg/SVGPatternElement.cpp:

(WebCore::SVGPatternElement::svgAttributeChanged):
(WebCore::SVGPatternElement::childrenChanged):

  • svg/SVGRadialGradientElement.cpp:

(WebCore::SVGRadialGradientElement::svgAttributeChanged):

  • svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::updateCurrentTranslate):

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r156816 r156822  
    14011401    // Propagate layout markers only up to the child, as we are still in the middle
    14021402    // of a layout pass
    1403     child->setNormalChildNeedsLayoutBit(true);
     1403    child->setNormalChildNeedsLayout(true);
    14041404    child->markShapeInsideDescendantsForLayout();
    14051405    child->layoutIfNeeded();
    … …  
    14731473        return;
    14741474    if (childrenInline()) {
    1475         setNeedsLayout();
     1475        setNeedsLayout(true);
    14761476        return;
    14771477    }
    … …  
    15931593{
    15941594    ASSERT_NOT_REACHED();
    1595     clearNeedsLayout();
     1595    setNeedsLayout(false);
    15961596}
    15971597
    … …  
    19411941    // an auto value. Add a method to determine this, so that we can avoid the relayout.
    19421942    if (relayoutChildren || (child->hasRelativeLogicalHeight() && !isRenderView()) || child->hasViewportPercentageLogicalHeight())
    1943         child->setChildNeedsLayout(MarkOnlyThis);
     1943        child->setChildNeedsLayout(true, MarkOnlyThis);
    19441944
    19451945    // If relayoutChildren is set and the child has percentage padding or an embedded content box, we also need to invalidate the childs pref widths.
    … …  
    19631963            if (box->normalChildNeedsLayout())
    19641964                break;
    1965             box->setChildNeedsLayout(MarkOnlyThis);
     1965            box->setChildNeedsLayout(true, MarkOnlyThis);
    19661966           
    19671967            // If the width of an image is affected by the height of a child (e.g., an image with an aspect ratio),
    … …  
    19901990                    lineBoxes.add(&toRenderBox(o)->inlineBoxWrapper()->root());
    19911991            } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInline()))
    1992                 o->clearNeedsLayout();
     1992                o->setNeedsLayout(false);
    19931993        }
    19941994
    … …  
    20522052    updateScrollInfoAfterLayout();
    20532053
    2054     clearNeedsLayout();
     2054    setNeedsLayout(false);
    20552055    return true;
    20562056}
    … …  
    20782078        LayoutUnit newLeft = computedValues.m_position;
    20792079        if (newLeft != box->logicalLeft())
    2080             box->setChildNeedsLayout(MarkOnlyThis);
     2080            child->setChildNeedsLayout(true, MarkOnlyThis);
    20812081    } else if (hasStaticBlockPosition) {
    20822082        LayoutUnit oldTop = box->logicalTop();
    20832083        box->updateLogicalHeight();
    20842084        if (box->logicalTop() != oldTop)
    2085             box->setChildNeedsLayout(MarkOnlyThis);
     2085            child->setChildNeedsLayout(true, MarkOnlyThis);
    20862086    }
    20872087}
    … …  
    21172117        // positioned explicitly) this should not incur a performance penalty.
    21182118        if (relayoutChildren || (r->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && r->parent() != this))
    2119             r->setChildNeedsLayout(MarkOnlyThis);
     2119            r->setChildNeedsLayout(true, MarkOnlyThis);
    21202120           
    21212121        // If relayoutChildren is set and the child has percentage padding or an embedded content box, we also need to invalidate the childs pref widths.
    … …  
    21292129        // and we hit the available width constraint, the layoutIfNeeded() will catch it and do a full layout.
    21302130        if (r->needsPositionedMovementLayoutOnly() && r->tryLayoutDoingPositionedMovementOnly())
    2131             r->clearNeedsLayout();
     2131            r->setNeedsLayout(false);
    21322132           
    21332133        // If we are paginated or in a line grid, go ahead and compute a vertical position for our object now.
    … …  
    21472147        // Lay out again if our estimate was wrong.
    21482148        if (needsBlockDirectionLocationSetBeforeLayout && logicalTopForChild(r) != oldLogicalTop) {
    2149             r->setChildNeedsLayout(MarkOnlyThis);
     2149            r->setChildNeedsLayout(true, MarkOnlyThis);
    21502150            r->layoutIfNeeded();
    21512151        }
    21522152
    21532153        if (updateRegionRangeForBoxChild(r)) {
    2154             r->setNeedsLayout(MarkOnlyThis);
     2154            r->setNeedsLayout(true, MarkOnlyThis);
    21552155            r->layoutIfNeeded();
    21562156        }
    … …  
    21692169        for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin(); it != end; ++it) {
    21702170            r = *it;
    2171             r->setChildNeedsLayout();
     2171            r->setChildNeedsLayout(true);
    21722172        }
    21732173    }
    … …  
    21812181
    21822182    if (view().layoutState()->pageLogicalHeightChanged() || (view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(this, logicalTop()) != pageLogicalOffset()))
    2183         setChildNeedsLayout(MarkOnlyThis);
     2183        setChildNeedsLayout(true, MarkOnlyThis);
    21842184}
    21852185
    … …  
    32393239        if (!o || r->isDescendantOf(o)) {
    32403240            if (containingBlockState == NewContainingBlock)
    3241                 r->setChildNeedsLayout(MarkOnlyThis);
     3241                r->setChildNeedsLayout(true, MarkOnlyThis);
    32423242           
    32433243            // It is parent blocks job to add positioned child to positioned objects list of its containing block
    32443244            // Parent layout needs to be invalidated to ensure this happens.
    3245             RenderElement* p = r->parent();
     3245            RenderObject* p = r->parent();
    32463246            while (p && !p->isRenderBlock())
    32473247                p = p->parent();
    32483248            if (p)
    3249                 p->setChildNeedsLayout();
     3249                p->setChildNeedsLayout(true);
    32503250           
    32513251            deadObjects.append(r);
    … …  
    32883288    bool isChildRenderBlock = o->isRenderBlock();
    32893289    if (isChildRenderBlock && !o->needsLayout() && view().layoutState()->pageLogicalHeightChanged())
    3290         o->setChildNeedsLayout(MarkOnlyThis);
     3290        o->setChildNeedsLayout(true, MarkOnlyThis);
    32913291           
    32923292    bool needsBlockDirectionLocationSetBeforeLayout = isChildRenderBlock && view().layoutState()->needsBlockDirectionLocationSetBeforeLayout();
    … …  
    35243524       
    35253525                if (childBlock)
    3526                     childBlock->setChildNeedsLayout(MarkOnlyThis);
     3526                    childBlock->setChildNeedsLayout(true, MarkOnlyThis);
    35273527                childBox->layoutIfNeeded();
    35283528            }
    35293529
    35303530            if (updateRegionRangeForBoxChild(childBox)) {
    3531                 childBox->setNeedsLayout(MarkOnlyThis);
     3531                childBox->setNeedsLayout(true, MarkOnlyThis);
    35323532                childBox->layoutIfNeeded();
    35333533            }
    … …  
    39323932
    39333933    MarkingBehavior markParents = inLayout ? MarkOnlyThis : MarkContainingBlockChain;
    3934     setChildNeedsLayout(markParents);
     3934    setChildNeedsLayout(true, markParents);
    39353935 
    39363936    if (floatToRemove)
    … …  
    40304030                // from previous siblings when negative margins exist on a child (see the addOverhangingFloats call at the end of collapseMargins).
    40314031                if (childLogicalWidthAtOldLogicalTopOffset != childLogicalWidthAtNewLogicalTopOffset)
    4032                     child->setChildNeedsLayout(MarkOnlyThis);
     4032                    child->setChildNeedsLayout(true, MarkOnlyThis);
    40334033                return newLogicalTop - logicalTop;
    40344034            }
Note: See TracChangeset for help on using the changeset viewer.