Merge 67240

WebCore/html/HTMLFormElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 24 matching lines @@
 class Event;
 class FormData;
 class HTMLFormControlElement;
 class HTMLImageElement;
 class HTMLInputElement;
 class HTMLFormCollection;
 class TextEncoding;
 
 struct CollectionCache;
 
-class HTMLFormElement : public HTMLElement { 
+class HTMLFormElement : public HTMLElement {
 public:
     static PassRefPtr<HTMLFormElement> create(Document*);
     static PassRefPtr<HTMLFormElement> create(const QualifiedName&, Document*);
     virtual ~HTMLFormElement();
 
     PassRefPtr<HTMLCollection> elements();
     void getNamedElements(const AtomicString&, Vector<RefPtr<Node> >&);
 
     unsigned length() const;
     Node* item(unsigned index);
@@ skipping 35 matching lines @@
     void setAcceptCharset(const String&);
 
     String action() const;
     void setAction(const String&);
 
     String method() const;
     void setMethod(const String&);
 
     virtual String target() const;
 
-    FormSubmissionTrigger submissionTrigger() const;
+    bool wasUserSubmitted() const;
 
     HTMLFormControlElement* defaultButton() const;
 
     bool checkValidity();
 
     PassRefPtr<HTMLFormControlElement> elementForAlias(const AtomicString&);
     void addElementAlias(HTMLFormControlElement*, const AtomicString& alias);
 
     CheckedRadioButtons& checkedRadioButtons() { return m_checkedRadioButtons; }
 
     const Vector<HTMLFormControlElement*>& associatedElements() const { return m_associatedElements; }
 
 private:
     HTMLFormElement(const QualifiedName&, Document*);
 
     virtual bool rendererIsNeeded(RenderStyle*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
- 
+
     virtual void handleLocalEvents(Event*);
 
     virtual void parseMappedAttribute(Attribute*);
 
     virtual bool isURLAttribute(Attribute*) const;
 
     virtual void documentDidBecomeActive();
 
     virtual void willMoveToNewOwnerDocument();
     virtual void didMoveToNewOwnerDocument();
 
-    void submit(Event*, bool activateSubmitButton, bool lockHistory, FormSubmissionTrigger);
+    void submit(Event*, bool activateSubmitButton, bool processingUserGesture, FormSubmissionTrigger);
 
     unsigned formElementIndex(HTMLFormControlElement*);
     // Returns true if the submission should be proceeded.
     bool validateInteractively(Event*);
     // Validates each of the controls, and stores controls of which 'invalid'
     // event was not canceled to the specified vector.
     void collectUnhandledInvalidControls(Vector<RefPtr<HTMLFormControlElement> >&);
 
     friend class HTMLFormCollection;
 
     typedef HashMap<RefPtr<AtomicStringImpl>, RefPtr<HTMLFormControlElement> > AliasMap;
 
     FormSubmission::Attributes m_attributes;
     OwnPtr<AliasMap> m_elementAliases;
     OwnPtr<CollectionCache> m_collectionCache;
 
     CheckedRadioButtons m_checkedRadioButtons;
-    
+
     Vector<HTMLFormControlElement*> m_associatedElements;
     Vector<HTMLImageElement*> m_imageElements;
 
-    FormSubmissionTrigger m_submissionTrigger;
+    bool m_wasUserSubmitted;
 
     bool m_autocomplete : 1;
     bool m_insubmit : 1;
     bool m_doingsubmit : 1;
     bool m_inreset : 1;
     bool m_malformed : 1;
     bool m_demoted : 1;
     AtomicString m_name;
 };
 
 } // namespace WebCore
 
 #endif // HTMLFormElement_h