Changeset 21359 in webkit

Timestamp:

May 10, 2007, 1:55:44 AM (18 years ago)

Author:

beidson

Message:

LayoutTests:

Reviewed by Oliver

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13636 and <rdar://problem/5190816>

When creating the applets collection, be sure to only count Objects if they contain
a java applet

• dom/html/level2/html/AppletsCollection-expected.txt: Added.
• dom/html/level2/html/AppletsCollection.html: Added.

WebCore:

Reviewed by Oliver

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13636 and <rdar://problem/5190816>

When creating the applets collection, be sure to only count Objects if they contain
a java applet

• html/HTMLCollection.cpp: (WebCore::HTMLCollection::traverseNextItem): Add the qualifier for Objects that containsJavaApplet() must be true

• html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::containsJavaApplet): Check this Object element and inner nodes for any Java applets
• html/HTMLObjectElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/dom/html/level2/html/AppletsCollection-expected.txt (added)
• LayoutTests/dom/html/level2/html/AppletsCollection.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCollection.cpp (modified) (2 diffs)
• WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• WebCore/html/HTMLObjectElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-10  Brady Eidson <beidson@apple.com>
+
+        Reviewed by Oliver
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13636 and <rdar://problem/5190816>
+
+        When creating the applets collection, be sure to only count Objects if they contain
+        a java applet
+
+        * dom/html/level2/html/AppletsCollection-expected.txt: Added.
+        * dom/html/level2/html/AppletsCollection.html: Added.
+
 2007-05-09  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-10  Brady Eidson <beidson@apple.com>
+
+        Reviewed by Oliver
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13636 and <rdar://problem/5190816>
+
+        When creating the applets collection, be sure to only count Objects if they contain
+        a java applet
+
+        * html/HTMLCollection.cpp:
+        (WebCore::HTMLCollection::traverseNextItem): Add the qualifier for Objects that 
+          containsJavaApplet() must be true
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::containsJavaApplet): Check this Object element and inner
+          nodes for any Java applets
+        * html/HTMLObjectElement.h: 
+
 2007-05-10  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/html/HTMLCollection.cpp

@@ -29 +29 @@
 #include "HTMLElement.h"
 #include "HTMLNames.h"
+#include "HTMLObjectElement.h"
 
 namespace WebCore {
@@ -149 +150 @@
                     found = true;
                 break;
-            case DocApplets:   // all OBJECT and APPLET elements
-                if (e->hasLocalName(objectTag) || e->hasLocalName(appletTag))
+            case DocApplets:   // all APPLET elements and OBJECT elements that contain Java Applets
+                if (e->hasLocalName(appletTag) || 
+                    (e->hasLocalName(objectTag) && static_cast<HTMLObjectElement*>(e)->containsJavaApplet()))
                     found = true;
                 break;

trunk/WebCore/html/HTMLObjectElement.cpp

@@ -470 +470 @@
 }
 
+bool HTMLObjectElement::containsJavaApplet() const
+{
+    if (type().lower() == "application/x-java-applet")
+        return true;
+        
+    Node* child = firstChild();
+    while (child) {
+        if (child->isElementNode()) {
+            Element* e = static_cast<Element*>(child);
+            if (e->hasTagName(paramTag) &&
+                e->getAttribute(nameAttr).domString().lower() == "type" &&
+                e->getAttribute(valueAttr).domString().lower() == "application/x-java-applet")
+                return true;
+            else if (e->hasTagName(objectTag) && static_cast<HTMLObjectElement*>(e)->containsJavaApplet())
+                return true;
+            else if (e->hasTagName(appletTag))
+                return true;
+        }
+        child = child->nextSibling();
+    }
+    
+    return false;
+}
+
 #if ENABLE(SVG)
 SVGDocument* HTMLObjectElement::getSVGDocument(ExceptionCode& ec) const

trunk/WebCore/html/HTMLObjectElement.h

@@ -118 +118 @@
     bool isDocNamedItem() const { return m_docNamedItem; }
 
+    bool containsJavaApplet() const;
+    
 #if ENABLE(SVG)
     SVGDocument* getSVGDocument(ExceptionCode&) const;