resolved conflicts for merge of 1457b739 to master

Change-Id: I5e5460ec4afde9a229c3f73255f4d40322eb7166

diff --cc WebKit/android/nav/CacheBuilder.cpp
Simple merge

diff --cc WebKit/android/nav/CachedInput.cpp
Simple merge

diff --cc WebKit/android/nav/CachedInput.h
index f7e26b1,01b40f9..0809208
--- 1/WebKit/android/nav/CachedInput.h
--- 2/WebKit/android/nav/CachedInput.h
+++ b/WebKit/android/nav/CachedInput.h
@@@ -44,21 -47,33 +44,33 @@@ public
      bool isRtlText() const { return mIsRtlText; }
      bool isTextField() const { return mIsTextField; }
      int maxLength() const { return mMaxLength; };
 -    const WebCore::String& name() const { return mName; }
 +    const WTF::String& name() const { return mName; }
+     int paddingBottom() const { return mPaddingBottom; }
+     int paddingLeft() const { return mPaddingLeft; }
+     int paddingRight() const { return mPaddingRight; }
+     int paddingTop() const { return mPaddingTop; }
      void setFormPointer(void* form) { mForm = form; }
 -    void setInputType(WebCore::HTMLInputElement::InputType type) { mInputType = type; }
 +    void setInputType(WebCore::HTMLInputElement::DeprecatedInputType type) { mInputType = type; }
      void setIsRtlText(bool isRtlText) { mIsRtlText = isRtlText; }
      void setIsTextField(bool isTextField) { mIsTextField = isTextField; }
      void setMaxLength(int maxLength) { mMaxLength = maxLength; }
 -    void setName(const WebCore::String& name) { mName = name; }
 +    void setName(const WTF::String& name) { mName = name; }
+     void setPaddingBottom(int bottom) { mPaddingBottom = bottom; }
+     void setPaddingLeft(int left) { mPaddingLeft = left; }
+     void setPaddingRight(int right) { mPaddingRight = right; }
+     void setPaddingTop(int top) { mPaddingTop = top; }
      void setTextSize(int textSize) { mTextSize = textSize; }
      int textSize() const { return mTextSize; }
  private:
      void* mForm;
 -    WebCore::HTMLInputElement::InputType mInputType;
 +    WTF::String mName;
      int mMaxLength;
 -    WebCore::String mName;
+     int mPaddingBottom;
+     int mPaddingLeft;
+     int mPaddingRight;
+     int mPaddingTop;
      int mTextSize;
 +    WebCore::HTMLInputElement::DeprecatedInputType mInputType;
      bool mIsRtlText : 1;
      bool mIsTextField : 1;
  #if DUMP_NAV_CACHE

diff --cc WebKit/android/nav/WebView.cpp
Simple merge