| Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| index c289e73157282f2d53cb848b2e832d14ca529527..b8c1e85541a30d649f3b8cad64ae8fa5922cbe57 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| @@ -347,6 +347,8 @@ void LayoutGrid::layoutBlock(bool relayoutChildren)
|
| if (!relayoutChildren && simplifiedLayout())
|
| return;
|
|
|
| + SubtreeLayoutScope layoutScope(*this);
|
| +
|
| {
|
| // LayoutState needs this deliberate scope to pop before updating scroll information (which
|
| // may trigger relayout).
|
| @@ -357,7 +359,7 @@ void LayoutGrid::layoutBlock(bool relayoutChildren)
|
| updateLogicalWidth();
|
| bool logicalHeightWasIndefinite = computeContentLogicalHeight(MainOrPreferredSize, style()->logicalHeight(), LayoutUnit(-1)) == LayoutUnit(-1);
|
|
|
| - TextAutosizer::LayoutScope textAutosizerLayoutScope(this);
|
| + TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope);
|
|
|
| placeItemsOnGrid();
|
|
|
|
|