Revert 58049 - Revert 53685 - Merge 63786 - 2010-07-16 James Hawkins <jhawk...

WebCore/html/HTMLFormElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * 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
@@ skipping 56 matching lines @@
 static int64_t generateFormDataIdentifier()
 {
     // Initialize to the current time to reduce the likelihood of generating
     // identifiers that overlap with those from past/future browser sessions.
     static int64_t nextIdentifier = static_cast<int64_t>(currentTime() * 1000000.0);
     return ++nextIdentifier;
 }
 
 HTMLFormElement::HTMLFormElement(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document)
+    , m_submissionTrigger(NotSubmittedByJavaScript)
     , m_autocomplete(true)
     , m_insubmit(false)
     , m_doingsubmit(false)
     , m_inreset(false)
     , m_malformed(false)
     , m_demoted(false)
 {
     ASSERT(hasTagName(formTag));
 }
 
@@ skipping 276 matching lines @@
     Frame* frame = document()->frame();
     if (!view || !frame)
         return;
 
     if (m_insubmit) {
         m_doingsubmit = true;
         return;
     }
 
     m_insubmit = true;
+    m_submissionTrigger = formSubmissionTrigger;
 
     HTMLFormControlElement* firstSuccessfulSubmitButton = 0;
     bool needButtonActivation = activateSubmitButton; // do we need to activate a submit button?
     
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
         HTMLFormControlElement* control = m_associatedElements[i];
         if (needButtonActivation) {
             if (control->isActivatedSubmit())
                 needButtonActivation = false;
             else if (firstSuccessfulSubmitButton == 0 && control->isSuccessfulSubmitButton())
@@ skipping 169 matching lines @@
 void HTMLFormElement::setMethod(const String &value)
 {
     setAttribute(methodAttr, value);
 }
 
 String HTMLFormElement::target() const
 {
     return getAttribute(targetAttr);
 }
 
+FormSubmissionTrigger HTMLFormElement::submissionTrigger() const
+{
+    return m_submissionTrigger;
+}
+
 HTMLFormControlElement* HTMLFormElement::defaultButton() const
 {
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
         HTMLFormControlElement* control = m_associatedElements[i];
         if (control->isSuccessfulSubmitButton())
             return control;
     }
 
     return 0;
 }
@@ skipping 75 matching lines @@
 }
 
 void HTMLFormElement::didMoveToNewOwnerDocument()
 {
     if (!m_autocomplete)
         document()->registerForDocumentActivationCallbacks(this);
     HTMLElement::didMoveToNewOwnerDocument();
 }
 
 } // namespace