Chromium Code Reviews| Index: Source/core/layout/LayoutTextControlSingleLine.cpp |
| diff --git a/Source/core/layout/LayoutTextControlSingleLine.cpp b/Source/core/layout/LayoutTextControlSingleLine.cpp |
| index d3dbf3ca121cc03bd9f1c982de55cbc3710a8045..ec689092268b78851343cbafda214320622df24f 100644 |
| --- a/Source/core/layout/LayoutTextControlSingleLine.cpp |
| +++ b/Source/core/layout/LayoutTextControlSingleLine.cpp |
| @@ -157,6 +157,11 @@ void LayoutTextControlSingleLine::layout() |
| } |
| } |
| + // Make sure the inner editor renderer is relaid out here. This prevents any possibility |
| + // of bad placement below as we read stale values. |
| + if (!container && innerEditorRenderer && innerEditorRenderer->size().height() != contentLogicalHeight()) |
|
dsinclair
2015/02/23 21:00:43
We don't care about width() != contentLogicalWidth
leviw_travelin_and_unemployed
2015/02/23 21:02:00
The conditions of this "if" are a little weird, an
Julien - ping for review
2015/02/24 01:15:35
Spot on. I was trying to be smart about when to re
|
| + layoutScope.setNeedsLayout(innerEditorRenderer); |
| + |
| // If we need another layout pass, we have changed one of children's height so we need to relayout them. |
| if (needsLayout()) |
| RenderBlockFlow::layoutBlock(true); |