Changeset 10935 in webkit

Timestamp:

Oct 24, 2005, 2:42:15 PM (20 years ago)

Author:

harrison

Message:

Reviewed by Darin. Committed by David Harrison.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=5449
"OBJECT should be accessible by id/name as document property only if its only children are PARAMs"

Test added:

• fast/js/object-by-name-or-id-expected.txt: Added.
• fast/js/object-by-name-or-id.html: Added.

Files changed:

• khtml/html/html_miscimpl.cpp: (DOM::HTMLNameCollectionImpl::traverseNextItem):
• khtml/html/html_objectimpl.cpp: (DOM::HTMLObjectElementImpl::HTMLObjectElementImpl): (DOM::HTMLObjectElementImpl::parseMappedAttribute): (DOM::HTMLObjectElementImpl::insertedIntoDocument): (DOM::HTMLObjectElementImpl::removedFromDocument): (DOM::HTMLObjectElementImpl::childrenChanged): (DOM::HTMLObjectElementImpl::updateDocNamedItem):
• khtml/html/html_objectimpl.h: (DOM::HTMLObjectElementImpl::isDocNamedItem):
• manual-tests/drag_select_highlighting.html: Added.

Location:

trunk/WebCore

Files:

• ChangeLog-2005-12-19 (modified) (1 diff)
• khtml/html/html_miscimpl.cpp (modified) (2 diffs)
• khtml/html/html_objectimpl.cpp (modified) (8 diffs)
• khtml/html/html_objectimpl.h (modified) (3 diffs)

trunk/WebCore/ChangeLog-2005-12-19

@@ +1 @@
+2005-10-24  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Darin.  Committed by David Harrison.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5449
+        "OBJECT should be accessible by id/name as document property only if its only children are PARAMs"
+
+        Test added:
+        * fast/js/object-by-name-or-id-expected.txt: Added.
+        * fast/js/object-by-name-or-id.html: Added.
+
+        Files changed:
+        * khtml/html/html_miscimpl.cpp:
+        (DOM::HTMLNameCollectionImpl::traverseNextItem):
+        * khtml/html/html_objectimpl.cpp:
+        (DOM::HTMLObjectElementImpl::HTMLObjectElementImpl):
+        (DOM::HTMLObjectElementImpl::parseMappedAttribute):
+        (DOM::HTMLObjectElementImpl::insertedIntoDocument):
+        (DOM::HTMLObjectElementImpl::removedFromDocument):
+        (DOM::HTMLObjectElementImpl::childrenChanged):
+        (DOM::HTMLObjectElementImpl::updateDocNamedItem):
+        * khtml/html/html_objectimpl.h:
+        (DOM::HTMLObjectElementImpl::isDocNamedItem):
+        * manual-tests/drag_select_highlighting.html: Added.
+
 2005-10-24  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/khtml/html/html_miscimpl.cpp

@@ -28 +28 @@
 #include "html/html_imageimpl.h"
 #include "html/html_documentimpl.h"
+#include "html/html_objectimpl.h"
 
 #include "dom/dom_node.h"
@@ -394 +395 @@
                     e->hasTagName(iframeTag))
                     found = e->getAttribute(nameAttr) == m_name;
-                else if (e->hasTagName(appletTag) ||
-                         e->hasTagName(objectTag))
+                else if (e->hasTagName(appletTag))
                     found = e->getAttribute(nameAttr) == m_name ||
                         e->getAttribute(idAttr) == m_name;
+                else if (e->hasTagName(objectTag))
+                    found = (e->getAttribute(nameAttr) == m_name || e->getAttribute(idAttr) == m_name) &&
+                        static_cast<HTMLObjectElementImpl *>(e)->isDocNamedItem();
                 break;
             default:

trunk/WebCore/khtml/html/html_objectimpl.cpp

@@ -43 +43 @@
 #include "rendering/render_image.h"
 #include "xml/dom2_eventsimpl.h"
+#include "xml/dom_textimpl.h"
 #include "xml/EventNames.h"
 
@@ -562 +563 @@
     needWidgetUpdate = false;
     m_useFallbackContent = false;
+    m_docNamedItem = true;
 }
 
@@ -679 +681 @@
     } else if (attr->name() == nameAttr) {
             DOMString newNameAttr = attr->value();
-            if (inDocument() && getDocument()->isHTMLDocument()) {
+            if (isDocNamedItem() && inDocument() && getDocument()->isHTMLDocument()) {
                 HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
                 document->removeNamedItem(oldNameAttr);
@@ -687 +689 @@
     } else if (attr->name() == idAttr) {
         DOMString newIdAttr = attr->value();
-        if (inDocument() && getDocument()->isHTMLDocument()) {
+        if (isDocNamedItem() && inDocument() && getDocument()->isHTMLDocument()) {
             HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
             document->removeDocExtraNamedItem(oldIdAttr);
@@ -780 +782 @@
 void HTMLObjectElementImpl::insertedIntoDocument()
 {
-    if (getDocument()->isHTMLDocument()) {
+    if (isDocNamedItem() && getDocument()->isHTMLDocument()) {
         HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
         document->addNamedItem(oldNameAttr);
@@ -791 +793 @@
 void HTMLObjectElementImpl::removedFromDocument()
 {
-    if (getDocument()->isHTMLDocument()) {
+    if (isDocNamedItem() && getDocument()->isHTMLDocument()) {
         HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
         document->removeNamedItem(oldNameAttr);
@@ -811 +813 @@
 void HTMLObjectElementImpl::childrenChanged()
 {
+    updateDocNamedItem();
     if (inDocument() && !m_useFallbackContent) {
         needWidgetUpdate = true;
@@ -853 +856 @@
     detach();
     attach();
+}
+
+void HTMLObjectElementImpl::updateDocNamedItem()
+{
+    // The rule is "<object> elements with no children other than
+    // <param> elements and whitespace can be found by name in a
+    // document, and other <object> elements cannot."
+    bool wasNamedItem = m_docNamedItem;
+    bool isNamedItem = true;
+    NodeImpl *child = firstChild();
+    while (child && isNamedItem) {
+        if (child->isElementNode()) {
+            if (!static_cast<ElementImpl *>(child)->hasTagName(paramTag))
+                isNamedItem = false;
+        } else if (child->isTextNode()) {
+            if (!static_cast<TextImpl *>(child)->containsOnlyWhitespace())
+                isNamedItem = false;
+        } else
+            isNamedItem = false;
+        child = child->nextSibling();
+    }
+    if (isNamedItem != wasNamedItem && getDocument()->isHTMLDocument()) {
+        HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
+        if (isNamedItem) {
+            document->addNamedItem(oldNameAttr);
+            document->addDocExtraNamedItem(oldIdAttr);
+        } else {
+            document->removeNamedItem(oldNameAttr);
+            document->removeDocExtraNamedItem(oldIdAttr);
+        }
+    }
+    m_docNamedItem = isNamedItem;
 }
 

trunk/WebCore/khtml/html/html_objectimpl.h

@@ -237 +237 @@
     void setWidth(const DOMString &);
 
+    bool isDocNamedItem() const { return m_docNamedItem; }
 #if APPLE_CHANGES
     KJS::Bindings::Instance *getObjectInstance() const;
@@ -249 +250 @@
 
 private:
+    void updateDocNamedItem();
     DOMString oldIdAttr;
     DOMString oldNameAttr;
@@ -254 +256 @@
     mutable KJS::Bindings::Instance *objectInstance;
 #endif
+    bool m_docNamedItem;
 };