Changeset 57012 in webkit

Timestamp:

Apr 2, 2010 11:31:24 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-02 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Forms with autocomplete=off should not consume saved state
​https://bugs.webkit.org/show_bug.cgi?id=36762

• fast/forms/state-restore-to-non-autocomplete-form-expected.txt: Added.
• fast/forms/state-restore-to-non-autocomplete-form.html: Added.

2010-04-02 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Forms with autocomplete=off should not consume saved state
​https://bugs.webkit.org/show_bug.cgi?id=36762

Introduce Element::shouldSaveAndRestoreFormControlState() to check
if we should save and restore control state.

Test: fast/forms/state-restore-to-non-autocomplete-form.html

• dom/Document.cpp: (WebCore::Document::formElementsState): Check shouldSaveAndRestoreFormControlState().
• dom/Element.h: (WebCore::Element::shouldSaveAndRestoreFormControlState): Added. It just returns true.
• html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElementWithState::autoComplete): Added. It return autocomplete state of the form. (WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState): Added. It returns the result of autoComplete(). (WebCore::HTMLFormControlElementWithState::finishParsingChildren): Do not restore state if shouldSaveAndRestoreFormControlState() is false.
• html/HTMLFormControlElement.h: Declare autoComplete() and overriding methods.
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::autoComplete): Reduce code by using autoComplete() of the parent class. (WebCore::HTMLInputElement::saveFormControlState): Remove the autoComplete() check. Document::formElementsState() does equivalent check.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/state-restore-to-non-autocomplete-form-expected.txt (added)
• LayoutTests/fast/forms/state-restore-to-non-autocomplete-form.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/html/HTMLFormControlElement.cpp (modified) (1 diff)
• WebCore/html/HTMLFormControlElement.h (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-02  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Forms with autocomplete=off should not consume saved state
+        https://bugs.webkit.org/show_bug.cgi?id=36762
+
+        * fast/forms/state-restore-to-non-autocomplete-form-expected.txt: Added.
+        * fast/forms/state-restore-to-non-autocomplete-form.html: Added.
+
 2010-04-02  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-02  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Forms with autocomplete=off should not consume saved state
+        https://bugs.webkit.org/show_bug.cgi?id=36762
+        
+        Introduce Element::shouldSaveAndRestoreFormControlState() to check
+        if we should save and restore control state.
+
+        Test: fast/forms/state-restore-to-non-autocomplete-form.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::formElementsState): Check shouldSaveAndRestoreFormControlState().
+        * dom/Element.h:
+        (WebCore::Element::shouldSaveAndRestoreFormControlState): Added. It just returns true.
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElementWithState::autoComplete):
+          Added. It return autocomplete state of the form.
+        (WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState):
+          Added. It returns the result of autoComplete().
+        (WebCore::HTMLFormControlElementWithState::finishParsingChildren):
+          Do not restore state if shouldSaveAndRestoreFormControlState() is false.
+        * html/HTMLFormControlElement.h: Declare autoComplete() and overriding methods.
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::autoComplete):
+          Reduce code by using autoComplete() of the parent class.
+        (WebCore::HTMLInputElement::saveFormControlState):
+          Remove the autoComplete() check. Document::formElementsState() does equivalent check.
+
 2010-04-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -4211 +4211 @@
     Iterator end = m_formElementsWithState.end();
     for (Iterator it = m_formElementsWithState.begin(); it != end; ++it) {
-        Element* e = *it;
+        Element* elementWithState = *it;
         String value;
-        if (e->saveFormControlState(value)) {
-            stateVector.append(e->formControlName().string());
-            stateVector.append(e->formControlType().string());
-            stateVector.append(value);
-        }
+        if (!elementWithState->shouldSaveAndRestoreFormControlState())
+            continue;
+        if (!elementWithState->saveFormControlState(value))
+            continue;
+        stateVector.append(elementWithState->formControlName().string());
+        stateVector.append(elementWithState->formControlType().string());
+        stateVector.append(value);
     }
     return stateVector;

trunk/WebCore/dom/Element.h

@@ -266 +266 @@
     virtual const AtomicString& formControlType() const { return nullAtom; }
 
+    virtual bool shouldSaveAndRestoreFormControlState() const { return true; }
     virtual bool saveFormControlState(String&) const { return false; }
     virtual void restoreFormControlState(const String&) { }

trunk/WebCore/html/HTMLFormControlElement.cpp

@@ -423 +423 @@
 }
 
+bool HTMLFormControlElementWithState::autoComplete() const
+{
+    if (!form())
+        return true;
+    return form()->autoComplete();
+}
+
+bool HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState() const
+{
+    // We don't save/restore control state in a form with autocomplete=off.
+    return autoComplete();
+}
+
 void HTMLFormControlElementWithState::finishParsingChildren()
 {
     HTMLFormControlElement::finishParsingChildren();
+
+    // We don't save state of a control with shouldSaveAndRestoreFormControlState()=false.
+    // But we need to skip restoring process too because a control in another
+    // form might have the same pair of name and type and saved its state.
+    if (!shouldSaveAndRestoreFormControlState())
+        return;
+
     Document* doc = document();
     if (doc->hasStateForNewFormElements()) {

trunk/WebCore/html/HTMLFormControlElement.h

@@ -151 +151 @@
     virtual ~HTMLFormControlElementWithState();
 
+    virtual bool autoComplete() const;
+    virtual bool shouldSaveAndRestoreFormControlState() const;
     virtual void finishParsingChildren();
 

trunk/WebCore/html/HTMLInputElement.cpp

@@ -156 +156 @@
     if (m_autocomplete != Uninitialized)
         return m_autocomplete == On;
-    
-    // Assuming we're still in a Form, respect the Form's setting
-    if (HTMLFormElement* form = this->form())
-        return form->autoComplete();
-    
-    // The default is true
-    return true;
+    return HTMLTextFormControlElement::autoComplete();
 }
 
@@ -912 +906 @@
 bool HTMLInputElement::saveFormControlState(String& result) const
 {
-    if (!autoComplete())
-        return false;
-
     switch (inputType()) {
         case BUTTON: