Changeset 20260 in webkit

Timestamp:

Mar 17, 2007 4:53:55 AM (17 years ago)

Author:

antti

Message:

LayoutTests:

Reviewed by Adele.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=12595
REGRESSION: Can't add item to cart at lnt.com (JS type error)
<rdar://problem/4722863>

Expanded version of Darin's test case.

• fast/forms/old-names-expected.txt: Added.
• fast/forms/old-names.html: Added.

WebCore:

Reviewed by Adele.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=12595
REGRESSION: Can't add item to cart at lnt.com (JS type error)
<rdar://problem/4722863>

Emulate Firefox behavior where form elements accessed by a name
can be accessed with that name later even if the name changes or
even if element is removed from the document.

This is loosely based on Darin's earlier patch for the same problem but
is much less expansive. It takes somewhat different approach to more closely
mimic Firefox behavior. Includes expanded test case.

• bindings/js/JSHTMLFormElementCustom.cpp: (WebCore::JSHTMLFormElement::canGetItemsForName):

Use new the HTMLFormElement::getNamedElements() method

(WebCore::JSHTMLFormElement::nameGetter):

Use new the HTMLFormElement::getNamedElements() method

• html/HTMLFormElement.cpp: (WebCore::HTMLFormElement::HTMLFormElement): (WebCore::HTMLFormElement::~HTMLFormElement): (WebCore::HTMLFormElement::elementForAlias): (WebCore::HTMLFormElement::addElementAlias):

Maintain a map of known element aliases

(WebCore::HTMLFormElement::getNamedElements):

Get a list of elements matching the name, based both their
current names and known aliases (earlier names).
Keep the alias list in sync.

• html/HTMLFormElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/old-names-expected.txt (added)
• LayoutTests/fast/forms/old-names.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSHTMLFormElementCustom.cpp (modified) (1 diff)
• WebCore/html/HTMLFormElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLFormElement.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-17  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Adele.
+        
+        Test for http://bugs.webkit.org/show_bug.cgi?id=12595
+        REGRESSION: Can't add item to cart at lnt.com (JS type error)
+        <rdar://problem/4722863>
+        
+        Expanded version of Darin's test case. 
+
+        * fast/forms/old-names-expected.txt: Added.
+        * fast/forms/old-names.html: Added.
+
 2007-03-16  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-17  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Adele.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=12595
+        REGRESSION: Can't add item to cart at lnt.com (JS type error)
+        <rdar://problem/4722863>
+        
+        Emulate Firefox behavior where form elements accessed by a name
+        can be accessed with that name later even if the name changes or
+        even if element is removed from the document.
+        
+        This is loosely based on Darin's earlier patch for the same problem but
+        is much less expansive. It takes somewhat different approach to more closely
+        mimic Firefox behavior. Includes expanded test case.
+
+        * bindings/js/JSHTMLFormElementCustom.cpp:
+        (WebCore::JSHTMLFormElement::canGetItemsForName):
+            Use new the HTMLFormElement::getNamedElements() method
+        (WebCore::JSHTMLFormElement::nameGetter):
+            Use new the HTMLFormElement::getNamedElements() method
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::HTMLFormElement):
+        (WebCore::HTMLFormElement::~HTMLFormElement):
+        (WebCore::HTMLFormElement::elementForAlias):
+        (WebCore::HTMLFormElement::addElementAlias):
+            Maintain a map of known element aliases
+        (WebCore::HTMLFormElement::getNamedElements):
+            Get a list of elements matching the name, based both their
+            current names and known aliases (earlier names).
+            Keep the alias list in sync.
+        * html/HTMLFormElement.h:
+
 2007-03-17  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/bindings/js/JSHTMLFormElementCustom.cpp

@@ -36 +36 @@
 bool JSHTMLFormElement::canGetItemsForName(ExecState* exec, HTMLFormElement* form, const AtomicString& propertyName)
 {
-    // FIXME: ideally there should be a lighter-weight way of doing this
-    JSValue* namedItems = JSHTMLCollection(exec, form->elements().get()).getNamedItems(exec, propertyName);
-    return !namedItems->isUndefined();
+    Vector<RefPtr<Node> > namedItems;
+    form->getNamedElements(propertyName, namedItems);
+    return namedItems.size();
 }
 
 JSValue* JSHTMLFormElement::nameGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
 {
-    JSHTMLElement* thisObj = static_cast<JSHTMLElement*>(slot.slotBase());
-    HTMLFormElement* form = static_cast<HTMLFormElement*>(thisObj->impl());
+    HTMLFormElement* form = static_cast<HTMLFormElement*>(static_cast<JSHTMLElement*>(slot.slotBase())->impl());
     
-    return JSHTMLCollection(exec, form->elements().get()).getNamedItems(exec, propertyName);
+    Vector<RefPtr<Node> > namedItems;
+    form->getNamedElements(propertyName, namedItems);
+    
+    if (namedItems.size() == 1)
+        return toJS(exec, namedItems[0].get());
+    if (namedItems.size() > 1) 
+        return new DOMNamedNodesCollection(exec, namedItems);
+    return jsUndefined();
 }
 

trunk/WebCore/html/HTMLFormElement.cpp

@@ -50 +50 @@
 HTMLFormElement::HTMLFormElement(Document* doc)
     : HTMLElement(formTag, doc)
-{
-    collectionInfo = 0;
-    m_post = false;
-    m_multipart = false;
-    m_autocomplete = true;
-    m_insubmit = false;
-    m_doingsubmit = false;
-    m_inreset = false;
-    m_enctype = "application/x-www-form-urlencoded";
-    m_malformed = false;
-    m_preserveAcrossRemove = false;
+    , m_elementAliases(0)
+    , collectionInfo(0)
+    , m_enctype("application/x-www-form-urlencoded")
+    , m_post(false)
+    , m_multipart(false)
+    , m_autocomplete(true)
+    , m_insubmit(false)
+    , m_doingsubmit(false)
+    , m_inreset(false)
+    , m_malformed(false)
+    , m_preserveAcrossRemove(false)
+{
 }
 
 HTMLFormElement::~HTMLFormElement()
 {
+    delete m_elementAliases;
     delete collectionInfo;
     
@@ -639 +641 @@
     setAttribute(targetAttr, value);
 }
-    
+
+PassRefPtr<HTMLGenericFormElement> HTMLFormElement::elementForAlias(const AtomicString& alias)
+{
+    if (alias.isEmpty() || !m_elementAliases)
+        return 0;
+    return m_elementAliases->get(alias.impl());
+}
+
+void HTMLFormElement::addElementAlias(HTMLGenericFormElement* element, const AtomicString& alias)
+{
+    if (alias.isEmpty())
+        return;
+    if (!m_elementAliases)
+        m_elementAliases = new AliasMap;
+    m_elementAliases->set(alias.impl(), element);
+}
+
+void HTMLFormElement::getNamedElements(const AtomicString& name, Vector<RefPtr<Node> >& namedItems)
+{
+    elements()->namedItems(name, namedItems);
+
+    // see if we have seen something with this name before
+    RefPtr<HTMLGenericFormElement> aliasElem;
+    if (aliasElem = elementForAlias(name)) {
+        bool found = false;
+        for (unsigned n = 0; n < namedItems.size(); n++) {
+            if (namedItems[n] == aliasElem.get()) {
+                found = true;
+                break;
+            }
+        }
+        if (!found)
+            // we have seen it before but it is gone now. still, we need to return it.
+            namedItems.append(aliasElem.get());
+    }
+    // name has been accessed, remember it
+    if (namedItems.size() && aliasElem != namedItems.first())
+        addElementAlias(static_cast<HTMLGenericFormElement*>(namedItems.first().get()), name);        
+}
+
 } // namespace

trunk/WebCore/html/HTMLFormElement.h

@@ -51 +51 @@
      
     PassRefPtr<HTMLCollection> elements();
+    void getNamedElements(const AtomicString&, Vector<RefPtr<Node> >&);
+    
     unsigned length() const;
     Node* item(unsigned index);
@@ -99 +101 @@
     virtual String target() const;
     void setTarget(const String&);
+    
+    PassRefPtr<HTMLGenericFormElement> elementForAlias(const AtomicString&);
+    void addElementAlias(HTMLGenericFormElement*, const AtomicString& alias);
 
     // FIXME: Change this to be private after getting rid of all the clients.
@@ -110 +115 @@
     friend class HTMLFormCollection;
 
+    typedef HashMap<RefPtr<AtomicStringImpl>, RefPtr<HTMLGenericFormElement> > AliasMap;
+    
+    AliasMap* m_elementAliases;
     HTMLCollection::CollectionInfo* collectionInfo;
 
@@ -116 +124 @@
     String m_target;
     String m_enctype;
-    String m_boundary;
     String m_acceptcharset;
     bool m_post : 1;