Align placeholder element and inner-editor element at their baselines.

third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp

 /**
  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 147 matching lines @@
         centerContainerIfNeeded(containerLayoutObject);
     }
 
     HTMLElement* placeholderElement = inputElement()->placeholderElement();
     if (LayoutBox* placeholderBox = placeholderElement ? placeholderElement->layoutBox() : 0) {
         LayoutSize innerEditorSize;
 
         if (innerEditorLayoutObject)
             innerEditorSize = innerEditorLayoutObject->size();
         placeholderBox->mutableStyleRef().setWidth(Length(innerEditorSize.width() - placeholderBox->borderAndPaddingWidth(), Fixed));
-        placeholderBox->mutableStyleRef().setHeight(Length(innerEditorSize.height() - placeholderBox->borderAndPaddingHeight(), Fixed));
         bool neededLayout = placeholderBox->needsLayout();
         placeholderBox->layoutIfNeeded();
         LayoutPoint textOffset;
         if (innerEditorLayoutObject)
             textOffset = innerEditorLayoutObject->location();
         if (editingViewPortElement() && editingViewPortElement()->layoutBox())
             textOffset += toLayoutSize(editingViewPortElement()->layoutBox()->location());
         if (containerLayoutObject)
             textOffset += toLayoutSize(containerLayoutObject->location());
+        if (innerEditorLayoutObject) {
+            // We use inlineBlockBaseline() for innerEditor because it has no
+            // inline boxes when we show the placeholder.
+            int innerEditorBaseline = innerEditorLayoutObject->inlineBlockBaseline(HorizontalLine);
+            // We use firstLineBoxBaseline() for placeholder.
+            // TODO(tkent): It's inconsistent with innerEditorBaseline. However
+            // placeholderBox->inlineBlockBase() is unexpectedly larger.
+            int placeholderBaseline = placeholderBox->firstLineBoxBaseline();
+            textOffset += LayoutSize(0, innerEditorBaseline - placeholderBaseline);
+        }
         placeholderBox->setLocation(textOffset);
 
         // The placeholder gets layout last, after the parent text control and its other children,
         // so in order to get the correct overflow from the placeholder we need to recompute it now.
         if (neededLayout)
             computeOverflow(clientLogicalBottom());
     }
 }
 
 bool LayoutTextControlSingleLine::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
@@ skipping 216 matching lines @@
     if (innerEditorElement())
         innerEditorElement()->setScrollTop(newTop);
 }
 
 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const
 {
     return toHTMLInputElement(node());
 }
 
 }