17725 2008-03-08 09:57:26 -0800 XPath should be case insensitive for HTML 2009-05-27 10:22:27 -0700 1 1 1 Unclassified WebKit XML 528+ (Nightly build) Mac OS X 10.4 RESOLVED FIXED http://chivil.com/demos/safari+xpath/ P4 Minor --- 1 romuald ap ap oldest_to_newest 73091 0 romuald 2008-03-08 09:57:26 -0800 It is not necessarily a bug (since XML is case sensitive), but I've found that XPath implementation in Safari differs from some other browsers (Firefox and Opera). For exemple, in a xhtml 1.0 document, retrieving .//IMG won't return anything (either if the tags are uppercase, which is invalid xhtml, or if they are not). You can check the url for a practical example Found this bug because I'm used to use uppercase for tags in CSS selectors. Since this behavior applies in Firefox and Opera, you may choose to change Safari's implementation. 123257 1 ap 2009-05-27 02:59:54 -0700 I don't see any reason to remain incompatible with other engines in this respect, patch forthcoming. 123260 2 30701 ap 2009-05-27 03:34:16 -0700 Created attachment 30701 proposed fix 123295 3 30701 darin 2009-05-27 09:29:35 -0700 Comment on attachment 30701 proposed fix > + if (node->nodeType() != Node::ELEMENT_NODE) > + return false; How about isElementNode() instead? > + if (node->isHTMLElement() && node->document()->isHTMLDocument()) { > + // Paths without namespaces should match HTML elements in HTML documents despite those having an XHTML namespace. Names are compared case-insensitively. > + return equalIgnoringCase(static_cast<Element*>(node)->localName(), name) && (namespaceURI.isNull() || namespaceURI == node->namespaceURI()); > + } else > + return static_cast<Element*>(node)->hasLocalName(name) && namespaceURI == node->namespaceURI(); We normally don't do else after return. r=me 123302 4 ap 2009-05-27 10:22:27 -0700 Committed <http://trac.webkit.org/changeset/44190>. (In reply to comment #3) > How about isElementNode() instead? Node::ELEMENT_NODE is used elsewhere in this file, it seemed good for consistency. > We normally don't do else after return. Fixed. 30701 2009-05-27 03:34:16 -0700 2009-05-27 09:29:35 -0700 proposed fix CaseInsensitiveXPath.txt text/plain 6768 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDE4MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMjcgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzcyNQorICAgICAgICBY UGF0aCBzaG91bGQgYmUgY2FzZSBpbnNlbnNpdGl2ZSBmb3IgSFRNTAorCisgICAgICAgIFRlc3Q6 IGZhc3QveHBhdGgvbm9kZS1uYW1lLWNhc2Utc2Vuc2l0aXZpdHkuaHRtbAorCisgICAgICAgICog eG1sL1hQYXRoU3RlcC5jcHA6IChXZWJDb3JlOjpYUGF0aDo6U3RlcDo6bm9kZU1hdGNoZXMpOiBN YWRlIG5vZGUgbmFtZSBjaGVjayBjYXNlIGluc2Vuc2l0aXZlCisgICAgICAgIGZvciBIVE1MIGVs ZW1lbnRzIGluIEhUTUwgZG9jdW1lbnRzLgorCiAyMDA5LTA1LTI2ICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgpJbmRleDog V2ViQ29yZS94bWwvWFBhdGhTdGVwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3htbC9YUGF0 aFN0ZXAuY3BwCShyZXZpc2lvbiA0NDE4MSkKKysrIFdlYkNvcmUveG1sL1hQYXRoU3RlcC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI3MywxNiArMjczLDIwIEBAIGJvb2wgU3RlcDo6bm9kZU1hdGNo ZXMoTm9kZSogbm9kZSkgY29uc3QKICAgICAgICAgICAgICAgICAvLyBOb2RlIHRlc3Qgb24gdGhl IG5hbWVzcGFjZSBheGlzIGlzIG5vdCBpbXBsZW1lbnRlZCB5ZXQKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKworICAgICAgICAgICAg Ly8gRm9yIG90aGVyIGF4ZXMsIHRoZSBwcmluY2lwYWwgbm9kZSB0eXBlIGlzIGVsZW1lbnQuCisg ICAgICAgICAgICBBU1NFUlQocHJpbWFyeU5vZGVUeXBlKG1fYXhpcykgPT0gTm9kZTo6RUxFTUVO VF9OT0RFKTsKKyAgICAgICAgICAgIGlmIChub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OkVMRU1F TlRfTk9ERSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAgICAgICAgIGlm IChuYW1lID09ICIqIikKLSAgICAgICAgICAgICAgICByZXR1cm4gbm9kZS0+bm9kZVR5cGUoKSA9 PSBwcmltYXJ5Tm9kZVR5cGUobV9heGlzKSAmJiAobmFtZXNwYWNlVVJJLmlzRW1wdHkoKSB8fCBu YW1lc3BhY2VVUkkgPT0gbm9kZS0+bmFtZXNwYWNlVVJJKCkpOworICAgICAgICAgICAgICAgIHJl dHVybiBuYW1lc3BhY2VVUkkuaXNFbXB0eSgpIHx8IG5hbWVzcGFjZVVSSSA9PSBub2RlLT5uYW1l c3BhY2VVUkkoKTsKIAotICAgICAgICAgICAgLy8gV2UgdXNlIHRhZ1FOYW1lIGhlcmUgYmVjYXVz ZSB3ZSBkb24ndCB3YW50IHRoZSBlbGVtZW50IG5hbWUgaW4gdXBwZXJjYXNlIAotICAgICAgICAg ICAgLy8gbGlrZSB3ZSBnZXQgd2l0aCBIVE1MIGVsZW1lbnRzLgotICAgICAgICAgICAgLy8gUGF0 aHMgd2l0aG91dCBuYW1lc3BhY2VzIHNob3VsZCBtYXRjaCBIVE1MIGVsZW1lbnRzIGluIEhUTUwg ZG9jdW1lbnRzIGRlc3BpdGUgdGhvc2UgaGF2aW5nIGFuIFhIVE1MIG5hbWVzcGFjZS4KLSAgICAg ICAgICAgIHJldHVybiBub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERQotICAg ICAgICAgICAgICAgICAgICAmJiBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSktPnRhZ1FOYW1l KCkubG9jYWxOYW1lKCkgPT0gbmFtZQotICAgICAgICAgICAgICAgICAgICAmJiAoKG5vZGUtPmlz SFRNTEVsZW1lbnQoKSAmJiBub2RlLT5kb2N1bWVudCgpLT5pc0hUTUxEb2N1bWVudCgpICYmIG5h bWVzcGFjZVVSSS5pc051bGwoKSkgfHwgbmFtZXNwYWNlVVJJID09IG5vZGUtPm5hbWVzcGFjZVVS SSgpKTsKKyAgICAgICAgICAgIGlmIChub2RlLT5pc0hUTUxFbGVtZW50KCkgJiYgbm9kZS0+ZG9j dW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSkgeworICAgICAgICAgICAgICAgIC8vIFBhdGhzIHdp dGhvdXQgbmFtZXNwYWNlcyBzaG91bGQgbWF0Y2ggSFRNTCBlbGVtZW50cyBpbiBIVE1MIGRvY3Vt ZW50cyBkZXNwaXRlIHRob3NlIGhhdmluZyBhbiBYSFRNTCBuYW1lc3BhY2UuIE5hbWVzIGFyZSBj b21wYXJlZCBjYXNlLWluc2Vuc2l0aXZlbHkuCisgICAgICAgICAgICAgICAgcmV0dXJuIGVxdWFs SWdub3JpbmdDYXNlKHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+bG9jYWxOYW1lKCksIG5h bWUpICYmIChuYW1lc3BhY2VVUkkuaXNOdWxsKCkgfHwgbmFtZXNwYWNlVVJJID09IG5vZGUtPm5h bWVzcGFjZVVSSSgpKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIHJldHVy biBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSktPmhhc0xvY2FsTmFtZShuYW1lKSAmJiBuYW1l c3BhY2VVUkkgPT0gbm9kZS0+bmFtZXNwYWNlVVJJKCk7CiAgICAgICAgIH0KICAgICB9CiAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA0NDE4MSkKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDA5LTA1 LTI3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjUKKyAgICAgICAgWFBhdGggc2hvdWxkIGJlIGNhc2UgaW5z ZW5zaXRpdmUgZm9yIEhUTUwKKworICAgICAgICAqIGZhc3QveHBhdGgvbm9kZS1uYW1lLWNhc2Ut c2Vuc2l0aXZpdHktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3hwYXRoL25v ZGUtbmFtZS1jYXNlLXNlbnNpdGl2aXR5Lmh0bWw6IEFkZGVkLgorCiAyMDA5LTA1LTI2ICBPbGl2 ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2F2aW4g QmFycmFjbG91Z2guCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25vZGUtbmFtZS1jYXNl LXNlbnNpdGl2aXR5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L3hwYXRoL25vZGUtbmFtZS1jYXNlLXNlbnNpdGl2aXR5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2Zhc3QveHBhdGgvbm9kZS1uYW1lLWNhc2Utc2Vuc2l0aXZpdHkt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI2IEBACitzdHJvbmdzdHJvbmdG T09mb28KKworSFRNTCAvLypbQGlkPSJzb21ldGV4dCJdLy9zdHJvbmcKK1BBU1MgcmVzLnNuYXBz aG90TGVuZ3RoIGlzIDIKK0hUTUwgLy8qW0BpZD0ic29tZXRleHQiXS8vU3Ryb25nCitQQVNTIHJl cy5zbmFwc2hvdExlbmd0aCBpcyAyCitIVE1MIC8vKltAaWQ9IlNvbWV0ZXh0Il0vL3N0cm9uZwor UEFTUyByZXMuc25hcHNob3RMZW5ndGggaXMgMAorSFRNTCAvLypbQGlkPSJzb21ldGV4dCJdLy9m b28KK1BBU1MgcmVzLnNuYXBzaG90TGVuZ3RoIGlzIDIKK0hUTUwgLy8qW0BpZD0ic29tZXRleHQi XS8vRk9PCitQQVNTIHJlcy5zbmFwc2hvdExlbmd0aCBpcyAyCitYTUwgLy8qW0BpZD0ic29tZXRl eHQiXS8veDpzdHJvbmcKK1BBU1MgcmVzLnNuYXBzaG90TGVuZ3RoIGlzIDEKK1hNTCAvLypbQGlk PSJzb21ldGV4dCJdLy94OlN0cm9uZworUEFTUyByZXMuc25hcHNob3RMZW5ndGggaXMgMAorWE1M IC8vKltAaWQ9IlNvbWV0ZXh0Il0vL3g6c3Ryb25nCitQQVNTIHJlcy5zbmFwc2hvdExlbmd0aCBp cyAwCitYTUwgLy8qW0BpZD0ic29tZXRleHQiXS8vZm9vCitQQVNTIHJlcy5zbmFwc2hvdExlbmd0 aCBpcyAxCitYTUwgLy8qW0BpZD0ic29tZXRleHQiXS8vRk9PCitQQVNTIHJlcy5zbmFwc2hvdExl bmd0aCBpcyAxCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExF VEUKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9ub2RlLW5h bWUtY2FzZS1zZW5zaXRpdml0eS1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46bWlt ZS10eXBlCiAgICsgdGV4dC9wbGFpbgpOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9ub2RlLW5hbWUtY2FzZS1zZW5zaXRpdml0eS5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgvbm9kZS1uYW1lLWNhc2Ut c2Vuc2l0aXZpdHkuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QveHBhdGgv bm9kZS1uYW1lLWNhc2Utc2Vuc2l0aXZpdHkuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0 NiBAQAorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vanMv cmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0ic29t ZXRleHQiPgorPFNUUk9ORz5zdHJvbmc8L1NUUk9ORz48c3Ryb25nPnN0cm9uZzwvc3Ryb25nPjxG T08+Rk9PPC9GT08+PGZvbz5mb288L2Zvbz4KKzwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2 PgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorCisgICAgZnVuY3Rpb24gdGVzdEhU TUwocXVlcnksIGV4cGVjdGVkQ291bnQpCisgICAgeworICAgICAgICByZXMgPSBkb2N1bWVudC5l dmFsdWF0ZShxdWVyeSwgZG9jdW1lbnQsIGZ1bmN0aW9uKCkgeyByZXR1cm4gImh0dHA6Ly93d3cu dzMub3JnLzE5OTkveGh0bWwiIH0sIFhQYXRoUmVzdWx0LlVOT1JERVJFRF9OT0RFX1NOQVBTSE9U X1RZUEUsIG51bGwpOworICAgICAgICBkZWJ1ZygiSFRNTCAiICsgcXVlcnkpOworICAgICAgICBz aG91bGRCZSgncmVzLnNuYXBzaG90TGVuZ3RoJywgZXhwZWN0ZWRDb3VudCk7CisgICAgfQorCisg ICAgZnVuY3Rpb24gdGVzdFhNTChxdWVyeSwgZXhwZWN0ZWRDb3VudCkKKyAgICB7CisgICAgICAg IHJlcyA9IGRvYy5ldmFsdWF0ZShxdWVyeSwgZG9jLCBmdW5jdGlvbigpIHsgcmV0dXJuICJodHRw Oi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiB9LCBYUGF0aFJlc3VsdC5VTk9SREVSRURfTk9ERV9T TkFQU0hPVF9UWVBFLCBudWxsKTsKKyAgICAgICAgZGVidWcoIlhNTCAiICsgcXVlcnkpOworICAg ICAgICBzaG91bGRCZSgncmVzLnNuYXBzaG90TGVuZ3RoJywgZXhwZWN0ZWRDb3VudCk7CisgICAg fQorCisJdGVzdEhUTUwoJy8vKltAaWQ9InNvbWV0ZXh0Il0vL3N0cm9uZycsICcyJyk7CisJdGVz dEhUTUwoJy8vKltAaWQ9InNvbWV0ZXh0Il0vL1N0cm9uZycsICcyJyk7CisJdGVzdEhUTUwoJy8v KltAaWQ9IlNvbWV0ZXh0Il0vL3N0cm9uZycsICcwJyk7CisJdGVzdEhUTUwoJy8vKltAaWQ9InNv bWV0ZXh0Il0vL2ZvbycsICcyJyk7CisJdGVzdEhUTUwoJy8vKltAaWQ9InNvbWV0ZXh0Il0vL0ZP TycsICcyJyk7CisKKyAgICB2YXIgZG9jID0gKG5ldyBET01QYXJzZXIpLnBhcnNlRnJvbVN0cmlu ZygnPHAgaWQ9InNvbWV0ZXh0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+ PFNUUk9ORz5zdHJvbmc8L1NUUk9ORz48c3Ryb25nPnN0cm9uZzwvc3Ryb25nPjxGT08geG1sbnM9 IiI+Rk9PPC9GT08+PGZvbyB4bWxucz0iIj5mb288L2Zvbz48L3A+JywgJ2FwcGxpY2F0aW9uL3ho dG1sK3htbCcpOworCisJdGVzdFhNTCgnLy8qW0BpZD0ic29tZXRleHQiXS8veDpzdHJvbmcnLCAn MScpOworCXRlc3RYTUwoJy8vKltAaWQ9InNvbWV0ZXh0Il0vL3g6U3Ryb25nJywgJzAnKTsKKwl0 ZXN0WE1MKCcvLypbQGlkPSJTb21ldGV4dCJdLy94OnN0cm9uZycsICcwJyk7CisJdGVzdFhNTCgn Ly8qW0BpZD0ic29tZXRleHQiXS8vZm9vJywgJzEnKTsKKwl0ZXN0WE1MKCcvLypbQGlkPSJzb21l dGV4dCJdLy9GT08nLCAnMScpOworCisgICAgdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7 CisKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5 b3V0VGVzdHMvZmFzdC94cGF0aC9ub2RlLW5hbWUtY2FzZS1zZW5zaXRpdml0eS5odG1sCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KTmFtZTogc3ZuOm1pbWUtdHlwZQogICArIHRleHQvaHRtbAoK