[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 cb224edd9c6bca2a2b89f354c7137d8d33c52ee9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 1 20:22:52 2003 +0000

            Reviewed by Dave.
    
            - fixed 3437309 -- REGRESSION (100-107): Javascript menu doesn't work at www.aa.com
    
            * khtml/xml/dom_elementimpl.cpp: (ElementImpl::removeAttribute): Restored the old behavior
            for removeAttribute and removeAttributeNS; these don't give NOT_FOUND_ERR. But keep the
            NOT_FOUND_ERR for removeAttributeNode and removedNamedItem.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c542843..c0ff38b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-10-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3437309 -- REGRESSION (100-107): Javascript menu doesn't work at www.aa.com
+
+        * khtml/xml/dom_elementimpl.cpp: (ElementImpl::removeAttribute): Restored the old behavior
+        for removeAttribute and removeAttributeNS; these don't give NOT_FOUND_ERR. But keep the
+        NOT_FOUND_ERR for removeAttributeNode and removedNamedItem.
+
 2003-10-01  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c542843..c0ff38b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3437309 -- REGRESSION (100-107): Javascript menu doesn't work at www.aa.com
+
+        * khtml/xml/dom_elementimpl.cpp: (ElementImpl::removeAttribute): Restored the old behavior
+        for removeAttribute and removeAttributeNS; these don't give NOT_FOUND_ERR. But keep the
+        NOT_FOUND_ERR for removeAttributeNode and removedNamedItem.
+
 2003-10-01  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/khtml/xml/dom_elementimpl.cpp b/WebCore/khtml/xml/dom_elementimpl.cpp
index 9b14ad2..7439467 100644
--- a/WebCore/khtml/xml/dom_elementimpl.cpp
+++ b/WebCore/khtml/xml/dom_elementimpl.cpp
@@ -184,8 +184,12 @@ ElementImpl::~ElementImpl()
 
 void ElementImpl::removeAttribute( NodeImpl::Id id, int &exceptioncode )
 {
-    if (namedAttrMap)
+    if (namedAttrMap) {
         namedAttrMap->removeNamedItem(id, exceptioncode);
+        if (exceptioncode == DOMException::NOT_FOUND_ERR) {
+            exceptioncode = 0;
+        }
+    }
 }
 
 void ElementImpl::setAttribute(NodeImpl::Id id, const DOMString &value)
@@ -619,10 +623,8 @@ Node NamedAttrMapImpl::setNamedItem ( NodeImpl* arg, int &exceptioncode )
 }
 
 // The DOM2 spec doesn't say that removeAttribute[NS] throws NOT_FOUND_ERR
-// if the attribute is not found - David
-// But the DOM Level 1 document does say that:
-// http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-D58B193
-// and the DOM test suite from W3C checks that case, so I'm going with that. - Darin
+// if the attribute is not found, but at this level we have to throw NOT_FOUND_ERR
+// because of removeNamedItem, removeNamedItemNS, and removeAttributeNode.
 Node NamedAttrMapImpl::removeNamedItem ( NodeImpl::Id id, int &exceptioncode )
 {
     // ### should this really be raised when the attribute to remove isn't there at all?

-- 
WebKit Debian packaging