Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / html / HTMLInputElement.h

diff --git a/Source/WebCore/html/HTMLInputElement.h b/Source/WebCore/html/HTMLInputElement.h
index 757992a..2a98b13 100644 (file)
--- a/Source/WebCore/html/HTMLInputElement.h
+++ b/Source/WebCore/html/HTMLInputElement.h
@@ -42,6 +42,8 @@ public:
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitspeechchange);
 
+    virtual InputElement* toInputElement() { return this; }
+
     bool autoComplete() const;
 
     // For ValidityState
@@ -196,6 +198,8 @@ public:
     CheckedRadioButtons& checkedRadioButtons() const;
     void handleBeforeTextInsertedEvent(Event*);
     void updateCheckedRadioButtons();
+
+    bool lastChangeWasUserEdit() const;
     
 protected:
     HTMLInputElement(const QualifiedName&, Document*, HTMLFormElement*, bool createdByParser);
@@ -211,17 +215,16 @@ private:
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
     virtual bool isMouseFocusable() const;
     virtual bool isEnumeratable() const;
-    virtual bool isResettable() const { return true; }
     virtual void updateFocusAppearance(bool restorePreviousSelection);
     virtual void aboutToUnload();
     virtual bool shouldUseInputMethod() const;
 
     virtual const AtomicString& formControlName() const;
- 
+
     // isChecked is used by the rendering tree/CSS while checked() is used by JS to determine checked state
     virtual bool isChecked() const;
     virtual bool isIndeterminate() const { return indeterminate(); }
-    
+
     virtual bool isTextFormControl() const { return isTextField(); }
 
     virtual bool hasSpinButton() const;
@@ -235,7 +238,7 @@ private:
     virtual void restoreFormControlState(const String&);
 
     virtual bool canStartSelection() const;
-    
+
     virtual void accessKeyAction(bool sendToAnyElement);
 
     virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
@@ -260,6 +263,7 @@ private:
     virtual void cacheSelection(int start, int end);
 
     virtual String visibleValue() const;
+    virtual String convertFromVisibleValue(const String&) const;
     virtual bool isAcceptableValue(const String&) const;
     virtual String sanitizeValue(const String&) const;
     virtual bool hasUnacceptableValue() const;
@@ -280,6 +284,7 @@ private:
 
     virtual bool supportsPlaceholder() const;
     virtual bool isEmptyValue() const { return value().isEmpty(); }
+    virtual bool isEmptySuggestedValue() const { return suggestedValue().isEmpty(); }
     virtual void handleFocusEvent();
     virtual void handleBlurEvent();
     virtual int cachedSelectionStart() const { return m_data.cachedSelectionStart(); }