| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 726bfa33117807c48f41bb8dd859f5329bec1254..18730202fee9a678d335547e2790b5480c8f19cb 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -2150,7 +2150,8 @@ static bool prepareOrthogonalWritingModeRootForLayout(LayoutObject& root) {
|
| DCHECK(root.isBox() && toLayoutBox(root).isOrthogonalWritingModeRoot());
|
| if (!root.needsLayout() || root.isOutOfFlowPositioned() ||
|
| root.isColumnSpanAll() ||
|
| - !root.styleRef().logicalHeight().isIntrinsicOrAuto())
|
| + !root.styleRef().logicalHeight().isIntrinsicOrAuto() ||
|
| + toLayoutBox(root).isGridItem())
|
| return false;
|
|
|
| removeFloatingObjectsForSubtreeRoot(root);
|
|
|