Index: Source/core/rendering/RenderTextControlSingleLine.cpp |
diff --git a/Source/core/rendering/RenderTextControlSingleLine.cpp b/Source/core/rendering/RenderTextControlSingleLine.cpp |
index 8d2c0453ee84921291a6775c16ee1eaa2e030c39..42cf41ab4825afef65cd29a3e7a18965fed1c8ac 100644 |
--- a/Source/core/rendering/RenderTextControlSingleLine.cpp |
+++ b/Source/core/rendering/RenderTextControlSingleLine.cpp |
@@ -109,8 +109,9 @@ void RenderTextControlSingleLine::layout() |
RenderBox* viewPortRenderer = editingViewPortElement() ? editingViewPortElement()->renderBox() : 0; |
// To ensure consistency between layouts, we need to reset any conditionally overriden height. |
- if (innerEditorRenderer && !innerEditorRenderer->style()->logicalHeight().isAuto()) { |
- innerEditorRenderer->style()->setLogicalHeight(Length(Auto)); |
+ if (innerEditorRenderer) { |
Julien - ping for review
2014/11/11 16:57:58
This will be forcing a relayout of the innerEditor
pals
2014/11/12 13:29:08
I have moved to a flag which is set when center th
|
+ if (!innerEditorRenderer->style()->logicalHeight().isAuto()) |
+ innerEditorRenderer->style()->setLogicalHeight(Length(Auto)); |
layoutScope.setNeedsLayout(innerEditorRenderer); |
HTMLElement* placeholderElement = inputElement()->placeholderElement(); |
if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0) |