Changeset 122559 in webkit

Timestamp:

Jul 13, 2012 3:59:59 AM (12 years ago)

Author:

tkent@chromium.org

Message:

Change the timing of form state restore
​https://bugs.webkit.org/show_bug.cgi?id=89962

Reviewed by Hajime Morita.

For a preparation to fix a form identification problem (Bug 91209),
restore controls states when the parsing of their owner forms is
completed. For controls without owners, their states are restored when
their parsing is completed as ever.

No new tests. This doesn't change observable behavior.

• html/FormController.cpp:

(WebCore::ownerFormForState):
Added. This code was used in formKey(), and restoreControlState*() use it.
(WebCore::FormKeyGenerator::formKey): Use ownerFormForState(). No behavior change.
(WebCore::FormController::restoreControlStateFor):
Moved some code from HTMLFormControlElementWithState::finishParsingChildren().
The difference is we don't resotre state if this control is owned by a form.
(WebCore::FormController::restoreControlStateIn):
Restore states of associated controls. This is called from
finishParsingChildren() for <form>.

• html/FormController.h:

(FormController):

• Declare restoreControlStateFor() and restoreControlStateIn().
• Make takeStateForFormElement() private.

• html/FormAssociatedElement.cpp:

(WebCore::FormAssociatedElement::isFormControlElementWithState):
Added. The default implementation returns false.

• html/FormAssociatedElement.h:

(FormAssociatedElement):
Added isFormControlElementWithState() for FormController::restoreControlStateIn().

• html/HTMLFormControlElementWithState.cpp:

(WebCore::HTMLFormControlElementWithState::finishParsingChildren):
Some code was moved to FormController:restoreControlStateFor().
(WebCore::HTMLFormControlElementWithState::isFormControlElementWithState):
Added. Returns true.

• html/HTMLFormControlElementWithState.h:

(HTMLFormControlElementWithState): Declare isFormControlElementWithState().

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::finishParsingChildren):
Added. Calls FormController::restoreControlStateIn().

• html/HTMLFormElement.h:

(HTMLFormElement): Declare finishParsingChildren().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/FormAssociatedElement.cpp (modified) (1 diff)
• html/FormAssociatedElement.h (modified) (1 diff)
• html/FormController.cpp (modified) (3 diffs)
• html/FormController.h (modified) (2 diffs)
• html/HTMLFormControlElementWithState.cpp (modified) (1 diff)
• html/HTMLFormControlElementWithState.h (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (1 diff)
• html/HTMLFormElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-13  Kent Tamura  <tkent@chromium.org>
+
+        Change the timing of form state restore
+        https://bugs.webkit.org/show_bug.cgi?id=89962
+
+        Reviewed by Hajime Morita.
+
+        For a preparation to fix a form identification problem (Bug 91209),
+        restore controls states when the parsing of their owner forms is
+        completed. For controls without owners, their states are restored when
+        their parsing is completed as ever.
+
+        No new tests. This doesn't change observable behavior.
+
+        * html/FormController.cpp:
+        (WebCore::ownerFormForState):
+        Added. This code was used in formKey(), and restoreControlState*() use it.
+        (WebCore::FormKeyGenerator::formKey): Use ownerFormForState(). No behavior change.
+        (WebCore::FormController::restoreControlStateFor):
+        Moved some code from HTMLFormControlElementWithState::finishParsingChildren().
+        The difference is we don't resotre state if this control is owned by a form.
+        (WebCore::FormController::restoreControlStateIn):
+        Restore states of associated controls. This is called from
+        finishParsingChildren() for <form>.
+        * html/FormController.h:
+        (FormController):
+        - Declare restoreControlStateFor() and restoreControlStateIn().
+        - Make takeStateForFormElement() private.
+
+        * html/FormAssociatedElement.cpp:
+        (WebCore::FormAssociatedElement::isFormControlElementWithState):
+        Added. The default implementation returns false.
+        * html/FormAssociatedElement.h:
+        (FormAssociatedElement):
+        Added isFormControlElementWithState() for FormController::restoreControlStateIn().
+        * html/HTMLFormControlElementWithState.cpp:
+        (WebCore::HTMLFormControlElementWithState::finishParsingChildren):
+        Some code was moved to FormController:restoreControlStateFor().
+        (WebCore::HTMLFormControlElementWithState::isFormControlElementWithState):
+        Added. Returns true.
+        * html/HTMLFormControlElementWithState.h:
+        (HTMLFormControlElementWithState): Declare isFormControlElementWithState().
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::finishParsingChildren):
+        Added. Calls FormController::restoreControlStateIn().
+        * html/HTMLFormElement.h:
+        (HTMLFormElement): Declare finishParsingChildren().
+
 2012-07-13  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/html/FormAssociatedElement.cpp

@@ -228 +228 @@
 }
 
+bool FormAssociatedElement::isFormControlElementWithState() const
+{
+    return false;
+}
+
 const HTMLElement* toHTMLElement(const FormAssociatedElement* associatedElement)
 {

trunk/Source/WebCore/html/FormAssociatedElement.h

@@ -47 +47 @@
 
     virtual bool isFormControlElement() const = 0;
+    virtual bool isFormControlElementWithState() const;
     virtual bool isEnumeratable() const = 0;
 

trunk/Source/WebCore/html/FormController.cpp

@@ -30 +30 @@
 using namespace HTMLNames;
 
+static inline HTMLFormElement* ownerFormForState(const HTMLFormControlElementWithState& control)
+{
+    // Assume controls with form attribute have no owners because we restore
+    // state during parsing and form owners of such controls might be
+    // indeterminate.
+    return control.fastHasAttribute(formAttr) ? 0 : control.form();
+}
+
 // ----------------------------------------------------------------------------
 
@@ -104 +112 @@
 AtomicString FormKeyGenerator::formKey(const HTMLFormControlElementWithState& control)
 {
-    // Assume contorl with form attribute have no owners because we restores
-    // state during parsing and form owners of such controls might be
-    // indeterminate.
-    HTMLFormElement* form = control.fastHasAttribute(formAttr) ? 0 : control.form();
+    HTMLFormElement* form = ownerFormForState(control);
     if (!form) {
         DEFINE_STATIC_LOCAL(AtomicString, formKeyForNoOwner, ("No owner"));
@@ -241 +246 @@
 }
 
+void FormController::restoreControlStateFor(HTMLFormControlElementWithState& control)
+{
+    // 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 (!control.shouldSaveAndRestoreFormControlState())
+        return;
+    if (ownerFormForState(control))
+        return;
+    FormControlState state = takeStateForFormElement(control);
+    if (state.valueSize() > 0)
+        control.restoreFormControlState(state);
+}
+
+void FormController::restoreControlStateIn(HTMLFormElement& form)
+{
+    const Vector<FormAssociatedElement*>& elements = form.associatedElements();
+    for (size_t i = 0; i < elements.size(); ++i) {
+        if (!elements[i]->isFormControlElementWithState())
+            continue;
+        HTMLFormControlElementWithState* control = static_cast<HTMLFormControlElementWithState*>(elements[i]);
+        if (!control->shouldSaveAndRestoreFormControlState())
+            continue;
+        if (ownerFormForState(*control) != &form)
+            continue;
+        FormControlState state = takeStateForFormElement(*control);
+        if (state.valueSize() > 0)
+            control->restoreFormControlState(state);
+    }
+}
+
 void FormController::registerFormElementWithFormAttribute(FormAssociatedElement* element)
 {

trunk/Source/WebCore/html/FormController.h

@@ -130 +130 @@
     // This should be callled only by Document::setStateForNewFormElements().
     void setStateForNewFormElements(const Vector<String>&);
-    FormControlState takeStateForFormElement(const HTMLFormControlElementWithState&);
     void willDeleteForm(HTMLFormElement*);
+    void restoreControlStateFor(HTMLFormControlElementWithState&);
+    void restoreControlStateIn(HTMLFormElement&);
 
     void registerFormElementWithFormAttribute(FormAssociatedElement*);
@@ -139 +140 @@
 private:
     FormController();
+    FormControlState takeStateForFormElement(const HTMLFormControlElementWithState&);
 
     CheckedRadioButtons m_checkedRadioButtons;

trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp

@@ -71 +71 @@
 {
     HTMLFormControlElement::finishParsingChildren();
+    document()->formController()->restoreControlStateFor(*this);
+}
 
-    // 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;
-
-    FormControlState state = document()->formController()->takeStateForFormElement(*this);
-    if (state.valueSize() > 0)
-        restoreFormControlState(state);
+bool HTMLFormControlElementWithState::isFormControlElementWithState() const
+{
+    return true;
 }
 

trunk/Source/WebCore/html/HTMLFormControlElementWithState.h

@@ -48 +48 @@
     virtual void finishParsingChildren();
     virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;
+    virtual bool isFormControlElementWithState() const OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLFormElement.cpp

@@ -686 +686 @@
 }
 
+void HTMLFormElement::finishParsingChildren()
+{
+    HTMLElement::finishParsingChildren();
+    document()->formController()->restoreControlStateIn(*this);
+}
+
 } // namespace

trunk/Source/WebCore/html/HTMLFormElement.h

@@ -122 +122 @@
     virtual void didNotifyDescendantInsertions(ContainerNode*) OVERRIDE;
     virtual void removedFrom(ContainerNode*) OVERRIDE;
+    virtual void finishParsingChildren() OVERRIDE;
 
     virtual void handleLocalEvents(Event*);