1 files changed, 6 insertions, 7 deletions
diff --git a/WebCore/html/HTMLFormElement.h b/WebCore/html/HTMLFormElement.h
index 5aa9a5c..c9fb9ac 100644
--- a/WebCore/html/HTMLFormElement.h
+++ b/WebCore/html/HTMLFormElement.h
@@ -25,8 +25,8 @@
 #define HTMLFormElement_h
 
 #include "CheckedRadioButtons.h"
-#include "FormDataBuilder.h"
 #include "FormState.h"
+#include "FormSubmission.h"
 #include "HTMLElement.h"
 #include <wtf/OwnPtr.h>
 
@@ -34,7 +34,6 @@ namespace WebCore {
 
 class Event;
 class FormData;
-class FormSubmission;
 class HTMLFormControlElement;
 class HTMLImageElement;
 class HTMLInputElement;
@@ -55,10 +54,10 @@ public:
     unsigned length() const;
     Node* item(unsigned index);
 
-    String enctype() const { return m_formDataBuilder.encodingType(); }
+    String enctype() const { return m_attributes.encodingType(); }
     void setEnctype(const String&);
 
-    String encoding() const { return m_formDataBuilder.encodingType(); }
+    String encoding() const { return m_attributes.encodingType(); }
     void setEncoding(const String& value) { setEnctype(value); }
 
     bool autoComplete() const { return m_autocomplete; }
@@ -88,7 +87,8 @@ public:
 
     bool noValidate() const;
 
-    String acceptCharset() const { return m_formDataBuilder.acceptCharset(); }
+    String acceptCharset() const { return m_attributes.acceptCharset(); }
+    void setAcceptCharset(const String&);
 
     String action() const;
     void setAction(const String&);
@@ -134,7 +134,6 @@ private:
 
     void submit(Event*, bool activateSubmitButton, bool lockHistory, FormSubmissionTrigger);
 
-    PassRefPtr<FormSubmission> prepareFormSubmission(Event*, bool lockHistory, FormSubmissionTrigger);
     unsigned formElementIndex(HTMLFormControlElement*);
     // Returns true if the submission should be proceeded.
     bool validateInteractively(Event*);
@@ -146,7 +145,7 @@ private:
 
     typedef HashMap<RefPtr<AtomicStringImpl>, RefPtr<HTMLFormControlElement> > AliasMap;
 
-    FormDataBuilder m_formDataBuilder;
+    FormSubmission::Attributes m_attributes;
     OwnPtr<AliasMap> m_elementAliases;
     OwnPtr<CollectionCache> m_collectionCache;