Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderTextControlSingleLine.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp b/src/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
index 2745ff1..f22ca76 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
@@ -115,6 +115,9 @@ void RenderTextControlSingleLine::layout()
     if (innerTextRenderer && !innerTextRenderer->style()->logicalHeight().isAuto()) {
         innerTextRenderer->style()->setLogicalHeight(Length(Auto));
         layoutScope.setNeedsLayout(innerTextRenderer);
+        HTMLElement* placeholderElement = inputElement()->placeholderElement();
+        if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0)
+            layoutScope.setNeedsLayout(placeholderBox);
     }
     if (viewPortRenderer && !viewPortRenderer->style()->logicalHeight().isAuto()) {
         viewPortRenderer->style()->setLogicalHeight(Length(Auto));