[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit fe4bbbcccd8d16520cb16282f91674ac764fa5d5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 1 17:23:09 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3608978>: dual <map> means you can't select the enter site button at jurassicpark.com (same problem in MacIE, works in Netscape)
    
            * khtml/html/html_imageimpl.cpp: (HTMLMapElementImpl::parseHTMLAttribute):
            Make the first <map> seen win, as in other browsers. The old code made the last <map> seen win.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d5946bb..036ef1c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-04-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3608978>: dual <map> means you can't select the enter site button at jurassicpark.com (same problem in MacIE, works in Netscape)
+
+        * khtml/html/html_imageimpl.cpp: (HTMLMapElementImpl::parseHTMLAttribute):
+        Make the first <map> seen win, as in other browsers. The old code made the last <map> seen win.
+
 2004-04-01  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index cbd4cbc..5b8f963 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -372,8 +372,11 @@ void HTMLMapElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
         else
             name = s.string();
 	// ### make this work for XML documents, e.g. in case of <html:map...>
-        if(getDocument()->isHTMLDocument())
-            static_cast<HTMLDocumentImpl*>(getDocument())->mapMap[name] = this;
+        if (getDocument()->isHTMLDocument()) {
+            QMap<QString, HTMLMapElementImpl*> &mapMap = static_cast<HTMLDocumentImpl*>(getDocument())->mapMap;
+            if (!mapMap.contains(name))
+                mapMap.insert(name, this);
+        }
         break;
     }
     default:

-- 
WebKit Debian packaging