| Index: third_party/WebKit/Source/core/layout/LayoutObject.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| index c6139fb4569fa89407aca735a017eb237597364f..b55d4f535cbbb585d3f545849361424c7971d1c7 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| @@ -88,7 +88,6 @@ enum HitTestFilter {
|
| enum MarkingBehavior {
|
| MarkOnlyThis,
|
| MarkContainerChain,
|
| - MarkContainerChainInLayout,
|
| };
|
|
|
| enum MapCoordinatesMode {
|
| @@ -2013,8 +2012,8 @@ inline void LayoutObject::setNeedsLayout(LayoutInvalidationReasonForTracing reas
|
| TRACE_EVENT_SCOPE_THREAD,
|
| "data",
|
| InspectorLayoutInvalidationTrackingEvent::data(this, reason));
|
| - if (markParents != MarkOnlyThis && (!layouter || layouter->root() != this))
|
| - markContainerChainForLayout(!layouter && markParents == MarkContainerChain, layouter);
|
| + if (markParents == MarkContainerChain && (!layouter || layouter->root() != this))
|
| + markContainerChainForLayout(!layouter, layouter);
|
| }
|
| }
|
|
|
| @@ -2050,8 +2049,8 @@ inline void LayoutObject::setChildNeedsLayout(MarkingBehavior markParents, Subtr
|
| bool alreadyNeededLayout = normalChildNeedsLayout();
|
| setNormalChildNeedsLayout(true);
|
| // FIXME: Replace MarkOnlyThis with the SubtreeLayoutScope code path and remove the MarkingBehavior argument entirely.
|
| - if (!alreadyNeededLayout && markParents != MarkOnlyThis && (!layouter || layouter->root() != this))
|
| - markContainerChainForLayout(!layouter && markParents == MarkContainerChain, layouter);
|
| + if (!alreadyNeededLayout && markParents == MarkContainerChain && (!layouter || layouter->root() != this))
|
| + markContainerChainForLayout(!layouter, layouter);
|
| }
|
|
|
| inline void LayoutObject::setNeedsPositionedMovementLayout()
|
|
|