| 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 cfde1c770390d00cb5a418ebb7f1d54fd22443fa..a486899cab22920c991a0145a0f3be1283775a5c 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| @@ -346,11 +346,11 @@ void LayoutGrid::layoutBlock(bool relayoutChildren)
|
| {
|
| ASSERT(needsLayout());
|
|
|
| - if (!relayoutChildren && simplifiedLayout())
|
| - return;
|
| -
|
| SubtreeLayoutScope layoutScope(*this);
|
|
|
| + if (!relayoutChildren && simplifiedLayout(&layoutScope))
|
| + return;
|
| +
|
| {
|
| // LayoutState needs this deliberate scope to pop before updating scroll information (which
|
| // may trigger relayout).
|
|
|