103474 2012-11-27 18:04:01 -0800 [Refactoring] HasSelectorForClassStyleFunctor in Element.cpp seems verbose 2012-11-28 02:52:24 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100738 1 shinyak shinyak cmarcelo koivisto ojan webcomponents-bugzilla webkit.review.bot oldest_to_newest 777432 0 shinyak 2012-11-27 18:04:01 -0800 This is a follow-up bug for Bug 100738. The added code seems verbose, so let's make it simple. 777457 1 176384 shinyak 2012-11-27 19:01:02 -0800 Created attachment 176384 Patch 777458 2 176384 morrita 2012-11-27 19:02:19 -0800 Comment on attachment 176384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176384&action=review > Source/WebCore/dom/Element.cpp:839 > +template<typename T> Could you give more descriptive name instead of T? 777476 3 176387 shinyak 2012-11-27 20:14:55 -0800 Created attachment 176387 Patch 777487 4 176387 webkit.review.bot 2012-11-27 20:38:09 -0800 Comment on attachment 176387 Patch Clearing flags on attachment: 176387 Committed r135967: <http://trac.webkit.org/changeset/135967> 777488 5 webkit.review.bot 2012-11-27 20:38:14 -0800 All reviewed patches have been landed. Closing bug. 777674 6 koivisto 2012-11-28 02:52:24 -0800 Much better! 176384 2012-11-27 19:01:02 -0800 2012-11-27 20:14:51 -0800 Patch bug-103474-20121128115838.patch text/plain 7228 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTNlYzc1NTA1Y2QwZjQ5 NGM4MTJlN2ViYTc4M2FjZTNjMDU2NjJiMi4uNTg4NDBlZWJhMmNmMTM1OTk3ODc5MmU3MDI0YjE3 ODE5ZDEyNmNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTI3ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBbUmVmYWN0b3Jp bmddIEhhc1NlbGVjdG9yRm9yQ2xhc3NTdHlsZUZ1bmN0b3IgaW4gRWxlbWVudC5jcHAgc2VlbXMg dmVyYm9zZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzNDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGNvZGUgaW50cm9kdWNlZCBpbiByMTM1MTc0IGxvb2tzIHZlcmJvc2UuIFdlIHdvdWxkIGxp a2UgdG8gbWFrZSBpdCBzaW1wbGVyLgorICAgICAgICBXZSBoYXZlIHJlbW92ZWQgc2V2ZXJhbCBp bmxpbmUgZnVuY3Rpb25zIGFuZCB1bm5lY2Vzc2FyeSBzdHJ1Y3RzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpjaGVja1NlbGVjdG9yRm9y Q2xhc3NDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y2xhc3NBdHRyaWJ1dGVD aGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNob3VsZEludmFsaWRhdGVEaXN0 cmlidXRpb25XaGVuQXR0cmlidXRlQ2hhbmdlZCk6CisKIDIwMTItMTEtMjcgIEFuZHJlYXMgS2xp bmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBpbGUgdGltZSBzaXplIGFzc2Vy dGlvbnMgZm9yIFRyZWVTY29wZSwgU2hhZG93Um9vdCBhbmQgRWxlbWVudEF0dHJpYnV0ZURhdGEu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggMTQ2YzJiZjZiNjE4OGEwY2M3M2U2NmU5NzAwMzgy YTg3ZTgyOWQyNy4uZWE4M2NkODBiNzk0YzA1NjgyM2Q4NzUwOTQ1YWMyYTliMDQ0MjJlMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcApAQCAtODI1LDQ5ICs4MjUsMjMgQEAgc3RhdGljIGlubGluZSBi b29sIGNsYXNzU3RyaW5nSGFzQ2xhc3NOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmV3Q2xhc3NT dHJpbmcpCiAgICAgcmV0dXJuIGNsYXNzU3RyaW5nSGFzQ2xhc3NOYW1lKG5ld0NsYXNzU3RyaW5n LmNoYXJhY3RlcnMxNigpLCBsZW5ndGgpOwogfQogCi1zdHJ1Y3QgSGFzU2VsZWN0b3JGb3JDbGFz c1N0eWxlRnVuY3RvciB7Ci0gICAgZXhwbGljaXQgSGFzU2VsZWN0b3JGb3JDbGFzc1N0eWxlRnVu Y3RvcihTdHlsZVJlc29sdmVyKiByZXNvbHZlcikKLSAgICAgICAgOiBzdHlsZVJlc29sdmVyKHJl c29sdmVyKQotICAgIHsgfQotCi0gICAgYm9vbCBvcGVyYXRvcigpKGNvbnN0IEF0b21pY1N0cmlu ZyYgY2xhc3NOYW1lKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIHN0eWxlUmVzb2x2ZXIt Pmhhc1NlbGVjdG9yRm9yQ2xhc3MoY2xhc3NOYW1lKTsKLSAgICB9Ci0KLSAgICBTdHlsZVJlc29s dmVyKiBzdHlsZVJlc29sdmVyOwotfTsKLQotc3RydWN0IEhhc1NlbGVjdG9yRm9yQ2xhc3NEaXN0 cmlidXRpb25GdW5jdG9yIHsKLSAgICBleHBsaWNpdCBIYXNTZWxlY3RvckZvckNsYXNzRGlzdHJp YnV0aW9uRnVuY3RvcihFbGVtZW50U2hhZG93KiBlbGVtZW50U2hhZG93KQotICAgICAgICA6IGVs ZW1lbnRTaGFkb3coZWxlbWVudFNoYWRvdykKLSAgICB7IH0KLQotICAgIGJvb2wgb3BlcmF0b3Io KShjb25zdCBBdG9taWNTdHJpbmcmIGNsYXNzTmFtZSkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJl dHVybiBlbGVtZW50U2hhZG93LT5zZWxlY3RSdWxlRmVhdHVyZVNldCgpLmhhc1NlbGVjdG9yRm9y Q2xhc3MoY2xhc3NOYW1lKTsKLSAgICB9Ci0KLSAgICBFbGVtZW50U2hhZG93KiBlbGVtZW50U2hh ZG93OwotfTsKLQotdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLXN0YXRpYyBib29sIGNoZWNr RnVuY3RvckZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIGNoYW5nZWRDbGFz c2VzLCBGdW5jdG9yIGZ1bmN0b3IpCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorc3RhdGljIGJvb2wg Y2hlY2tTZWxlY3RvckZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIGNoYW5n ZWRDbGFzc2VzLCBjb25zdCBUJiBjaGVja2VyKQogewogICAgIHVuc2lnbmVkIGNoYW5nZWRTaXpl ID0gY2hhbmdlZENsYXNzZXMuc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBj aGFuZ2VkU2l6ZTsgKytpKSB7Ci0gICAgICAgIGlmIChmdW5jdG9yKGNoYW5nZWRDbGFzc2VzW2ld KSkKKyAgICAgICAgaWYgKGNoZWNrZXIuaGFzU2VsZWN0b3JGb3JDbGFzcyhjaGFuZ2VkQ2xhc3Nl c1tpXSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotc3RhdGljIGJvb2wgY2hlY2tGdW5j dG9yRm9yQ2xhc3NDaGFuZ2UoY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgb2xkQ2xhc3NlcywgY29u c3QgU3BhY2VTcGxpdFN0cmluZyYgbmV3Q2xhc3NlcywgRnVuY3RvciBmdW5jdG9yKQordGVtcGxh dGU8dHlwZW5hbWUgVD4KK3N0YXRpYyBib29sIGNoZWNrU2VsZWN0b3JGb3JDbGFzc0NoYW5nZShj b25zdCBTcGFjZVNwbGl0U3RyaW5nJiBvbGRDbGFzc2VzLCBjb25zdCBTcGFjZVNwbGl0U3RyaW5n JiBuZXdDbGFzc2VzLCBjb25zdCBUJiBjaGVja2VyKQogewogICAgIHVuc2lnbmVkIG9sZFNpemUg PSBvbGRDbGFzc2VzLnNpemUoKTsKICAgICBpZiAoIW9sZFNpemUpCi0gICAgICAgIHJldHVybiBj aGVja0Z1bmN0b3JGb3JDbGFzc0NoYW5nZShuZXdDbGFzc2VzLCBmdW5jdG9yKTsKKyAgICAgICAg cmV0dXJuIGNoZWNrU2VsZWN0b3JGb3JDbGFzc0NoYW5nZShuZXdDbGFzc2VzLCBjaGVja2VyKTsK ICAgICBCaXRWZWN0b3IgcmVtYWluaW5nQ2xhc3NCaXRzOwogICAgIHJlbWFpbmluZ0NsYXNzQml0 cy5lbnN1cmVTaXplKG9sZFNpemUpOwogICAgIC8vIENsYXNzIHZlY3RvcnMgdGVuZCB0byBiZSB2 ZXJ5IHNob3J0LiBUaGlzIGlzIGZhc3RlciB0aGFuIHVzaW5nIGEgaGFzaCB0YWJsZS4KQEAgLTg3 OSwzOSArODUzLDE5IEBAIHN0YXRpYyBib29sIGNoZWNrRnVuY3RvckZvckNsYXNzQ2hhbmdlKGNv bnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMsIGNvbnN0CiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGZ1bmN0b3Io bmV3Q2xhc3Nlc1tpXSkpCisgICAgICAgIGlmIChjaGVja2VyLmhhc1NlbGVjdG9yRm9yQ2xhc3Mo bmV3Q2xhc3Nlc1tpXSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG9sZFNpemU7ICsraSkgewogICAgICAgICAvLyBJZiB0aGUg Yml0IGlzIG5vdCBzZXQgdGhlIHRoZSBjb3JyZXNwb25kaW5nIGNsYXNzIGhhcyBiZWVuIHJlbW92 ZWQuCiAgICAgICAgIGlmIChyZW1haW5pbmdDbGFzc0JpdHMucXVpY2tHZXQoaSkpCiAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKGZ1bmN0b3Iob2xkQ2xhc3Nlc1tpXSkpCisgICAg ICAgIGlmIChjaGVja2VyLmhhc1NlbGVjdG9yRm9yQ2xhc3Mob2xkQ2xhc3Nlc1tpXSkpCiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0 aWMgaW5saW5lIGJvb2wgY2hlY2tOZWVkc1N0eWxlSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uo Y29uc3QgU3BhY2VTcGxpdFN0cmluZyYgY2hhbmdlZENsYXNzZXMsIFN0eWxlUmVzb2x2ZXIqIHN0 eWxlUmVzb2x2ZXIpCi17Ci0gICAgcmV0dXJuIGNoZWNrRnVuY3RvckZvckNsYXNzQ2hhbmdlKGNo YW5nZWRDbGFzc2VzLCBIYXNTZWxlY3RvckZvckNsYXNzU3R5bGVGdW5jdG9yKHN0eWxlUmVzb2x2 ZXIpKTsKLX0KLQotc3RhdGljIGlubGluZSBib29sIGNoZWNrTmVlZHNTdHlsZUludmFsaWRhdGlv bkZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMsIGNvbnN0 IFNwYWNlU3BsaXRTdHJpbmcmIG5ld0NsYXNzZXMsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2 ZXIpCi17Ci0gICAgcmV0dXJuIGNoZWNrRnVuY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMs IG5ld0NsYXNzZXMsIEhhc1NlbGVjdG9yRm9yQ2xhc3NTdHlsZUZ1bmN0b3Ioc3R5bGVSZXNvbHZl cikpOwotfQotCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tOZWVkc0Rpc3RyaWJ1dGlvbkludmFs aWRhdGlvbkZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIGNoYW5nZWRDbGFz c2VzLCBFbGVtZW50U2hhZG93KiBlbGVtZW50U2hhZG93KQotewotICAgIHJldHVybiBjaGVja0Z1 bmN0b3JGb3JDbGFzc0NoYW5nZShjaGFuZ2VkQ2xhc3NlcywgSGFzU2VsZWN0b3JGb3JDbGFzc0Rp c3RyaWJ1dGlvbkZ1bmN0b3IoZWxlbWVudFNoYWRvdykpOwotfQotCi1zdGF0aWMgaW5saW5lIGJv b2wgY2hlY2tOZWVkc0Rpc3RyaWJ1dGlvbkludmFsaWRhdGlvbkZvckNsYXNzQ2hhbmdlKGNvbnN0 IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMsIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG5l d0NsYXNzZXMsIEVsZW1lbnRTaGFkb3cqIGVsZW1lbnRTaGFkb3cpCi17Ci0gICAgcmV0dXJuIGNo ZWNrRnVuY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsIG5ld0NsYXNzZXMsIEhhc1NlbGVj dG9yRm9yQ2xhc3NEaXN0cmlidXRpb25GdW5jdG9yKGVsZW1lbnRTaGFkb3cpKTsKLX0KLQogdm9p ZCBFbGVtZW50OjpjbGFzc0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgQXRvbWljU3RyaW5nJiBuZXdD bGFzc1N0cmluZykKIHsKICAgICBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyID0gZG9jdW1l bnQoKS0+c3R5bGVSZXNvbHZlcklmRXhpc3RzKCk7CkBAIC05MjYsMTAgKzg4MCwxMCBAQCB2b2lk IEVsZW1lbnQ6OmNsYXNzQXR0cmlidXRlQ2hhbmdlZChjb25zdCBBdG9taWNTdHJpbmcmIG5ld0Ns YXNzU3RyaW5nKQogICAgICAgICBhdHRyaWJ1dGVEYXRhLT5zZXRDbGFzcyhuZXdDbGFzc1N0cmlu Zywgc2hvdWxkRm9sZENhc2UpOwogCiAgICAgICAgIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG5l d0NsYXNzZXMgPSBhdHRyaWJ1dGVEYXRhLT5jbGFzc05hbWVzKCk7Ci0gICAgICAgIHNob3VsZElu dmFsaWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tOZWVkc1N0 eWxlSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uob2xkQ2xhc3NlcywgbmV3Q2xhc3Nlcywgc3R5 bGVSZXNvbHZlcik7CisgICAgICAgIHNob3VsZEludmFsaWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJ bnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tTZWxlY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMs IG5ld0NsYXNzZXMsICpzdHlsZVJlc29sdmVyKTsKICAgICB9IGVsc2UgaWYgKGNvbnN0IEVsZW1l bnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRhID0gdGhpcy0+YXR0cmlidXRlRGF0YSgpKSB7 CiAgICAgICAgIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMgPSBhdHRyaWJ1dGVE YXRhLT5jbGFzc05hbWVzKCk7Ci0gICAgICAgIHNob3VsZEludmFsaWRhdGVTdHlsZSA9IHRlc3RT aG91bGRJbnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tOZWVkc1N0eWxlSW52YWxpZGF0aW9uRm9yQ2xh c3NDaGFuZ2Uob2xkQ2xhc3Nlcywgc3R5bGVSZXNvbHZlcik7CisgICAgICAgIHNob3VsZEludmFs aWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tTZWxlY3RvckZv ckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsICpzdHlsZVJlc29sdmVyKTsKIAogICAgICAgICBhdHRy aWJ1dGVEYXRhLT5jbGVhckNsYXNzKCk7CiAgICAgfQpAQCAtOTY0LDExICs5MTgsMTEgQEAgYm9v bCBFbGVtZW50OjpzaG91bGRJbnZhbGlkYXRlRGlzdHJpYnV0aW9uV2hlbkF0dHJpYnV0ZUNoYW5n ZWQoRWxlbWVudFNoYWRvdyogZWwKICAgICAgICAgICAgIGNvbnN0IGJvb2wgc2hvdWxkRm9sZENh c2UgPSBkb2N1bWVudCgpLT5pblF1aXJrc01vZGUoKTsKICAgICAgICAgICAgIGNvbnN0IFNwYWNl U3BsaXRTdHJpbmcmIG9sZENsYXNzZXMgPSBhdHRyaWJ1dGVEYXRhLT5jbGFzc05hbWVzKCk7CiAg ICAgICAgICAgICBjb25zdCBTcGFjZVNwbGl0U3RyaW5nIG5ld0NsYXNzZXMobmV3Q2xhc3NTdHJp bmcsIHNob3VsZEZvbGRDYXNlKTsKLSAgICAgICAgICAgIGlmIChjaGVja05lZWRzRGlzdHJpYnV0 aW9uSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uob2xkQ2xhc3NlcywgbmV3Q2xhc3NlcywgZWxl bWVudFNoYWRvdykpCisgICAgICAgICAgICBpZiAoY2hlY2tTZWxlY3RvckZvckNsYXNzQ2hhbmdl KG9sZENsYXNzZXMsIG5ld0NsYXNzZXMsIGVsZW1lbnRTaGFkb3ctPnNlbGVjdFJ1bGVGZWF0dXJl U2V0KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9IGVsc2UgaWYg KGNvbnN0IEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRhID0gdGhpcy0+YXR0cmli dXRlRGF0YSgpKSB7CiAgICAgICAgICAgICBjb25zdCBTcGFjZVNwbGl0U3RyaW5nJiBvbGRDbGFz c2VzID0gYXR0cmlidXRlRGF0YS0+Y2xhc3NOYW1lcygpOwotICAgICAgICAgICAgaWYgKGNoZWNr TmVlZHNEaXN0cmlidXRpb25JbnZhbGlkYXRpb25Gb3JDbGFzc0NoYW5nZShvbGRDbGFzc2VzLCBl bGVtZW50U2hhZG93KSkKKyAgICAgICAgICAgIGlmIChjaGVja1NlbGVjdG9yRm9yQ2xhc3NDaGFu Z2Uob2xkQ2xhc3NlcywgZWxlbWVudFNoYWRvdy0+c2VsZWN0UnVsZUZlYXR1cmVTZXQoKSkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9Cg== 176387 2012-11-27 20:14:55 -0800 2012-11-27 20:38:09 -0800 Patch bug-103474-20121128131231.patch text/plain 7252 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTNlYzc1NTA1Y2QwZjQ5 NGM4MTJlN2ViYTc4M2FjZTNjMDU2NjJiMi4uNTg4NDBlZWJhMmNmMTM1OTk3ODc5MmU3MDI0YjE3 ODE5ZDEyNmNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTI3ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBbUmVmYWN0b3Jp bmddIEhhc1NlbGVjdG9yRm9yQ2xhc3NTdHlsZUZ1bmN0b3IgaW4gRWxlbWVudC5jcHAgc2VlbXMg dmVyYm9zZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzNDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGNvZGUgaW50cm9kdWNlZCBpbiByMTM1MTc0IGxvb2tzIHZlcmJvc2UuIFdlIHdvdWxkIGxp a2UgdG8gbWFrZSBpdCBzaW1wbGVyLgorICAgICAgICBXZSBoYXZlIHJlbW92ZWQgc2V2ZXJhbCBp bmxpbmUgZnVuY3Rpb25zIGFuZCB1bm5lY2Vzc2FyeSBzdHJ1Y3RzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpjaGVja1NlbGVjdG9yRm9y Q2xhc3NDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y2xhc3NBdHRyaWJ1dGVD aGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNob3VsZEludmFsaWRhdGVEaXN0 cmlidXRpb25XaGVuQXR0cmlidXRlQ2hhbmdlZCk6CisKIDIwMTItMTEtMjcgIEFuZHJlYXMgS2xp bmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBpbGUgdGltZSBzaXplIGFzc2Vy dGlvbnMgZm9yIFRyZWVTY29wZSwgU2hhZG93Um9vdCBhbmQgRWxlbWVudEF0dHJpYnV0ZURhdGEu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggMTQ2YzJiZjZiNjE4OGEwY2M3M2U2NmU5NzAwMzgy YTg3ZTgyOWQyNy4uOTlkYTMyYTEwM2Q3NTEyMTA1YWNlODU2ODQyNjJkNzgwNmRlYjhlMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcApAQCAtODI1LDQ5ICs4MjUsMjMgQEAgc3RhdGljIGlubGluZSBi b29sIGNsYXNzU3RyaW5nSGFzQ2xhc3NOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmV3Q2xhc3NT dHJpbmcpCiAgICAgcmV0dXJuIGNsYXNzU3RyaW5nSGFzQ2xhc3NOYW1lKG5ld0NsYXNzU3RyaW5n LmNoYXJhY3RlcnMxNigpLCBsZW5ndGgpOwogfQogCi1zdHJ1Y3QgSGFzU2VsZWN0b3JGb3JDbGFz c1N0eWxlRnVuY3RvciB7Ci0gICAgZXhwbGljaXQgSGFzU2VsZWN0b3JGb3JDbGFzc1N0eWxlRnVu Y3RvcihTdHlsZVJlc29sdmVyKiByZXNvbHZlcikKLSAgICAgICAgOiBzdHlsZVJlc29sdmVyKHJl c29sdmVyKQotICAgIHsgfQotCi0gICAgYm9vbCBvcGVyYXRvcigpKGNvbnN0IEF0b21pY1N0cmlu ZyYgY2xhc3NOYW1lKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIHN0eWxlUmVzb2x2ZXIt Pmhhc1NlbGVjdG9yRm9yQ2xhc3MoY2xhc3NOYW1lKTsKLSAgICB9Ci0KLSAgICBTdHlsZVJlc29s dmVyKiBzdHlsZVJlc29sdmVyOwotfTsKLQotc3RydWN0IEhhc1NlbGVjdG9yRm9yQ2xhc3NEaXN0 cmlidXRpb25GdW5jdG9yIHsKLSAgICBleHBsaWNpdCBIYXNTZWxlY3RvckZvckNsYXNzRGlzdHJp YnV0aW9uRnVuY3RvcihFbGVtZW50U2hhZG93KiBlbGVtZW50U2hhZG93KQotICAgICAgICA6IGVs ZW1lbnRTaGFkb3coZWxlbWVudFNoYWRvdykKLSAgICB7IH0KLQotICAgIGJvb2wgb3BlcmF0b3Io KShjb25zdCBBdG9taWNTdHJpbmcmIGNsYXNzTmFtZSkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJl dHVybiBlbGVtZW50U2hhZG93LT5zZWxlY3RSdWxlRmVhdHVyZVNldCgpLmhhc1NlbGVjdG9yRm9y Q2xhc3MoY2xhc3NOYW1lKTsKLSAgICB9Ci0KLSAgICBFbGVtZW50U2hhZG93KiBlbGVtZW50U2hh ZG93OwotfTsKLQotdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLXN0YXRpYyBib29sIGNoZWNr RnVuY3RvckZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIGNoYW5nZWRDbGFz c2VzLCBGdW5jdG9yIGZ1bmN0b3IpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDaGVja2VyPgorc3RhdGlj IGJvb2wgY2hlY2tTZWxlY3RvckZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcm IGNoYW5nZWRDbGFzc2VzLCBjb25zdCBDaGVja2VyJiBjaGVja2VyKQogewogICAgIHVuc2lnbmVk IGNoYW5nZWRTaXplID0gY2hhbmdlZENsYXNzZXMuc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBjaGFuZ2VkU2l6ZTsgKytpKSB7Ci0gICAgICAgIGlmIChmdW5jdG9yKGNoYW5n ZWRDbGFzc2VzW2ldKSkKKyAgICAgICAgaWYgKGNoZWNrZXIuaGFzU2VsZWN0b3JGb3JDbGFzcyhj aGFuZ2VkQ2xhc3Nlc1tpXSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotc3RhdGljIGJv b2wgY2hlY2tGdW5jdG9yRm9yQ2xhc3NDaGFuZ2UoY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgb2xk Q2xhc3NlcywgY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgbmV3Q2xhc3NlcywgRnVuY3RvciBmdW5j dG9yKQordGVtcGxhdGU8dHlwZW5hbWUgQ2hlY2tlcj4KK3N0YXRpYyBib29sIGNoZWNrU2VsZWN0 b3JGb3JDbGFzc0NoYW5nZShjb25zdCBTcGFjZVNwbGl0U3RyaW5nJiBvbGRDbGFzc2VzLCBjb25z dCBTcGFjZVNwbGl0U3RyaW5nJiBuZXdDbGFzc2VzLCBjb25zdCBDaGVja2VyJiBjaGVja2VyKQog ewogICAgIHVuc2lnbmVkIG9sZFNpemUgPSBvbGRDbGFzc2VzLnNpemUoKTsKICAgICBpZiAoIW9s ZFNpemUpCi0gICAgICAgIHJldHVybiBjaGVja0Z1bmN0b3JGb3JDbGFzc0NoYW5nZShuZXdDbGFz c2VzLCBmdW5jdG9yKTsKKyAgICAgICAgcmV0dXJuIGNoZWNrU2VsZWN0b3JGb3JDbGFzc0NoYW5n ZShuZXdDbGFzc2VzLCBjaGVja2VyKTsKICAgICBCaXRWZWN0b3IgcmVtYWluaW5nQ2xhc3NCaXRz OwogICAgIHJlbWFpbmluZ0NsYXNzQml0cy5lbnN1cmVTaXplKG9sZFNpemUpOwogICAgIC8vIENs YXNzIHZlY3RvcnMgdGVuZCB0byBiZSB2ZXJ5IHNob3J0LiBUaGlzIGlzIGZhc3RlciB0aGFuIHVz aW5nIGEgaGFzaCB0YWJsZS4KQEAgLTg3OSwzOSArODUzLDE5IEBAIHN0YXRpYyBib29sIGNoZWNr RnVuY3RvckZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMs IGNvbnN0CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KLSAgICAgICAgaWYgKGZ1bmN0b3IobmV3Q2xhc3Nlc1tpXSkpCisgICAgICAgIGlmIChjaGVj a2VyLmhhc1NlbGVjdG9yRm9yQ2xhc3MobmV3Q2xhc3Nlc1tpXSkpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG9sZFNpemU7ICsr aSkgewogICAgICAgICAvLyBJZiB0aGUgYml0IGlzIG5vdCBzZXQgdGhlIHRoZSBjb3JyZXNwb25k aW5nIGNsYXNzIGhhcyBiZWVuIHJlbW92ZWQuCiAgICAgICAgIGlmIChyZW1haW5pbmdDbGFzc0Jp dHMucXVpY2tHZXQoaSkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKGZ1bmN0 b3Iob2xkQ2xhc3Nlc1tpXSkpCisgICAgICAgIGlmIChjaGVja2VyLmhhc1NlbGVjdG9yRm9yQ2xh c3Mob2xkQ2xhc3Nlc1tpXSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tOZWVkc1N0eWxlSW52 YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2UoY29uc3QgU3BhY2VTcGxpdFN0cmluZyYgY2hhbmdlZENs YXNzZXMsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi17Ci0gICAgcmV0dXJuIGNoZWNr RnVuY3RvckZvckNsYXNzQ2hhbmdlKGNoYW5nZWRDbGFzc2VzLCBIYXNTZWxlY3RvckZvckNsYXNz U3R5bGVGdW5jdG9yKHN0eWxlUmVzb2x2ZXIpKTsKLX0KLQotc3RhdGljIGlubGluZSBib29sIGNo ZWNrTmVlZHNTdHlsZUludmFsaWRhdGlvbkZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRT dHJpbmcmIG9sZENsYXNzZXMsIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG5ld0NsYXNzZXMsIFN0 eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi17Ci0gICAgcmV0dXJuIGNoZWNrRnVuY3RvckZv ckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsIG5ld0NsYXNzZXMsIEhhc1NlbGVjdG9yRm9yQ2xhc3NT dHlsZUZ1bmN0b3Ioc3R5bGVSZXNvbHZlcikpOwotfQotCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hl Y2tOZWVkc0Rpc3RyaWJ1dGlvbkludmFsaWRhdGlvbkZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNl U3BsaXRTdHJpbmcmIGNoYW5nZWRDbGFzc2VzLCBFbGVtZW50U2hhZG93KiBlbGVtZW50U2hhZG93 KQotewotICAgIHJldHVybiBjaGVja0Z1bmN0b3JGb3JDbGFzc0NoYW5nZShjaGFuZ2VkQ2xhc3Nl cywgSGFzU2VsZWN0b3JGb3JDbGFzc0Rpc3RyaWJ1dGlvbkZ1bmN0b3IoZWxlbWVudFNoYWRvdykp OwotfQotCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tOZWVkc0Rpc3RyaWJ1dGlvbkludmFsaWRh dGlvbkZvckNsYXNzQ2hhbmdlKGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMsIGNv bnN0IFNwYWNlU3BsaXRTdHJpbmcmIG5ld0NsYXNzZXMsIEVsZW1lbnRTaGFkb3cqIGVsZW1lbnRT aGFkb3cpCi17Ci0gICAgcmV0dXJuIGNoZWNrRnVuY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNz ZXMsIG5ld0NsYXNzZXMsIEhhc1NlbGVjdG9yRm9yQ2xhc3NEaXN0cmlidXRpb25GdW5jdG9yKGVs ZW1lbnRTaGFkb3cpKTsKLX0KLQogdm9pZCBFbGVtZW50OjpjbGFzc0F0dHJpYnV0ZUNoYW5nZWQo Y29uc3QgQXRvbWljU3RyaW5nJiBuZXdDbGFzc1N0cmluZykKIHsKICAgICBTdHlsZVJlc29sdmVy KiBzdHlsZVJlc29sdmVyID0gZG9jdW1lbnQoKS0+c3R5bGVSZXNvbHZlcklmRXhpc3RzKCk7CkBA IC05MjYsMTAgKzg4MCwxMCBAQCB2b2lkIEVsZW1lbnQ6OmNsYXNzQXR0cmlidXRlQ2hhbmdlZChj b25zdCBBdG9taWNTdHJpbmcmIG5ld0NsYXNzU3RyaW5nKQogICAgICAgICBhdHRyaWJ1dGVEYXRh LT5zZXRDbGFzcyhuZXdDbGFzc1N0cmluZywgc2hvdWxkRm9sZENhc2UpOwogCiAgICAgICAgIGNv bnN0IFNwYWNlU3BsaXRTdHJpbmcmIG5ld0NsYXNzZXMgPSBhdHRyaWJ1dGVEYXRhLT5jbGFzc05h bWVzKCk7Ci0gICAgICAgIHNob3VsZEludmFsaWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlk YXRlU3R5bGUgJiYgY2hlY2tOZWVkc1N0eWxlSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uob2xk Q2xhc3NlcywgbmV3Q2xhc3Nlcywgc3R5bGVSZXNvbHZlcik7CisgICAgICAgIHNob3VsZEludmFs aWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tTZWxlY3RvckZv ckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsIG5ld0NsYXNzZXMsICpzdHlsZVJlc29sdmVyKTsKICAg ICB9IGVsc2UgaWYgKGNvbnN0IEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRhID0g dGhpcy0+YXR0cmlidXRlRGF0YSgpKSB7CiAgICAgICAgIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcm IG9sZENsYXNzZXMgPSBhdHRyaWJ1dGVEYXRhLT5jbGFzc05hbWVzKCk7Ci0gICAgICAgIHNob3Vs ZEludmFsaWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlkYXRlU3R5bGUgJiYgY2hlY2tOZWVk c1N0eWxlSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uob2xkQ2xhc3Nlcywgc3R5bGVSZXNvbHZl cik7CisgICAgICAgIHNob3VsZEludmFsaWRhdGVTdHlsZSA9IHRlc3RTaG91bGRJbnZhbGlkYXRl U3R5bGUgJiYgY2hlY2tTZWxlY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsICpzdHlsZVJl c29sdmVyKTsKIAogICAgICAgICBhdHRyaWJ1dGVEYXRhLT5jbGVhckNsYXNzKCk7CiAgICAgfQpA QCAtOTY0LDExICs5MTgsMTEgQEAgYm9vbCBFbGVtZW50OjpzaG91bGRJbnZhbGlkYXRlRGlzdHJp YnV0aW9uV2hlbkF0dHJpYnV0ZUNoYW5nZWQoRWxlbWVudFNoYWRvdyogZWwKICAgICAgICAgICAg IGNvbnN0IGJvb2wgc2hvdWxkRm9sZENhc2UgPSBkb2N1bWVudCgpLT5pblF1aXJrc01vZGUoKTsK ICAgICAgICAgICAgIGNvbnN0IFNwYWNlU3BsaXRTdHJpbmcmIG9sZENsYXNzZXMgPSBhdHRyaWJ1 dGVEYXRhLT5jbGFzc05hbWVzKCk7CiAgICAgICAgICAgICBjb25zdCBTcGFjZVNwbGl0U3RyaW5n IG5ld0NsYXNzZXMobmV3Q2xhc3NTdHJpbmcsIHNob3VsZEZvbGRDYXNlKTsKLSAgICAgICAgICAg IGlmIChjaGVja05lZWRzRGlzdHJpYnV0aW9uSW52YWxpZGF0aW9uRm9yQ2xhc3NDaGFuZ2Uob2xk Q2xhc3NlcywgbmV3Q2xhc3NlcywgZWxlbWVudFNoYWRvdykpCisgICAgICAgICAgICBpZiAoY2hl Y2tTZWxlY3RvckZvckNsYXNzQ2hhbmdlKG9sZENsYXNzZXMsIG5ld0NsYXNzZXMsIGVsZW1lbnRT aGFkb3ctPnNlbGVjdFJ1bGVGZWF0dXJlU2V0KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICB9IGVsc2UgaWYgKGNvbnN0IEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRy aWJ1dGVEYXRhID0gdGhpcy0+YXR0cmlidXRlRGF0YSgpKSB7CiAgICAgICAgICAgICBjb25zdCBT cGFjZVNwbGl0U3RyaW5nJiBvbGRDbGFzc2VzID0gYXR0cmlidXRlRGF0YS0+Y2xhc3NOYW1lcygp OwotICAgICAgICAgICAgaWYgKGNoZWNrTmVlZHNEaXN0cmlidXRpb25JbnZhbGlkYXRpb25Gb3JD bGFzc0NoYW5nZShvbGRDbGFzc2VzLCBlbGVtZW50U2hhZG93KSkKKyAgICAgICAgICAgIGlmIChj aGVja1NlbGVjdG9yRm9yQ2xhc3NDaGFuZ2Uob2xkQ2xhc3NlcywgZWxlbWVudFNoYWRvdy0+c2Vs ZWN0UnVsZUZlYXR1cmVTZXQoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg ICAgIH0KICAgICB9Cg==