Changeset 19979

Timestamp:

03/06/07 01:05:42 (23 months ago)

Author:

andersca

Message:

LayoutTests:

Reviewed by Maciej.

<rdar://problem/5035045>
REGRESSION: WebKit browser doesn't display image at http://www.metoffice.gov.uk/weather/satellite/index.html

Add some tests where image elements have id _and_ name elements.

• fast/dom/HTMLDocument/document-special-properties-expected.txt:
• fast/dom/HTMLDocument/document-special-properties.html:

WebCore:

Reviewed by Maciej.

<rdar://problem/5035045>
REGRESSION: WebKit browser doesn't display image at http://www.metoffice.gov.uk/weather/satellite/index.html

It turns out WinIE does allow you to access images by their id as special document properties. However, this is only
allowed when the element also has a name attribute. The value of the name attribute is ignored and can even be empty!

• bindings/js/kjs_html.cpp: (KJS::JSHTMLDocument::namedItemGetter): Return jsUndefined() if the collection is empty.

• html/HTMLImageElement.cpp: (WebCore::HTMLImageElement::parseMappedAttribute): (WebCore::HTMLImageElement::insertedIntoDocument): (WebCore::HTMLImageElement::removedFromDocument):
• html/HTMLImageElement.h: Add the id attribute value to the extra named item map.

• html/HTMLNameCollection.cpp: (WebCore::HTMLNameCollection::traverseNextItem): Check for images with name attributes that match, as well as elements with id attributes that match where the element also has a name attribute.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLDocument/document-special-properties-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/HTMLDocument/document-special-properties.html (modified) (4 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/kjs_html.cpp (modified) (1 diff)
• WebCore/html/HTMLImageElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLImageElement.h (modified) (1 diff)
• WebCore/html/HTMLNameCollection.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-06  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5035045>
+        REGRESSION: WebKit browser doesn't display image at http://www.metoffice.gov.uk/weather/satellite/index.html
+        
+        Add some tests where image elements have id _and_ name elements.
+        
+        * fast/dom/HTMLDocument/document-special-properties-expected.txt:
+        * fast/dom/HTMLDocument/document-special-properties.html:
+
 2007-03-05  Kevin McCullough  <kmccullough@apple.com>
 

trunk/LayoutTests/fast/dom/HTMLDocument/document-special-properties-expected.txt

@@ -11 +11 @@
 Image by id (multiple): undefined
 Image by id/name mixed: collection(2) IMG(name) IMG(name)
+Image by id, name present (unique): single IMG(id,name)
+Image by id, empty name present (unique): single IMG(id)
+Image by id, name present (multiple): collection(2) IMG(id,name) IMG(id,name)
+Image by name, id present (unique): single IMG(id,name)
 
 Nonexistent form name: undefined

trunk/LayoutTests/fast/dom/HTMLDocument/document-special-properties.html

@@ -33 +33 @@
 <img name="image5" width="0" height="0">
 <img id="image5" width="0" height="0">
+<img id="image6" name="image6name" width="0" height="0">
+<img id="image7" name="" width="0" height="0">
+<img id="image8" name="image8name" width="0" height="0">
+<img id="image8" width="0" height="0">
+<img id="image8" name="image7name" width="0" height="0">
+<img id="image9" name="image9name" width="0" height="0">
 
 <form name="form1" width="0" height="0"></form>
@@ -151 +157 @@
         print(" " + e.tagName);
 
-        if (e.name && e.id) {
-            print("(id,name)");
-        } else if (e.name) {
-            print("(name)");
+    if (e.name && e.id) {
+        print("(id,name)");
+    } else if (e.name) {
+        print("(name)");
         } else if (e.id) {
-            print("(id)");
-        }
+        print("(id)");
+    }
     } else if (e.navigator) {
         print(" WINDOW");
@@ -174 +180 @@
     } else if (propVal.length) {
         print(" collection(" + propVal.length + ")");
-        for (var i = 0; i < propVal.length; i++) {
-            printElement(propVal[i]);
-        }
+    for (var i = 0; i < propVal.length; i++) {
+        printElement(propVal[i]);
+    }
     } else {
         print(" single");
-        printElement(propVal);
+    printElement(propVal);
     }
     
@@ -191 +197 @@
 testProperty("Image by id (multiple)", "image4");
 testProperty("Image by id/name mixed", "image5");
+testProperty("Image by id, name present (unique)", "image6");
+testProperty("Image by id, empty name present (unique)", "image7");
+testProperty("Image by id, name present (multiple)", "image8");
+testProperty("Image by name, id present (unique)", "image9name");
+
 print("<br>");
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-06  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5035045>
+        REGRESSION: WebKit browser doesn't display image at http://www.metoffice.gov.uk/weather/satellite/index.html
+        
+        It turns out WinIE does allow you to access images by their id as special document properties. However, this is only
+        allowed when the element also has a name attribute. The value of the name attribute is ignored and can even be empty!
+        
+        * bindings/js/kjs_html.cpp:
+        (KJS::JSHTMLDocument::namedItemGetter):
+        Return jsUndefined() if the collection is empty.
+        
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::parseMappedAttribute):
+        (WebCore::HTMLImageElement::insertedIntoDocument):
+        (WebCore::HTMLImageElement::removedFromDocument):
+        * html/HTMLImageElement.h:
+        Add the id attribute value to the extra named item map.
+        
+        * html/HTMLNameCollection.cpp:
+        (WebCore::HTMLNameCollection::traverseNextItem):
+        Check for images with name attributes that match, as well as elements with id attributes that match where
+        the element also has a name attribute.
+
 2007-03-06  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/bindings/js/kjs_html.cpp

@@ -208 +208 @@
       return Window::retrieve(frame);
     return toJS(exec, node);
-  }
+  } else if (collection->length() == 0)
+      return jsUndefined();
 
   return getHTMLCollection(exec, collection.get());

trunk/WebCore/html/HTMLImageElement.cpp

@@ -140 +140 @@
         }
         oldNameAttr = newNameAttr;
+    } else if (attr->name() == idAttr) {
+        String newIdAttr = attr->value();
+        if (inDocument() && document()->isHTMLDocument()) {
+            HTMLDocument *doc = static_cast<HTMLDocument *>(document());
+            doc->removeDocExtraNamedItem(oldIdAttr);
+            doc->addDocExtraNamedItem(newIdAttr);
+        }
+        oldIdAttr = newIdAttr;
+        // also call superclass
+        HTMLElement::parseMappedAttribute(attr);
     } else
         HTMLElement::parseMappedAttribute(attr);
@@ -181 +191 @@
 void HTMLImageElement::insertedIntoDocument()
 {
-    Document* doc = document();
-    if (doc->isHTMLDocument())
-        static_cast<HTMLDocument*>(doc)->addNamedItem(oldNameAttr);
+    if (document()->isHTMLDocument()) {
+        HTMLDocument* doc = static_cast<HTMLDocument*>(document());
+
+        doc->addNamedItem(oldNameAttr);
+        doc->addDocExtraNamedItem(oldIdAttr);
+    }
 
     HTMLElement::insertedIntoDocument();
@@ -190 +203 @@
 void HTMLImageElement::removedFromDocument()
 {
-    Document* doc = document();
-    if (doc->isHTMLDocument())
-        static_cast<HTMLDocument*>(doc)->removeNamedItem(oldNameAttr);
+    if (document()->isHTMLDocument()) {
+        HTMLDocument* doc = static_cast<HTMLDocument*>(document());
+
+        doc->removeNamedItem(oldNameAttr);
+        doc->removeDocExtraNamedItem(oldIdAttr);
+    }
 
     HTMLElement::removedFromDocument();

trunk/WebCore/html/HTMLImageElement.h

@@ -117 +117 @@
     HTMLFormElement* m_form;
     String oldNameAttr;
+    String oldIdAttr;
     CompositeOperator m_compositeOperator;
 };

trunk/WebCore/html/HTMLNameCollection.cpp

@@ -67 +67 @@
             case DocumentNamedItems:
                 // find images, forms, applets, embeds, objects and iframes by name, 
-                // but only applets and object by id (this strange rule matches IE)
-                if (e->hasTagName(imgTag) ||
-                    e->hasTagName(formTag) ||
+                // applets and object by id, and images by id but only if they have
+                // a name attribute (this very strange rule matches IE)
+                if (e->hasTagName(formTag) ||
                     e->hasTagName(embedTag) ||
                     e->hasTagName(iframeTag))
@@ -79 +79 @@
                     found = (e->getAttribute(nameAttr) == m_name || e->getAttribute(idAttr) == m_name) &&
                         static_cast<HTMLObjectElement*>(e)->isDocNamedItem();
+                else if (e->hasTagName(imgTag))
+                    found = e->getAttribute(nameAttr) == m_name || (e->getAttribute(idAttr) == m_name && e->hasAttribute(nameAttr));
                 break;
             default: