176671 2017-09-10 11:51:55 -0700 Refactor Document::updateTitleElement to use traits instead of function pointers 2017-09-27 12:32:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin buildbot cdumez commit-queue dbates esprehn+autocc kangil.han koivisto sam webkit-bug-importer oldest_to_newest 1347257 0 darin 2017-09-10 11:51:55 -0700 Refactor Document::updateTitleElement to use traits instead of function pointers 1347258 1 320399 darin 2017-09-10 11:54:08 -0700 Created attachment 320399 Patch 1347277 2 darin 2017-09-10 13:38:39 -0700 Seems like too much attention for a small amount of code, but I could not resist. Antti, maybe this is even better than the last version? 1347294 3 320399 koivisto 2017-09-10 15:05:02 -0700 Comment on attachment 320399 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320399&action=review > Source/WebCore/dom/Document.cpp:1545 > +template<typename> struct TitleTraits; I feel using templates to implement two not-very-complicated cases is bit much but it is an improvement. 1347299 4 320399 commit-queue 2017-09-10 15:18:03 -0700 Comment on attachment 320399 Patch Clearing flags on attachment: 320399 Committed r221838: <http://trac.webkit.org/changeset/221838> 1347300 5 commit-queue 2017-09-10 15:18:05 -0700 All reviewed patches have been landed. Closing bug. 1353463 6 webkit-bug-importer 2017-09-27 12:32:58 -0700 <rdar://problem/34693468> 320399 2017-09-10 11:54:08 -0700 2017-09-10 15:18:03 -0700 Patch bug-176671-20170910115407.patch text/plain 5678 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxODM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgxMmZlNzU5YmUwYzc1 YTNmYjZjZWE2NDdiMjNiZTdkZjdlM2FmZi4uNjE4YzIyYzYyNjFkODdmMmQ0ZmQ2MmUzNWY2NGRi YWY1ZmVkMjg2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA5LTEwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBEb2N1bWVudDo6 dXBkYXRlVGl0bGVFbGVtZW50IHRvIHVzZSB0cmFpdHMgaW5zdGVhZCBvZiBmdW5jdGlvbiBwb2lu dGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2 NjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyB0ZW1wbGF0ZSBpbXBsZW1lbnRhdGlvbiBzZWVtcyBzbGlnaHRseSBtb3JlIHJlYWRhYmxlIGFu ZAorICAgICAgICBhbHNvIGxpa2VseSB0byBiZSBzbGlnaHRseSBtb3JlIGVmZmljaWVudC4gQWxz byB0YWtlcyBhIHN1Z2dlc3Rpb24KKyAgICAgICAgZnJvbSBBbnR0aSBvZiBmYWN0b3Jpbmcgb3V0 IHRoZSAic2VsZWN0IGEgbmV3IHRpdGxlIGVsZW1lbnQiIGludG8gYQorICAgICAgICBmdW5jdGlv biwgd2hpY2ggaXMgYSBuYXR1cmFsIHRoaW5nIHRvIGRvIGluIHRoaXMgdmVyc2lvbi4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaXRsZVRyYWl0czxI VE1MVGl0bGVFbGVtZW50Pjo6aXNJbkVsaWdpYmxlTG9jYXRpb24pOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OlRpdGxlVHJhaXRzPEhUTUxUaXRsZUVsZW1lbnQ+OjpmaW5kVGl0bGVFbGVtZW50 KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpUaXRsZVRyYWl0czxTVkdUaXRsZUVsZW1lbnQ+ Ojppc0luRWxpZ2libGVMb2NhdGlvbik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6VGl0bGVU cmFpdHM8U1ZHVGl0bGVFbGVtZW50Pjo6ZmluZFRpdGxlRWxlbWVudCk6IEFkZGVkLgorICAgICAg ICAoV2ViQ29yZTo6c2VsZWN0TmV3VGl0bGVFbGVtZW50KTogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpmaW5kSFRNTFRpdGxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFRp dGxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFRpdGxlRWxpZ2libGUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6ZmluZFNWR1RpdGxlKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OmlzU1ZHVGl0bGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6aXNT VkdUaXRsZUVsaWdpYmxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1 cGRhdGVUaXRsZUVsZW1lbnQpOiBDYWxsIHNlbGVjdE5ld1RpdGxlRWxlbWVudAorICAgICAgICBp bnN0ZWFkIG9mIGhhdmluZyB0aGUgbG9naWMgaGVyZS4KKwogMjAxNy0wOS0wOCAgRGVhbiBKYWNr c29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgZ2wuZGV0YWNoU2hhZGVyIGJyZWFrcyBz aGFkZXIgcHJvZ3JhbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggZGUyZjNiYTZlYzZjN2Yz ZjE2YzM5NGQ0OTRkZTBjMTMwY2Y0NmE2ZC4uNTM4ODkzNzQwYjdjNDIxYjQzN2UxYzIxNmNiNjEy ZjhiNTA3YjRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xNTQyLDYzICsxNTQyLDQ3 IEBAIHZvaWQgRG9jdW1lbnQ6OnNldFRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpCiAgICAgICAg IHVwZGF0ZVRpdGxlKHsgdGl0bGUsIExUUiB9KTsKIH0KIAotc3RhdGljIEVsZW1lbnQqIGZpbmRI VE1MVGl0bGUoRG9jdW1lbnQmIGRvY3VtZW50KQotewotICAgIHJldHVybiBkZXNjZW5kYW50c09m VHlwZTxIVE1MVGl0bGVFbGVtZW50Pihkb2N1bWVudCkuZmlyc3QoKTsKLX07Cit0ZW1wbGF0ZTx0 eXBlbmFtZT4gc3RydWN0IFRpdGxlVHJhaXRzOwogCi1zdGF0aWMgYm9vbCBpc0hUTUxUaXRsZShF bGVtZW50JiBlbGVtZW50KQotewotICAgIHJldHVybiBpczxIVE1MVGl0bGVFbGVtZW50PihlbGVt ZW50KTsKK3RlbXBsYXRlPD4gc3RydWN0IFRpdGxlVHJhaXRzPEhUTUxUaXRsZUVsZW1lbnQ+IHsK KyAgICBzdGF0aWMgYm9vbCBpc0luRWxpZ2libGVMb2NhdGlvbihIVE1MVGl0bGVFbGVtZW50JiBl bGVtZW50KSB7IHJldHVybiBlbGVtZW50LmlzQ29ubmVjdGVkKCkgJiYgIWVsZW1lbnQuaXNJblNo YWRvd1RyZWUoKTsgfQorICAgIHN0YXRpYyBIVE1MVGl0bGVFbGVtZW50KiBmaW5kVGl0bGVFbGVt ZW50KERvY3VtZW50JiBkb2N1bWVudCkgeyByZXR1cm4gZGVzY2VuZGFudHNPZlR5cGU8SFRNTFRp dGxlRWxlbWVudD4oZG9jdW1lbnQpLmZpcnN0KCk7IH0KIH07CiAKLXN0YXRpYyBib29sIGlzSFRN TFRpdGxlRWxpZ2libGUoRWxlbWVudCYgZWxlbWVudCkKLXsKLSAgICByZXR1cm4gZWxlbWVudC5p c0Nvbm5lY3RlZCgpICYmICFlbGVtZW50LmlzSW5TaGFkb3dUcmVlKCk7Cit0ZW1wbGF0ZTw+IHN0 cnVjdCBUaXRsZVRyYWl0czxTVkdUaXRsZUVsZW1lbnQ+IHsKKyAgICBzdGF0aWMgYm9vbCBpc0lu RWxpZ2libGVMb2NhdGlvbihTVkdUaXRsZUVsZW1lbnQmIGVsZW1lbnQpIHsgcmV0dXJuIGVsZW1l bnQucGFyZW50Tm9kZSgpID09IGVsZW1lbnQuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKTsg fQorICAgIHN0YXRpYyBTVkdUaXRsZUVsZW1lbnQqIGZpbmRUaXRsZUVsZW1lbnQoRG9jdW1lbnQm IGRvY3VtZW50KSB7IHJldHVybiBjaGlsZHJlbk9mVHlwZTxTVkdUaXRsZUVsZW1lbnQ+KCpkb2N1 bWVudC5kb2N1bWVudEVsZW1lbnQoKSkuZmlyc3QoKTsgfQogfTsKIAotc3RhdGljIEVsZW1lbnQq IGZpbmRTVkdUaXRsZShEb2N1bWVudCYgZG9jdW1lbnQpCit0ZW1wbGF0ZTx0eXBlbmFtZSBUaXRs ZUVsZW1lbnQ+IEVsZW1lbnQqIHNlbGVjdE5ld1RpdGxlRWxlbWVudChEb2N1bWVudCYgZG9jdW1l bnQsIEVsZW1lbnQqIG9sZFRpdGxlRWxlbWVudCwgRWxlbWVudCYgY2hhbmdpbmdUaXRsZUVsZW1l bnQpCiB7Ci0gICAgcmV0dXJuIGNoaWxkcmVuT2ZUeXBlPFNWR1RpdGxlRWxlbWVudD4oKmRvY3Vt ZW50LmRvY3VtZW50RWxlbWVudCgpKS5maXJzdCgpOwotfTsKKyAgICB1c2luZyBUcmFpdHMgPSBU aXRsZVRyYWl0czxUaXRsZUVsZW1lbnQ+OwogCi1zdGF0aWMgYm9vbCBpc1NWR1RpdGxlKEVsZW1l bnQmIGVsZW1lbnQpCi17Ci0gICAgcmV0dXJuIGlzPFNWR1RpdGxlRWxlbWVudD4oZWxlbWVudCk7 Ci19OworICAgIGlmICghaXM8VGl0bGVFbGVtZW50PihjaGFuZ2luZ1RpdGxlRWxlbWVudCkpIHsK KyAgICAgICAgQVNTRVJUKG9sZFRpdGxlRWxlbWVudCA9PSBUcmFpdHM6OmZpbmRUaXRsZUVsZW1l bnQoZG9jdW1lbnQpKTsKKyAgICAgICAgcmV0dXJuIG9sZFRpdGxlRWxlbWVudDsKKyAgICB9CiAK LXN0YXRpYyBib29sIGlzU1ZHVGl0bGVFbGlnaWJsZShFbGVtZW50JiBlbGVtZW50KQotewotICAg IHJldHVybiBlbGVtZW50LnBhcmVudE5vZGUoKSA9PSBlbGVtZW50LmRvY3VtZW50KCkuZG9jdW1l bnRFbGVtZW50KCk7Ci19OworICAgIGlmIChvbGRUaXRsZUVsZW1lbnQpCisgICAgICAgIHJldHVy biBUcmFpdHM6OmZpbmRUaXRsZUVsZW1lbnQoZG9jdW1lbnQpOworCisgICAgLy8gT3B0aW1pemVk IGNvbW1vbiBjYXNlOiBXZSBoYXZlIG5vIHRpdGxlIGVsZW1lbnQgeWV0LgorICAgIC8vIFdlIGNh biBmaWd1cmUgb3V0IHdoaWNoIHRpdGxlIGVsZW1lbnQgc2hvdWxkIGJlIHVzZWQgd2l0aG91dCBz ZWFyY2hpbmcuCisgICAgYm9vbCBpc0VsaWdpYmxlID0gVHJhaXRzOjppc0luRWxpZ2libGVMb2Nh dGlvbihkb3duY2FzdDxUaXRsZUVsZW1lbnQ+KGNoYW5naW5nVGl0bGVFbGVtZW50KSk7CisgICAg YXV0byogbmV3VGl0bGVFbGVtZW50ID0gaXNFbGlnaWJsZSA/ICZjaGFuZ2luZ1RpdGxlRWxlbWVu dCA6IG51bGxwdHI7CisgICAgQVNTRVJUKG5ld1RpdGxlRWxlbWVudCA9PSBUcmFpdHM6OmZpbmRU aXRsZUVsZW1lbnQoZG9jdW1lbnQpKTsKKyAgICByZXR1cm4gbmV3VGl0bGVFbGVtZW50OworfQog CiB2b2lkIERvY3VtZW50Ojp1cGRhdGVUaXRsZUVsZW1lbnQoRWxlbWVudCYgY2hhbmdpbmdUaXRs ZUVsZW1lbnQpCiB7CiAgICAgLy8gTW9zdCBkb2N1bWVudHMgdXNlIEhUTUwgdGl0bGUgcnVsZXMu CiAgICAgLy8gRG9jdW1lbnRzIHdpdGggU1ZHIGRvY3VtZW50IGVsZW1lbnRzIHVzZSBTVkcgdGl0 bGUgcnVsZXMuCi0gICAgYm9vbCB1c2VTVkdUaXRsZSA9IGlzPFNWR1NWR0VsZW1lbnQ+KGRvY3Vt ZW50RWxlbWVudCgpKTsKLSAgICBhdXRvIGZpbmRUaXRsZSA9IHVzZVNWR1RpdGxlID8gZmluZFNW R1RpdGxlIDogZmluZEhUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0bGUgPSB1c2VTVkdUaXRsZSA/ IGlzU1ZHVGl0bGUgOiBpc0hUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0bGVFbGlnaWJsZSA9IHVz ZVNWR1RpdGxlID8gaXNTVkdUaXRsZUVsaWdpYmxlIDogaXNIVE1MVGl0bGVFbGlnaWJsZTsKLQot ICAgIGlmICghaXNUaXRsZShjaGFuZ2luZ1RpdGxlRWxlbWVudCkpIHsKLSAgICAgICAgQVNTRVJU KG1fdGl0bGVFbGVtZW50ID09IGZpbmRUaXRsZSgqdGhpcykpOwotICAgICAgICByZXR1cm47Ci0g ICAgfQotCi0gICAgRWxlbWVudCogbmV3VGl0bGVFbGVtZW50OwotICAgIGlmIChtX3RpdGxlRWxl bWVudCkKLSAgICAgICAgbmV3VGl0bGVFbGVtZW50ID0gZmluZFRpdGxlKCp0aGlzKTsKLSAgICBl bHNlIHsKLSAgICAgICAgLy8gT3B0aW1pemVkIGNvbW1vbiBjYXNlOiBXZSBoYXZlIG5vIHRpdGxl IGVsZW1lbnQgeWV0LgotICAgICAgICAvLyBXZSBjYW4gZmlndXJlIG91dCB3aGljaCB0aXRsZSBl bGVtZW50IHNob3VsZCBiZSB1c2VkIHdpdGhvdXQgc2VhcmNoaW5nLgotICAgICAgICBuZXdUaXRs ZUVsZW1lbnQgPSBpc1RpdGxlRWxpZ2libGUoY2hhbmdpbmdUaXRsZUVsZW1lbnQpID8gJmNoYW5n aW5nVGl0bGVFbGVtZW50IDogbnVsbHB0cjsKLSAgICAgICAgQVNTRVJUKG5ld1RpdGxlRWxlbWVu dCA9PSBmaW5kVGl0bGUoKnRoaXMpKTsKLSAgICB9Ci0KKyAgICBhdXRvIHNlbGVjdFRpdGxlRWxl bWVudCA9IGlzPFNWR1NWR0VsZW1lbnQ+KGRvY3VtZW50RWxlbWVudCgpKQorICAgICAgICA/IHNl bGVjdE5ld1RpdGxlRWxlbWVudDxTVkdUaXRsZUVsZW1lbnQ+IDogc2VsZWN0TmV3VGl0bGVFbGVt ZW50PEhUTUxUaXRsZUVsZW1lbnQ+OworICAgIGF1dG8gbmV3VGl0bGVFbGVtZW50ID0gc2VsZWN0 VGl0bGVFbGVtZW50KCp0aGlzLCBtX3RpdGxlRWxlbWVudC5nZXQoKSwgY2hhbmdpbmdUaXRsZUVs ZW1lbnQpOwogICAgIGlmIChtX3RpdGxlRWxlbWVudCA9PSBuZXdUaXRsZUVsZW1lbnQpCiAgICAg ICAgIHJldHVybjsKLQogICAgIG1fdGl0bGVFbGVtZW50ID0gbmV3VGl0bGVFbGVtZW50OwogICAg IHVwZGF0ZVRpdGxlRnJvbVRpdGxlRWxlbWVudCgpOwogfQo=