1 files changed, 20 insertions, 7 deletions

diff --git a/Source/WebCore/html/HTMLInputElement.h b/Source/WebCore/html/HTMLInputElement.h
index 9756e4fc4..3af2b3525 100644
--- a/Source/WebCore/html/HTMLInputElement.h
+++ b/Source/WebCore/html/HTMLInputElement.h
@@ -30,6 +30,8 @@
 
 namespace WebCore {
 
+class CheckedRadioButtons;
+class DragData;
 class FileList;
 class HTMLDataListElement;
 class HTMLOptionElement;
@@ -65,7 +67,7 @@ public:
     double maximum() const;
     // Sets the "allowed value step" defined in the HTML spec to the specified double pointer.
     // Returns false if there is no "allowed value step."
-    bool getAllowedValueStep(double*) const;
+    bool getAllowedValueStep(Decimal*) const;
     StepRange createStepRange(AnyStepHandling) const;
 
     // Implementations of HTMLInputElement::stepUp() and stepDown().
@@ -195,6 +197,7 @@ public:
     void setDefaultValue(const String&);
 
     Vector<String> acceptMIMETypes();
+    Vector<String> acceptFileExtensions();
     String accept() const;
     String alt() const;
 
@@ -212,7 +215,14 @@ public:
 
     FileList* files();
     void setFiles(PassRefPtr<FileList>);
-    void receiveDroppedFiles(const Vector<String>&);
+
+    // Returns true if the given DragData has more than one dropped files.
+    bool receiveDroppedFiles(const DragData*);
+
+#if ENABLE(FILE_SYSTEM)
+    String droppedFileSystemId();
+#endif
+
     Icon* icon() const;
     // These functions are used for rendering the input active during a
     // drag-and-drop operation.
@@ -221,7 +231,6 @@ public:
 
     void addSearchResult();
     void onSearch();
-    bool searchEventsShouldBeDispatched() const;
 
 #if ENABLE(DATALIST)
     HTMLElement* list() const;
@@ -232,6 +241,10 @@ public:
 
     void setValueInternal(const String&, TextFieldEventBehavior);
 
+    bool isTextFormControlFocusable() const;
+    bool isTextFormControlKeyboardFocusable(KeyboardEvent*) const;
+    bool isTextFormControlMouseFocusable() const;
+
     void cacheSelectionInResponseToSetValue(int caretOffset) { cacheSelection(caretOffset, caretOffset, SelectionHasNoDirection); }
 
 #if ENABLE(INPUT_TYPE_COLOR)
@@ -253,6 +266,8 @@ public:
     void setHeight(unsigned);
     void setWidth(unsigned);
 
+    virtual const AtomicString& name() const OVERRIDE;
+
 protected:
     HTMLInputElement(const QualifiedName&, Document*, HTMLFormElement*, bool createdByParser);
     void createShadowSubtree();
@@ -275,16 +290,14 @@ private:
     virtual void aboutToUnload();
     virtual bool shouldUseInputMethod();
 
-    virtual const AtomicString& formControlName() const;
-
     virtual bool isTextFormControl() const { return isTextField(); }
 
     virtual bool canTriggerImplicitSubmission() const { return isTextField(); }
 
     virtual const AtomicString& formControlType() const;
 
-    virtual bool saveFormControlState(String& value) const;
-    virtual void restoreFormControlState(const String&);
+    virtual FormControlState saveFormControlState() const OVERRIDE;
+    virtual void restoreFormControlState(const FormControlState&) OVERRIDE;
 
     virtual bool canStartSelection() const;