Changeset 146919 in webkit

Timestamp:

Mar 26, 2013, 12:41:45 PM (12 years ago)

Author:

kareng@chromium.org

Message:

Revert 146672 "Add client callbacks to notify of changes of asso..."

Add client callbacks to notify of changes of associated from controls
​https://bugs.webkit.org/show_bug.cgi?id=110375

Patch by Dane Wallinga <​dgwallinga@chromium.org> on 2013-03-22
Reviewed by Ryosuke Niwa.

Source/WebCore:

Hook FormAssociatedElement, HTMLFormElement to notify EditorClient of form changes after a page has loaded.
Will be used to add autofill support for ajax-y webpages. e.g if while filling out a form, new fields
are dynamically created, autofill can know to re-query the autofill server and keep going.
​https://bugs.webkit.org/show_bug.cgi?id=110375

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::didAssociateFormControl):
(WebCore):
(WebCore::Document::didAssociateFormControlsTimerFired):

• dom/Document.h:

(Document):
added method didAssociateFormControl, which batches form changes
and calls out to ChromeClient on a timer.

• html/FormAssociatedElement.cpp:

(WebCore::FormAssociatedElement::resetFormOwner):
(WebCore::FormAssociatedElement::formAttributeChanged):
(WebCore):

• html/FormAssociatedElement.h:

(FormAssociatedElement):
add calls to Document::didAssociateFormControl when form changes

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::insertedInto):
(WebCore):

• html/HTMLFormElement.h:

add call to Document::didAssociateFormControl

• loader/EmptyClients.h:

(EmptyChromeClient):
(WebCore::EmptyChromeClient::didAssociateFormControls):
(WebCore::EmptyChromeClient::shouldNotifyOnFormChanges):

• page/ChromeClient.h:

(ChromeClient):
add new method didAssociateFormControls

Source/WebKit/chromium:

Implement form association methods of ChromeClient
to inform autofill of form changes after a page has loaded

• public/WebAutofillClient.h:

(WebAutofillClient):
(WebKit::WebAutofillClient::didAssociateInput):
(WebKit::WebAutofillClient::didAddForm):
(WebKit::WebAutofillClient::didAssociateFormControls):

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::didAssociateFormControls):
(WebKit):
(WebKit::ChromeClientImpl::shouldNotifyOnFormChanges):

• src/ChromeClientImpl.h:

(ChromeClientImpl):

TBR=​commit-queue@webkit.org
Review URL: ​https://codereview.chromium.org/12670015

Location:

branches/chromium/1453/Source

Files:

• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/dom/Document.h (modified) (4 diffs)
• WebCore/html/FormAssociatedElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLFormElement.cpp (modified) (1 diff)
• WebCore/loader/EmptyClients.h (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebKit/chromium/public/WebAutofillClient.h (modified) (2 diffs)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/ChromeClientImpl.h (modified) (1 diff)

branches/chromium/1453/Source/WebCore/dom/Document.cpp

@@ -497 +497 @@
     , m_fontloader(0)
 #endif
-    , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsTimerFired)
 {
     m_printing = false;
@@ -6161 +6160 @@
 #endif
 
-void Document::didAssociateFormControl(Element* element)
-{
-    if (!frame() || !frame()->page() || !frame()->page()->chrome()->client()->shouldNotifyOnFormChanges())
-        return;
-    m_associatedFormControls.add(element);
-    if (!m_didAssociateFormControlsTimer.isActive())
-        m_didAssociateFormControlsTimer.startOneShot(0);
-}
-
-void Document::didAssociateFormControlsTimerFired(Timer<Document>* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_didAssociateFormControlsTimer);
-    if (!frame() || !frame()->page())
-        return;
-
-    Vector<Element*> associatedFormControls;
-    copyToVector(m_associatedFormControls, associatedFormControls);
-
-    frame()->page()->chrome()->client()->didAssociateFormControls(associatedFormControls);
-    m_associatedFormControls.clear();
-}
-
 } // namespace WebCore

branches/chromium/1453/Source/WebCore/dom/Document.h

@@ -53 +53 @@
 #include <wtf/Deque.h>
 #include <wtf/FixedArray.h>
-#include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -1211 +1210 @@
 #endif
 
-    void didAssociateFormControl(Element*);
-
     virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0);
 
@@ -1300 +1297 @@
     void addListenerType(ListenerType listenerType) { m_listenerTypes |= listenerType; }
     void addMutationEventListenerTypeIfEnabled(ListenerType);
-
-    void didAssociateFormControlsTimerFired(Timer<Document>*);
 
     void styleResolverThrowawayTimerFired(Timer<Document>*);
@@ -1598 +1593 @@
     RefPtr<FontLoader> m_fontloader;
 #endif
-
-    Timer<Document> m_didAssociateFormControlsTimer;
-    HashSet<Element*> m_associatedFormControls;
-
 };
 

branches/chromium/1453/Source/WebCore/html/FormAssociatedElement.cpp

@@ -26 +26 @@
 #include "FormAssociatedElement.h"
 
-#include "EditorClient.h"
 #include "FormController.h"
-#include "Frame.h"
 #include "HTMLFormControlElement.h"
 #include "HTMLFormElement.h"
@@ -160 +158 @@
 void FormAssociatedElement::resetFormOwner()
 {
-    HTMLFormElement* originalForm = m_form;
     setForm(findAssociatedForm(toHTMLElement(this), m_form));
-    HTMLElement* element = toHTMLElement(this);     
-    if (m_form && m_form != originalForm && m_form->inDocument())
-        element->document()->didAssociateFormControl(element);
 }
 
@@ -172 +166 @@
     if (!element->fastHasAttribute(formAttr)) {
         // The form attribute removed. We need to reset form owner here.
-        HTMLFormElement* originalForm = m_form;
         setForm(element->findFormAncestor());
-        HTMLElement* element = toHTMLElement(this);
-        if (m_form && m_form != originalForm && m_form->inDocument())
-            element->document()->didAssociateFormControl(element);
         m_formAttributeTargetObserver = nullptr;
     } else {

branches/chromium/1453/Source/WebCore/html/HTMLFormElement.cpp

@@ -140 +140 @@
 {
     HTMLElement::insertedInto(insertionPoint);
-    if (insertionPoint->inDocument())
-        this->document()->didAssociateFormControl(this);
     return InsertionDone;
 }

branches/chromium/1453/Source/WebCore/loader/EmptyClients.h

@@ -209 +209 @@
     
     virtual bool isEmptyChromeClient() const { return true; }
-
-    virtual void didAssociateFormControls(const Vector<Element*>&) { }
-    virtual bool shouldNotifyOnFormChanges() { return false; }
 };
 

branches/chromium/1453/Source/WebCore/page/ChromeClient.h

@@ -383 +383 @@
     virtual bool shouldAutoscrollForDragAndDrop(RenderBox*) const { return false; }
 
-    virtual void didAssociateFormControls(const Vector<Element*>&) { };
-    virtual bool shouldNotifyOnFormChanges() { return false; };
-
 protected:
     virtual ~ChromeClient() { }

branches/chromium/1453/Source/WebKit/chromium/public/WebAutofillClient.h

@@ -40 +40 @@
 class WebNode;
 class WebString;
-
-template <typename T> class WebVector;
 
 class WebAutofillClient {
@@ -96 +94 @@
     virtual void setIgnoreTextChanges(bool ignore) { }
 
-    virtual void didAssociateFormControls(const WebVector<WebNode>&) { }
-
 protected:
     virtual ~WebAutofillClient() { }

branches/chromium/1453/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -78 +78 @@
 #include "TextFieldDecorationElement.h"
 #include "WebAccessibilityObject.h"
-#include "WebAutofillClient.h"
 #if ENABLE(INPUT_TYPE_COLOR)
 #include "WebColorChooser.h"
@@ -1146 +1145 @@
 #endif
 
-void ChromeClientImpl::didAssociateFormControls(const Vector<Element*>& elements)
-{
-    if (!m_webView->autofillClient())
-        return;
-    WebVector<WebNode> elementVector(static_cast<size_t>(elements.size()));
-    size_t elementsCount = elements.size();
-    for (size_t i = 0; i < elementsCount; ++i)
-        elementVector[i] = elements[i];
-    m_webView->autofillClient()->didAssociateFormControls(elementVector);
-}
-
-bool ChromeClientImpl::shouldNotifyOnFormChanges()
-{
-    return true;
-}
-
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
 PassOwnPtr<NavigatorContentUtilsClientImpl> NavigatorContentUtilsClientImpl::create(WebViewImpl* webView)

branches/chromium/1453/Source/WebKit/chromium/src/ChromeClientImpl.h

@@ -235 +235 @@
 #endif
 
-    virtual void didAssociateFormControls(const Vector<WebCore::Element*>&) OVERRIDE;
-    virtual bool shouldNotifyOnFormChanges() OVERRIDE;
-
 private:
     WebNavigationPolicy getNavigationPolicy();