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

Source/core/rendering/RenderTextControl.cpp

 /**
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 34 matching lines @@
 HTMLTextFormControlElement* RenderTextControl::textFormControlElement() const
 {
     return toHTMLTextFormControlElement(node());
 }
 
 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);
     Element* innerText = innerTextElement();
     if (!innerText)
         return;
     RenderBlock* innerTextRenderer = toRenderBlock(innerText->renderer());
     if (innerTextRenderer) {
         // We may have set the width and the height in the old style in layout().
         // Reset them now to avoid getting a spurious layout hint.
@@ skipping 218 matching lines @@
         layoutScope.setChildNeedsLayout(placeholderRenderer);
     return placeholderRenderer;
 }
 
 bool RenderTextControl::canBeReplacedWithInlineRunIn() const
 {
     return false;
 }
 
 } // namespace WebCore