30969 2009-10-30 16:18:09 -0700 A no-prefix XPath node test should not match no-namespace elements in HTML document 2009-11-02 10:42:39 -0800 1 1 1 Unclassified WebKit XML 528+ (Nightly build) All All RESOLVED FIXED P3 Minor --- 1 ap ap hsivonen oldest_to_newest 159507 0 ap 2009-10-30 16:18:09 -0700 Because it matches elements in the default XHTML namespace, and XHTML now says that this should change, see <http://www.w3.org/Bugs/Public/show_bug.cgi?id=7059>. 159509 1 42243 ap 2009-10-30 16:22:22 -0700 Created attachment 42243 proposed patch 159511 2 42243 darin 2009-10-30 16:26:26 -0700 Comment on attachment 42243 proposed patch > - 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()); > + if (node->document()->isHTMLDocument()) { > + if (node->isHTMLElement()) { > + // 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 { > + // An expression without any prefix shouldn't match no-namespace nodes (because HTML5 says so). > + return static_cast<Element*>(node)->hasLocalName(name) && namespaceURI == node->namespaceURI() && !namespaceURI.isNull(); > + } We normally don't do else after return. It would be nice if the test case covered a few more cases than just the bug-fixed one. r=me 159512 3 ap 2009-10-30 16:30:11 -0700 > It would be nice if the test case covered a few more cases than just the > bug-fixed one. We've got a number of tests for namespaces in XPath element node tests - these few lines of code have a long history. 159845 4 ap 2009-11-02 10:42:39 -0800 Committed <http://trac.webkit.org/changeset/50419>. 42243 2009-10-30 16:22:22 -0700 2009-10-30 16:26:25 -0700 proposed patch NullNamespaceXPath.txt text/plain 5054 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDM2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMTAtMzAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwOTY5CisgICAgICAgIEEg bm8tcHJlZml4IFhQYXRoIG5vZGUgdGVzdCBzaG91bGQgbm90IG1hdGNoIG5vLW5hbWVzcGFjZSBl bGVtZW50cyBpbiBIVE1MIGRvY3VtZW50CisKKyAgICAgICAgVGVzdDogZmFzdC94cGF0aC9udWxs LW5hbWVzcGFjZS1pbi1odG1sLmh0bWwKKworICAgICAgICAqIHhtbC9YUGF0aFN0ZXAuY3BwOiAo V2ViQ29yZTo6WFBhdGg6Om5vZGVNYXRjaGVzQmFzaWNUZXN0KTogU3BlY2lhbCBjYXNlIG5vbi1I VE1MIGVsZW1lbnRzCisgICAgICAgIGluIEhUTUwgZG9jdW1lbnRzIChhcyB0aGVzZSBhcmUgdGhl IG9uZXMgdGhhdCBjYW4gaGF2ZSBudWxsIG5hbWVzcGFjZSkuCisKIDIwMDktMTAtMzAgIFpvbHRh biBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3htbC9YUGF0aFN0ZXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUveG1sL1hQYXRoU3RlcC5jcHAJKHJldmlzaW9uIDUwMzYwKQorKysgV2ViQ29yZS94 bWwvWFBhdGhTdGVwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkzLDkgKzE5MywxNCBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgbm9kZU1hdGNoZXNCYXNpY1Rlc3QoCiAgICAgICAgICAgICBpZiAobmFt ZSA9PSBzdGFyQXRvbSkKICAgICAgICAgICAgICAgICByZXR1cm4gbmFtZXNwYWNlVVJJLmlzRW1w dHkoKSB8fCBuYW1lc3BhY2VVUkkgPT0gbm9kZS0+bmFtZXNwYWNlVVJJKCk7CiAKLSAgICAgICAg ICAgIGlmIChub2RlLT5pc0hUTUxFbGVtZW50KCkgJiYgbm9kZS0+ZG9jdW1lbnQoKS0+aXNIVE1M RG9jdW1lbnQoKSkgewotICAgICAgICAgICAgICAgIC8vIFBhdGhzIHdpdGhvdXQgbmFtZXNwYWNl cyBzaG91bGQgbWF0Y2ggSFRNTCBlbGVtZW50cyBpbiBIVE1MIGRvY3VtZW50cyBkZXNwaXRlIHRo b3NlIGhhdmluZyBhbiBYSFRNTCBuYW1lc3BhY2UuIE5hbWVzIGFyZSBjb21wYXJlZCBjYXNlLWlu c2Vuc2l0aXZlbHkuCi0gICAgICAgICAgICAgICAgcmV0dXJuIGVxdWFsSWdub3JpbmdDYXNlKHN0 YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+bG9jYWxOYW1lKCksIG5hbWUpICYmIChuYW1lc3Bh Y2VVUkkuaXNOdWxsKCkgfHwgbmFtZXNwYWNlVVJJID09IG5vZGUtPm5hbWVzcGFjZVVSSSgpKTsK KyAgICAgICAgICAgIGlmIChub2RlLT5kb2N1bWVudCgpLT5pc0hUTUxEb2N1bWVudCgpKSB7Cisg ICAgICAgICAgICAgICAgaWYgKG5vZGUtPmlzSFRNTEVsZW1lbnQoKSkgeworICAgICAgICAgICAg ICAgICAgICAvLyBQYXRocyB3aXRob3V0IG5hbWVzcGFjZXMgc2hvdWxkIG1hdGNoIEhUTUwgZWxl bWVudHMgaW4gSFRNTCBkb2N1bWVudHMgZGVzcGl0ZSB0aG9zZSBoYXZpbmcgYW4gWEhUTUwgbmFt ZXNwYWNlLiBOYW1lcyBhcmUgY29tcGFyZWQgY2FzZS1pbnNlbnNpdGl2ZWx5LgorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2Uoc3RhdGljX2Nhc3Q8RWxlbWVudCo+ KG5vZGUpLT5sb2NhbE5hbWUoKSwgbmFtZSkgJiYgKG5hbWVzcGFjZVVSSS5pc051bGwoKSB8fCBu YW1lc3BhY2VVUkkgPT0gbm9kZS0+bmFtZXNwYWNlVVJJKCkpOworICAgICAgICAgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEFuIGV4cHJlc3Npb24gd2l0aG91dCBhbnkg cHJlZml4IHNob3VsZG4ndCBtYXRjaCBuby1uYW1lc3BhY2Ugbm9kZXMgKGJlY2F1c2UgSFRNTDUg c2F5cyBzbykuCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxFbGVtZW50 Kj4obm9kZSktPmhhc0xvY2FsTmFtZShuYW1lKSAmJiBuYW1lc3BhY2VVUkkgPT0gbm9kZS0+bmFt ZXNwYWNlVVJJKCkgJiYgIW5hbWVzcGFjZVVSSS5pc051bGwoKTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RWxlbWVudCo+ KG5vZGUpLT5oYXNMb2NhbE5hbWUobmFtZSkgJiYgbmFtZXNwYWNlVVJJID09IG5vZGUtPm5hbWVz cGFjZVVSSSgpOwogICAgICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDM2NykKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDA5LTEw LTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMDk2OQorICAgICAgICBBIG5vLXByZWZpeCBYUGF0aCBub2RlIHRl c3Qgc2hvdWxkIG5vdCBtYXRjaCBuby1uYW1lc3BhY2UgZWxlbWVudHMgaW4gSFRNTCBkb2N1bWVu dAorCisgICAgICAgICogZmFzdC94cGF0aC9udWxsLW5hbWVzcGFjZS1pbi1odG1sLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC94cGF0aC9udWxsLW5hbWVzcGFjZS1pbi1odG1s Lmh0bWw6IEFkZGVkLgorCiAyMDA5LTEwLTMwICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L3hwYXRoL251bGwtbmFtZXNwYWNlLWluLWh0bWwtZXhwZWN0ZWQudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgvbnVsbC1uYW1lc3BhY2UtaW4taHRtbC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL251bGwt bmFtZXNwYWNlLWluLWh0bWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDcg QEAKK1RoaXMgdGVzdHMgdGhhdCBYUGF0aCBleHByZXNzaW9ucyB3aXRoIHByZWZpeGVzIHdvcmsg Y29ycmVjdGx5LgorCitQQVNTIC8vZGl2CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFz dC94cGF0aC9udWxsLW5hbWVzcGFjZS1pbi1odG1sLWV4cGVjdGVkLnR4dApfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5h bWU6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L3BsYWluCk5hbWU6IHN2bjplb2wtc3R5bGUKICAg KyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL251bGwtbmFtZXNwYWNlLWlu LWh0bWwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL251bGwtbmFt ZXNwYWNlLWluLWh0bWwuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QveHBh dGgvbnVsbC1uYW1lc3BhY2UtaW4taHRtbC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI0 IEBACis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9y ZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0ieHBhdGgtdGVzdC1wcmUu anMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3RzIHRoYXQgWFBhdGgg ZXhwcmVzc2lvbnMgd2l0aCBwcmVmaXhlcyB3b3JrIGNvcnJlY3RseS48L3A+Cis8ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CisgICAgdmFyIHhtbFN0cmluZyA9ICc8ZGl2Lz4nOwor ICAgIHZhciBkb2MgPSAobmV3IERPTVBhcnNlcigpKS5wYXJzZUZyb21TdHJpbmcoeG1sU3RyaW5n LCAidGV4dC94bWwiKTsKKyAgICBkb2N1bWVudC5ib2R5Lmluc2VydEJlZm9yZShkb2N1bWVudC5p bXBvcnROb2RlKGRvYy5kb2N1bWVudEVsZW1lbnQsIG51bGwpLCBkb2N1bWVudC5ib2R5LmZpcnN0 Q2hpbGQpOworCisgICAgdmFyIGV4cHIgPSBkb2N1bWVudC5jcmVhdGVFeHByZXNzaW9uKCIvL2Rp diIsIG51bGwpOworICAgIHZhciByZXN1bHQgPSBleHByLmV2YWx1YXRlKGRvY3VtZW50LmRvY3Vt ZW50RWxlbWVudCwgWFBhdGhSZXN1bHQuT1JERVJFRF9OT0RFX1NOQVBTSE9UX1RZUEUsIG51bGwp OworICAgIGNoZWNrU25hcHNob3QoIi8vZGl2IiwgcmVzdWx0LCBbZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImNvbnNvbGUiKV0pOworCisgICAgdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7 CisKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5 b3V0VGVzdHMvZmFzdC94cGF0aC9udWxsLW5hbWVzcGFjZS1pbi1odG1sLmh0bWwKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpOYW1lOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9odG1sCgo=