resolved conflicts for merge of 1457b739 to master

[android-x86/external-webkit.git] / WebKit / android / nav / CachedInput.h

diff --git a/WebKit/android/nav/CachedInput.h b/WebKit/android/nav/CachedInput.h
index 01b40f9..0809208 100644 (file)
--- a/WebKit/android/nav/CachedInput.h
+++ b/WebKit/android/nav/CachedInput.h
@@ -39,25 +39,22 @@ public:
         // constructor
     }
     void* formPointer() const { return mForm; }
-    void init() {
-        bzero(this, sizeof(CachedInput));
-        mName = WebCore::String();
-    }
-    WebCore::HTMLInputElement::InputType inputType() const { return mInputType; }
+    void init();
+    WebCore::HTMLInputElement::DeprecatedInputType inputType() const { return mInputType; }
     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; }
@@ -66,14 +63,14 @@ public:
     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