| Index: sky/engine/core/rendering/RenderBlock.cpp
|
| diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
|
| index 91f8249c1dd65db0672efb683e62ee1ca15771ea..c9fac7381efcf99232c086f01c2cbcf0d1a80674 100644
|
| --- a/sky/engine/core/rendering/RenderBlock.cpp
|
| +++ b/sky/engine/core/rendering/RenderBlock.cpp
|
| @@ -220,26 +220,6 @@ void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
|
| m_hasBorderOrPaddingLogicalWidthChanged = oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalWidthChanged(oldStyle, newStyle);
|
| }
|
|
|
| -void RenderBlock::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
|
| -{
|
| - // Note, we don't want to early out here using shouldCheckForInvalidationAfterLayout as
|
| - // we have to make sure we go through any positioned objects as they won't be seen in
|
| - // the normal tree walk.
|
| -
|
| - RenderBox::invalidateTreeIfNeeded(paintInvalidationState);
|
| -
|
| - // Take care of positioned objects. This is required as PaintInvalidationState keeps a single clip rect.
|
| - if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects()) {
|
| - TrackedRendererListHashSet::iterator end = positionedObjects->end();
|
| - const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCompositedContainerForSpecialAncestors(&paintInvalidationState.paintInvalidationContainer());
|
| - PaintInvalidationState childPaintInvalidationState(paintInvalidationState, *this, newPaintInvalidationContainer);
|
| - for (TrackedRendererListHashSet::iterator it = positionedObjects->begin(); it != end; ++it) {
|
| - RenderBox* box = *it;
|
| - box->invalidateTreeIfNeeded(childPaintInvalidationState);
|
| - }
|
| - }
|
| -}
|
| -
|
| void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild)
|
| {
|
| if (beforeChild && beforeChild->parent() != this) {
|
| @@ -506,9 +486,6 @@ void RenderBlock::layoutPositionedObjects(bool relayoutChildren, PositionedLayou
|
| for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin(); it != end; ++it) {
|
| r = *it;
|
|
|
| - // FIXME: this should only be set from clearNeedsLayout crbug.com/361250
|
| - r->setLayoutDidGetCalled(true);
|
| -
|
| SubtreeLayoutScope layoutScope(*r);
|
|
|
| // When a non-positioned block element moves, it may have positioned children that are implicitly positioned relative to the
|
|
|