| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index cd15f82298d0f43e0555e618307afe4122c118c4..c5828761114a9d6793f9a4f4be9073249d26e036 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -1632,7 +1632,8 @@ void RenderBlock::simplifiedNormalFlowLayout()
|
|
|
| bool RenderBlock::simplifiedLayout()
|
| {
|
| - if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normalChildNeedsLayout() || selfNeedsLayout())
|
| + if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout() && !needsResizeLayout())
|
| + || normalChildNeedsLayout() || selfNeedsLayout())
|
| return false;
|
|
|
|
|
| @@ -1643,6 +1644,9 @@ bool RenderBlock::simplifiedLayout()
|
| if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
|
| return false;
|
|
|
| + if (needsResizeLayout() && !tryLayoutDoingResizeOnly())
|
| + return false;
|
| +
|
| FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
|
|
|
| // Lay out positioned descendants or objects that just need to recompute overflow.
|
| @@ -3815,7 +3819,7 @@ bool RenderBlock::hasLineIfEmpty() const
|
| if (node()->isRootEditableElement())
|
| return true;
|
|
|
| - if (node()->isShadowRoot() && isHTMLInputElement(*toShadowRoot(node())->host()))
|
| + if (node()->isShadowRoot() && toShadowRoot(node())->host()->hasTagName(inputTag))
|
| return true;
|
|
|
| return false;
|
|
|