Replace HTMLTextFormControlElement::fixPlaceholderRenderer with an override of RenderTextControl::a…

Source/core/rendering/RenderTextControl.cpp

Index: Source/core/rendering/RenderTextControl.cpp
diff --git a/Source/core/rendering/RenderTextControl.cpp b/Source/core/rendering/RenderTextControl.cpp
index a14e09923828b8c06a3d4900d2ca41fb5895dfb0..cd19e159038ea8cb37ebae4eff385e38fe312a33 100644
--- a/Source/core/rendering/RenderTextControl.cpp
+++ b/Source/core/rendering/RenderTextControl.cpp
@@ -52,6 +52,17 @@ HTMLElement* RenderTextControl::innerTextElement() const
     return textFormControlElement()->innerTextElement();
 }
 
+void RenderTextControl::addChild(RenderObject* newChild, RenderObject* beforeChild)
+{
+    // FIXME: This is a terrible hack to get the caret over the placeholder text since it'll
+    // make us paint the placeholder first. (See https://trac.webkit.org/changeset/118733)
+    Node* node = newChild->node();
+    if (node && node->isElementNode() && toElement(node)->part() == "-webkit-input-placeholder")
+        RenderBlock::addChild(newChild, firstChild());
+    else
+        RenderBlock::addChild(newChild, beforeChild);
+}
+
 void RenderTextControl::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBlock::styleDidChange(diff, oldStyle);