Merge 93802

Source/WebCore/rendering/RenderTextControl.cpp

Index: Source/WebCore/rendering/RenderTextControl.cpp
===================================================================
--- Source/WebCore/rendering/RenderTextControl.cpp	(revision 93984)
+++ Source/WebCore/rendering/RenderTextControl.cpp	(working copy)
@@ -430,8 +430,12 @@
     RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
     if (!placeholderRenderer)
         return 0;
-    if (relayoutChildren)
-        placeholderRenderer->setNeedsLayout(true);
+    if (relayoutChildren) {
+        // The markParents arguments should be false because this function is
+        // called from layout() of the parent and the placeholder layout doesn't
+        // affect the parent layout.
+        placeholderRenderer->setChildNeedsLayout(true, false);
+    }
     return placeholderRenderer;
 }