Changeset 150683 in webkit

Timestamp:

May 25, 2013 2:08:38 AM (11 years ago)

Author:

akling@apple.com

Message:

Document::formController() should return a reference.
<​http://webkit.org/b/116758>

Reviewed by Antti Koivisto.

The formController() is created on demand, so return a reference instead.

• dom/Document.h:
• dom/Document.cpp:

(WebCore::Document::formController):
(WebCore::Document::setStateForNewFormElements):

• html/HTMLFormControlElementWithState.cpp:

(WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
(WebCore::HTMLFormControlElementWithState::finishParsingChildren):

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::~HTMLFormElement):
(WebCore::HTMLFormElement::finishParsingChildren):

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::~HTMLInputElement):
(WebCore::HTMLInputElement::didMoveToNewDocument):
(WebCore::HTMLInputElement::checkedRadioButtons):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (1 diff)
• html/HTMLFormControlElementWithState.cpp (modified) (3 diffs)
• html/HTMLFormElement.cpp (modified) (2 diffs)
• html/HTMLInputElement.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        Document::formController() should return a reference.
+        <http://webkit.org/b/116758>
+
+        Reviewed by Antti Koivisto.
+
+        The formController() is created on demand, so return a reference instead.
+
+        * dom/Document.h:
+        * dom/Document.cpp:
+        (WebCore::Document::formController):
+        (WebCore::Document::setStateForNewFormElements):
+        * html/HTMLFormControlElementWithState.cpp:
+        (WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
+        (WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
+        (WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
+        (WebCore::HTMLFormControlElementWithState::finishParsingChildren):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::~HTMLFormElement):
+        (WebCore::HTMLFormElement::finishParsingChildren):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::~HTMLInputElement):
+        (WebCore::HTMLInputElement::didMoveToNewDocument):
+        (WebCore::HTMLInputElement::checkedRadioButtons):
+
 2013-05-25  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1645 +1645 @@
 }
 
-FormController* Document::formController()
+FormController& Document::formController()
 {
     if (!m_formController)
         m_formController = FormController::create();
-    return m_formController.get();
+    return *m_formController;
 }
 
@@ -1663 +1663 @@
     if (!stateVector.size() && !m_formController)
         return;
-    formController()->setStateForNewFormElements(stateVector);
+    formController().setStateForNewFormElements(stateVector);
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -492 +492 @@
     void evaluateMediaQueryList();
 
-    // Never returns 0.
-    FormController* formController();
+    FormController& formController();
     Vector<String> formElementsState() const;
     void setStateForNewFormElements(const Vector<String>&);

trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp

@@ -38 +38 @@
     : HTMLFormControlElement(tagName, doc, f)
 {
-    document()->formController()->registerFormElementWithState(this);
+    document()->formController().registerFormElementWithState(this);
 }
 
 HTMLFormControlElementWithState::~HTMLFormControlElementWithState()
 {
-    document()->formController()->unregisterFormElementWithState(this);
+    document()->formController().unregisterFormElementWithState(this);
 }
 
@@ -49 +49 @@
 {
     if (oldDocument)
-        oldDocument->formController()->unregisterFormElementWithState(this);
-    document()->formController()->registerFormElementWithState(this);
+        oldDocument->formController().unregisterFormElementWithState(this);
+    document()->formController().registerFormElementWithState(this);
     HTMLFormControlElement::didMoveToNewDocument(oldDocument);
 }
@@ -85 +85 @@
 {
     HTMLFormControlElement::finishParsingChildren();
-    document()->formController()->restoreControlStateFor(*this);
+    document()->formController().restoreControlStateFor(*this);
 }
 

trunk/Source/WebCore/html/HTMLFormElement.cpp

@@ -88 +88 @@
 HTMLFormElement::~HTMLFormElement()
 {
-    document()->formController()->willDeleteForm(this);
+    document()->formController().willDeleteForm(this);
     if (!shouldAutocomplete())
         document()->unregisterForPageCacheSuspensionCallbacks(this);
@@ -677 +677 @@
 {
     HTMLElement::finishParsingChildren();
-    document()->formController()->restoreControlStateIn(*this);
+    document()->formController().restoreControlStateIn(*this);
 }
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -175 +175 @@
     // We should unregister it to avoid accessing a deleted object.
     if (isRadioButton())
-        document()->formController()->checkedRadioButtons().removeButton(this);
+        document()->formController().checkedRadioButtons().removeButton(this);
 #if ENABLE(TOUCH_EVENTS)
     if (m_hasTouchEventHandler)
@@ -1537 +1537 @@
             oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
         if (isRadioButton())
-            oldDocument->formController()->checkedRadioButtons().removeButton(this);
+            oldDocument->formController().checkedRadioButtons().removeButton(this);
 #if ENABLE(TOUCH_EVENTS)
         if (m_hasTouchEventHandler)
@@ -1851 +1851 @@
         return &formElement->checkedRadioButtons();
     if (inDocument())
-        return &document()->formController()->checkedRadioButtons();
+        return &document()->formController().checkedRadioButtons();
     return 0;
 }