54269 2011-02-10 20:56:54 -0800 Convert ContainerNode::firstElementChild() to a free function. 2011-02-10 23:22:14 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 aestes aestes aestes commit-queue darin eric oldest_to_newest 349613 0 aestes 2011-02-10 20:56:54 -0800 Convert ContainerNode::firstElementChild() to a free function. 349621 1 82097 aestes 2011-02-10 21:15:39 -0800 Created attachment 82097 Patch 349625 2 82097 eric 2011-02-10 21:21:35 -0800 Comment on attachment 82097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82097&action=review > Source/WebCore/dom/Element.cpp:1657 > + return WebCore::firstElementChild(this); We don't generally use WebCore:: > Source/WebCore/dom/Element.h:518 > +inline Element* firstElementChild(const ContainerNode* container) Shouldn't Element::firstElementChild() call this? Wow, this is also one of the rare cases where a const Node* might actually be correct! (Normally such a wrong since it makes little sense to have a const* to a RefCounted object.) 349627 3 82097 aestes 2011-02-10 21:23:41 -0800 Comment on attachment 82097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82097&action=review >> Source/WebCore/dom/Element.cpp:1657 >> + return WebCore::firstElementChild(this); > > We don't generally use WebCore:: I have to do that since the name in the class scope shadows the name in the namespace scope. I guess I could name the free function something else to avoid this. >> Source/WebCore/dom/Element.h:518 >> +inline Element* firstElementChild(const ContainerNode* container) > > Shouldn't Element::firstElementChild() call this? > > Wow, this is also one of the rare cases where a const Node* might actually be correct! (Normally such a wrong since it makes little sense to have a const* to a RefCounted object.) It does call it :) 349628 4 82097 eric 2011-02-10 21:29:06 -0800 Comment on attachment 82097 Patch Andy, you're just so far ahead of me I can't even see you! 349659 5 82097 commit-queue 2011-02-10 23:22:09 -0800 Comment on attachment 82097 Patch Clearing flags on attachment: 82097 Committed r78317: <http://trac.webkit.org/changeset/78317> 349660 6 commit-queue 2011-02-10 23:22:14 -0800 All reviewed patches have been landed. Closing bug. 82097 2011-02-10 21:15:39 -0800 2011-02-10 23:22:09 -0800 Patch bug-54269-20110210211538.patch text/plain 5099 aestes SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MzA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDItMTAgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENvbnZlcnQgQ29udGFpbmVyTm9kZTo6Zmlyc3RFbGVtZW50Q2hpbGQo KSB0byBhIGZyZWUgZnVuY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01NDI2OQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGlu IGJlaGF2aW9yLgorICAgICAgICAKKyAgICAgICAgSXQgc2VlbWVkIGluY29ycmVjdCB0byBoYXZl IGEgbWV0aG9kIG9uIENvbnRhaW5lck5vZGUgdGhhdCBoYWQgdGhlCisgICAgICAgIGNvbmNlcHQg b2YgYW4gRWxlbWVudCBidXQgY291bGRuJ3QgcmV0dXJuIGFuIEVsZW1lbnQqLCBidXQgYSBtZXRo b2Qgb24KKyAgICAgICAgRWxlbWVudCBjb3VsZCBub3QgYmUgY2FsbGVkIGJ5IGhvbGRlcnMgb2Yg Q29udGFpbmVyTm9kZXMgb3Igb3RoZXIKKyAgICAgICAgbm9uLUVsZW1lbnQgQ29udGFpbmVyTm9k ZSBzdWJjbGFzc2VzLiBBIGZyZWUgZnVuY3Rpb24gY2FuIGJvdGggcmV0dXJuCisgICAgICAgIGFu IEVsZW1lbnQqIGFuZCBiZSBjYWxsZWQgYnkgYW55b25lIHdpdGggYSBDb250YWluZXJOb2RlKi4K KworICAgICAgICAqIGRvbS9Db250YWluZXJOb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250 YWluZXJOb2RlOjpsYXN0Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6bGFzdENoaWxk KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OmNhY2hlRG9jdW1lbnRFbGVtZW50KToKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpmaXJzdEVsZW1lbnRDaGlsZCk6CisgICAgICAgICog ZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OmZpcnN0RWxlbWVudENoaWxkKToKKyAg ICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTFRyZWVCdWlsZGVyOjpGcmFnbWVudFBhcnNpbmdDb250ZXh0OjpmaW5pc2hlZCk6CisK IDIwMTEtMDItMTAgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v Q29udGFpbmVyTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWlu ZXJOb2RlLmgJKHJldmlzaW9uIDc4Mjk4KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5l ck5vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNiBAQCBwdWJsaWM6CiAKICAgICBO b2RlKiBmaXJzdENoaWxkKCkgY29uc3QgeyByZXR1cm4gbV9maXJzdENoaWxkOyB9CiAgICAgTm9k ZSogbGFzdENoaWxkKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0Q2hpbGQ7IH0KLSAgICBDb250YWlu ZXJOb2RlKiBmaXJzdEVsZW1lbnRDaGlsZCgpIGNvbnN0OwogCiAgICAgYm9vbCBpbnNlcnRCZWZv cmUoUGFzc1JlZlB0cjxOb2RlPiBuZXdDaGlsZCwgTm9kZSogcmVmQ2hpbGQsIEV4Y2VwdGlvbkNv ZGUmLCBib29sIHNob3VsZExhenlBdHRhY2ggPSBmYWxzZSk7CiAgICAgYm9vbCByZXBsYWNlQ2hp bGQoUGFzc1JlZlB0cjxOb2RlPiBuZXdDaGlsZCwgTm9kZSogb2xkQ2hpbGQsIEV4Y2VwdGlvbkNv ZGUmLCBib29sIHNob3VsZExhenlBdHRhY2ggPSBmYWxzZSk7CkBAIC0xNzAsMTQgKzE2OSw2IEBA IGlubGluZSBOb2RlKiBOb2RlOjpsYXN0Q2hpbGQoKSBjb25zdAogICAgICAgICByZXR1cm4gMDsK ICAgICByZXR1cm4gdG9Db250YWluZXJOb2RlKHRoaXMpLT5sYXN0Q2hpbGQoKTsKIH0KLSAgICAK LWlubGluZSBDb250YWluZXJOb2RlKiBDb250YWluZXJOb2RlOjpmaXJzdEVsZW1lbnRDaGlsZCgp IGNvbnN0Ci17Ci0gICAgTm9kZSogY2hpbGQgPSBmaXJzdENoaWxkKCk7Ci0gICAgd2hpbGUgKGNo aWxkICYmICFjaGlsZC0+aXNFbGVtZW50Tm9kZSgpKQotICAgICAgICBjaGlsZCA9IGNoaWxkLT5u ZXh0U2libGluZygpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxDb250YWluZXJOb2RlKj4oY2hp bGQpOwotfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAkocmV2aXNpb24gNzgyOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiRG9jdW1lbnRU eXBlLmgiCiAjaW5jbHVkZSAiRWRpdGluZ1RleHQuaCIKICNpbmNsdWRlICJFZGl0b3IuaCIKKyNp bmNsdWRlICJFbGVtZW50LmgiCiAjaW5jbHVkZSAiRW50aXR5UmVmZXJlbmNlLmgiCiAjaW5jbHVk ZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKQEAgLTcwNSw3ICs3MDYsNyBA QCB2b2lkIERvY3VtZW50OjpjaGlsZHJlbkNoYW5nZWQoYm9vbCBjaGFuCiB2b2lkIERvY3VtZW50 OjpjYWNoZURvY3VtZW50RWxlbWVudCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFtX2RvY3VtZW50 RWxlbWVudCk7Ci0gICAgbV9kb2N1bWVudEVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4o Zmlyc3RFbGVtZW50Q2hpbGQoKSk7CisgICAgbV9kb2N1bWVudEVsZW1lbnQgPSBmaXJzdEVsZW1l bnRDaGlsZCh0aGlzKTsKIH0KIAogUGFzc1JlZlB0cjxFbGVtZW50PiBEb2N1bWVudDo6Y3JlYXRl RWxlbWVudChjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQpJbmRl eDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gNzgyOTgpCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NTQsMTAgKzE2NTQsNyBAQCB2 b2lkIEVsZW1lbnQ6Om5vcm1hbGl6ZUF0dHJpYnV0ZXMoKQogLy8gRWxlbWVudFRyYXZlcnNhbCBB UEkKIEVsZW1lbnQqIEVsZW1lbnQ6OmZpcnN0RWxlbWVudENoaWxkKCkgY29uc3QKIHsKLSAgICBO b2RlKiBuID0gZmlyc3RDaGlsZCgpOwotICAgIHdoaWxlIChuICYmICFuLT5pc0VsZW1lbnROb2Rl KCkpCi0gICAgICAgIG4gPSBuLT5uZXh0U2libGluZygpOwotICAgIHJldHVybiBzdGF0aWNfY2Fz dDxFbGVtZW50Kj4obik7CisgICAgcmV0dXJuIFdlYkNvcmU6OmZpcnN0RWxlbWVudENoaWxkKHRo aXMpOwogfQogCiBFbGVtZW50KiBFbGVtZW50OjpsYXN0RWxlbWVudENoaWxkKCkgY29uc3QKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuaAkocmV2aXNpb24gNzgyOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01MTQsNiArNTE0LDE1IEBAIGlubGluZSBj b25zdCBBdG9taWNTdHJpbmcmIEVsZW1lbnQ6OnNoYWQKIHsKICAgICByZXR1cm4gbnVsbEF0b207 CiB9CisgICAgCitpbmxpbmUgRWxlbWVudCogZmlyc3RFbGVtZW50Q2hpbGQoY29uc3QgQ29udGFp bmVyTm9kZSogY29udGFpbmVyKQoreworICAgIEFTU0VSVF9BUkcoY29udGFpbmVyLCBjb250YWlu ZXIpOworICAgIE5vZGUqIGNoaWxkID0gY29udGFpbmVyLT5maXJzdENoaWxkKCk7CisgICAgd2hp bGUgKGNoaWxkICYmICFjaGlsZC0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICBjaGlsZCA9IGNo aWxkLT5uZXh0U2libGluZygpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oY2hp bGQpOworfQogCiB9IC8vIG5hbWVzcGFjZQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAJKHJldmlzaW9uIDc4Mjk4KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDE3LDcgKzQxNyw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpGcmFnbWVudFBhcnNpbmdD b24KICAgICAKICAgICAvLyBUaGUgSFRNTDUgc3BlYyBzYXlzIHRvIHJldHVybiB0aGUgY2hpbGRy ZW4gb2YgdGhlIGZyYWdtZW50J3MgZG9jdW1lbnQKICAgICAvLyBlbGVtZW50IHdoZW4gdGhlcmUg aXMgYSBjb250ZXh0IGVsZW1lbnQgKDEwLjQuNykuCi0gICAgUmVmUHRyPENvbnRhaW5lck5vZGU+ IGRvY3VtZW50RWxlbWVudCA9IG1fZnJhZ21lbnQtPmZpcnN0RWxlbWVudENoaWxkKCk7CisgICAg UmVmUHRyPENvbnRhaW5lck5vZGU+IGRvY3VtZW50RWxlbWVudCA9IGZpcnN0RWxlbWVudENoaWxk KG1fZnJhZ21lbnQpOwogICAgIG1fZnJhZ21lbnQtPnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgQVNT RVJUKGRvY3VtZW50RWxlbWVudCk7CiAgICAgbV9mcmFnbWVudC0+dGFrZUFsbENoaWxkcmVuRnJv bShkb2N1bWVudEVsZW1lbnQuZ2V0KCkpOwo=