| Index: third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| index d6bc5e3f8824bed3265ef62a3cc9ea639b6292f9..4222da2771d4df68134667b617c2440d275d36f7 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
|
| @@ -237,10 +237,12 @@ bool NGBlockNode::CanUseNewLayout() {
|
| }
|
|
|
| bool NGBlockNode::HasInlineChildren() {
|
| - if (!layout_box_)
|
| + if (!layout_box_ || !layout_box_->isLayoutBlockFlow())
|
| return false;
|
|
|
| const LayoutBlockFlow* block_flow = toLayoutBlockFlow(layout_box_);
|
| + if (!block_flow->childrenInline())
|
| + return false;
|
| LayoutObject* child = block_flow->firstChild();
|
| while (child) {
|
| if (child->isInline())
|
|
|