Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

1 files changed, 4 insertions, 12 deletions

diff --git a/WebCore/rendering/RenderTextControl.cpp b/WebCore/rendering/RenderTextControl.cpp
index 5e19362..1e80ff0 100644
--- a/WebCore/rendering/RenderTextControl.cpp
+++ b/WebCore/rendering/RenderTextControl.cpp
@@ -151,13 +151,12 @@ void RenderTextControl::createSubtreeIfNeeded(TextControlInnerElement* innerBloc
 
 int RenderTextControl::textBlockHeight() const
 {
-    return height() - paddingTop() - paddingBottom() - borderTop() - borderBottom();
+    return height() - borderAndPaddingHeight();
 }
 
 int RenderTextControl::textBlockWidth() const
 {
-    return width() - paddingLeft() - paddingRight() - borderLeft() - borderRight()
-           - m_innerText->renderBox()->paddingLeft() - m_innerText->renderBox()->paddingRight();
+    return width() - borderAndPaddingWidth() - m_innerText->renderBox()->paddingLeft() - m_innerText->renderBox()->paddingRight();
 }
 
 void RenderTextControl::updateFromElement()
@@ -410,7 +409,7 @@ void RenderTextControl::calcHeight()
               m_innerText->renderBox()->marginTop() + m_innerText->renderBox()->marginBottom());
 
     adjustControlHeightBasedOnLineHeight(m_innerText->renderer()->lineHeight(true, true));
-    setHeight(height() + paddingTop() + paddingBottom() + borderTop() + borderBottom());
+    setHeight(height() + borderAndPaddingHeight());
 
     // We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.
     if (style()->overflowX() == OSCROLL ||  (style()->overflowX() == OAUTO && m_innerText->renderer()->style()->wordWrap() == NormalWordWrap))
@@ -434,13 +433,6 @@ void RenderTextControl::forwardEvent(Event* event)
     m_innerText->defaultEventHandler(event);
 }
 
-IntRect RenderTextControl::controlClipRect(int tx, int ty) const
-{
-    IntRect clipRect = contentBoxRect();
-    clipRect.move(tx, ty);
-    return clipRect;
-}
-
 static const char* fontFamiliesWithInvalidCharWidth[] = {
     "American Typewriter",
     "Arial Hebrew",
@@ -541,7 +533,7 @@ void RenderTextControl::calcPrefWidths()
         m_minPrefWidth = min(m_minPrefWidth, calcContentBoxWidth(style()->maxWidth().value()));
     }
 
-    int toAdd = paddingLeft() + paddingRight() + borderLeft() + borderRight();
+    int toAdd = borderAndPaddingWidth();
 
     m_minPrefWidth += toAdd;
     m_maxPrefWidth += toAdd;