[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:47:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 29a232102544f48abc48c6ecaf1ccf92adccdd5e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 21 20:21:37 2003 +0000
Checking in David Faure's patch that fixes getElementsByTagName(*).
Reviewed by me
* khtml/xml/dom_nodeimpl.cpp:
(NodeBaseImpl::getElementsByTagNameNS):
(TagNodeListImpl::nodeMatches):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6454f2c..4eff2af 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-07-21 Dave Hyatt <hyatt at apple.com>
+
+ Checking in David Faure's patch that fixes getElementsByTagName(*).
+
+ Reviewed by me
+
+ * khtml/xml/dom_nodeimpl.cpp:
+ (NodeBaseImpl::getElementsByTagNameNS):
+ (TagNodeListImpl::nodeMatches):
+
2003-07-18 Dave Hyatt <hyatt at apple.com>
Enable domain() and setDomain() to work for all documents (XML
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6454f2c..4eff2af 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-07-21 Dave Hyatt <hyatt at apple.com>
+
+ Checking in David Faure's patch that fixes getElementsByTagName(*).
+
+ Reviewed by me
+
+ * khtml/xml/dom_nodeimpl.cpp:
+ (NodeBaseImpl::getElementsByTagNameNS):
+ (TagNodeListImpl::nodeMatches):
+
2003-07-18 Dave Hyatt <hyatt at apple.com>
Enable domain() and setDomain() to work for all documents (XML
diff --git a/WebCore/khtml/html/html_documentimpl.h b/WebCore/khtml/html/html_documentimpl.h
index 18b9840..46f000a 100644
--- a/WebCore/khtml/html/html_documentimpl.h
+++ b/WebCore/khtml/html/html_documentimpl.h
@@ -96,7 +96,6 @@ protected slots:
*/
void slotHistoryChanged();
private:
- mutable DOMString m_domain;
QTime m_startTime;
// we actually store ints inside the pointer value itself; would use void *
// but that makes the template unhappy.
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index 1430e91..5cbc8e2 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -1595,8 +1595,15 @@ NodeListImpl* NodeBaseImpl::getElementsByTagNameNS ( DOMStringImpl* namespaceURI
if (namespaceURI && namespaceURI->l && namespaceURI->s[0] == '*')
idMask &= ~NodeImpl::IdNSMask;
- return new TagNodeListImpl( this,
- getDocument()->tagId(namespaceURI, localName, true), idMask);
+ Id id = 0; // 0 means "all items"
+ if ( (idMask & NodeImpl::IdLocalMask) || namespaceURI ) // not getElementsByTagName("*")
+ {
+ id = getDocument()->tagId( namespaceURI, localName, true);
+ if ( !id ) // not found -> we want to return an empty list, not "all items"
+ id = (Id)-1; // HACK. HEAD has a cleaner implementation of TagNodeListImpl it seems.
+ }
+
+ return new TagNodeListImpl( this, id, idMask );
}
// I don't like this way of implementing the method, but I didn't find any
@@ -1916,7 +1923,7 @@ NodeImpl *TagNodeListImpl::item ( unsigned long index ) const
bool TagNodeListImpl::nodeMatches( NodeImpl *testNode ) const
{
- return ( testNode->isElementNode() && m_id &&
+ return ( testNode->isElementNode() &&
(testNode->id() & m_idMask) == m_id);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list