121654 2013-09-19 20:41:30 -0700 Start cleaning the API of SelectorChecker 2013-09-20 12:28:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin allan.jensen commit-queue esprehn+autocc glenn kangil.han kling koivisto macpherson menard oldest_to_newest 931169 0 benjamin 2013-09-19 20:41:30 -0700 Start cleaning the API of SelectorChecker 931170 1 212118 benjamin 2013-09-19 20:44:48 -0700 Created attachment 212118 Patch 931520 2 212118 benjamin 2013-09-20 12:28:33 -0700 Comment on attachment 212118 Patch Clearing flags on attachment: 212118 Committed r156189: <http://trac.webkit.org/changeset/156189> 931521 3 benjamin 2013-09-20 12:28:36 -0700 All reviewed patches have been landed. Closing bug. 212118 2013-09-19 20:44:48 -0700 2013-09-20 12:28:32 -0700 Patch bug-121654-20130919204447.patch text/plain 10608 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjEzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA5LTE5ICBCZW5qYW1p biBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTdGFydCBjbGVhbmlu ZyB0aGUgQVBJIG9mIFNlbGVjdG9yQ2hlY2tlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgbWF0Y2hpbmcgbW9kZSBpbnRlcm5hbC4KKyAg ICAgICAgUmVtb3ZlIHVudXNlZCBhY2Nlc3NvcnMuCisgICAgICAgIE1ha2UgaXNGcmFtZUZvY3Vz ZWQoKSBpbnRlcm5hbC4KKworICAgICAgICAqIGNzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50UnVsZUNvbGxlY3Rvcjo6cnVsZU1hdGNoZXMpOgor ICAgICAgICAqIGNzcy9TZWxlY3RvckNoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Vs ZWN0b3JDaGVja2VyOjptYXRjaFJlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVj dG9yQ2hlY2tlcjo6Y2hlY2tPbmUpOgorICAgICAgICAoV2ViQ29yZTo6aXNGcmFtZUZvY3VzZWQp OgorICAgICAgICAqIGNzcy9TZWxlY3RvckNoZWNrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNl bGVjdG9yQ2hlY2tlcjo6bWF0Y2gpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpjaGVja1JlZ2lvblNlbGVjdG9yKToKKyAgICAgICAgKiBkb20vU2Vs ZWN0b3JRdWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRhdGFMaXN0OjpzZWxl Y3Rvck1hdGNoZXMpOgorCiAyMDEzLTA5LTE5ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25A YXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogdXBkYXRlIE1lZGlhU3RyZWFt VHJhY2tFdmVudCBvYmplY3QgdG8gbWF0Y2ggc3BlYwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCShyZXZpc2lvbiAxNTYwNjUpCisrKyBTb3VyY2Uv V2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z NzQsOCArMzc0LDcgQEAgaW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYQog ICAgIGNvbnRleHQucHNldWRvSWQgPSBtX3BzZXVkb1N0eWxlUmVxdWVzdC5wc2V1ZG9JZDsKICAg ICBjb250ZXh0LnNjcm9sbGJhciA9IG1fcHNldWRvU3R5bGVSZXF1ZXN0LnNjcm9sbGJhcjsKICAg ICBjb250ZXh0LnNjcm9sbGJhclBhcnQgPSBtX3BzZXVkb1N0eWxlUmVxdWVzdC5zY3JvbGxiYXJQ YXJ0OwotICAgIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggbWF0Y2ggPSBzZWxlY3RvckNoZWNrZXIu bWF0Y2goY29udGV4dCwgZHluYW1pY1BzZXVkbyk7Ci0gICAgaWYgKG1hdGNoICE9IFNlbGVjdG9y Q2hlY2tlcjo6U2VsZWN0b3JNYXRjaGVzKQorICAgIGlmICghc2VsZWN0b3JDaGVja2VyLm1hdGNo KGNvbnRleHQsIGR5bmFtaWNQc2V1ZG8pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYg KG1fcHNldWRvU3R5bGVSZXF1ZXN0LnBzZXVkb0lkICE9IE5PUFNFVURPICYmIG1fcHNldWRvU3R5 bGVSZXF1ZXN0LnBzZXVkb0lkICE9IGR5bmFtaWNQc2V1ZG8pCiAgICAgICAgIHJldHVybiBmYWxz ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCShyZXZpc2lvbiAx NTYwNjUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTQ4LDcgKzE0OCw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JDaGVj a2VyKERvY3VtZW4KIC8vICogU2VsZWN0b3JGYWlsc0xvY2FsbHkgICAgIC0gdGhlIHNlbGVjdG9y IGZhaWxzIGZvciB0aGUgZWxlbWVudCBlCiAvLyAqIFNlbGVjdG9yRmFpbHNBbGxTaWJsaW5ncyAt IHRoZSBzZWxlY3RvciBmYWlscyBmb3IgZSBhbmQgYW55IHNpYmxpbmcgb2YgZQogLy8gKiBTZWxl Y3RvckZhaWxzQ29tcGxldGVseSAgLSB0aGUgc2VsZWN0b3IgZmFpbHMgZm9yIGUgYW5kIGFueSBz aWJsaW5nIG9yIGFuY2VzdG9yIG9mIGUKLVNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2VsZWN0b3JD aGVja2VyOjptYXRjaChjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYgY29udGV4dCwgUHNl dWRvSWQmIGR5bmFtaWNQc2V1ZG8pIGNvbnN0CitTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIFNlbGVj dG9yQ2hlY2tlcjo6bWF0Y2hSZWN1cnNpdmVseShjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4 dCYgY29udGV4dCwgUHNldWRvSWQmIGR5bmFtaWNQc2V1ZG8pIGNvbnN0CiB7CiAgICAgLy8gZmly c3Qgc2VsZWN0b3IgaGFzIHRvIG1hdGNoCiAgICAgaWYgKCFjaGVja09uZShjb250ZXh0KSkKQEAg LTIxNSw3ICsyMTUsNyBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIFNlbGVjdG9yQ2hlY2tlcjo6 CiAgICAgICAgIG5leHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAgICAgbmV4 dENvbnRleHQuZWxlbWVudFN0eWxlID0gMDsKICAgICAgICAgZm9yICg7IG5leHRDb250ZXh0LmVs ZW1lbnQ7IG5leHRDb250ZXh0LmVsZW1lbnQgPSBuZXh0Q29udGV4dC5lbGVtZW50LT5wYXJlbnRF bGVtZW50KCkpIHsKLSAgICAgICAgICAgIE1hdGNoIG1hdGNoID0gdGhpcy0+bWF0Y2gobmV4dENv bnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pOworICAgICAgICAgICAgTWF0Y2ggbWF0Y2ggPSB0 aGlzLT5tYXRjaFJlY3Vyc2l2ZWx5KG5leHRDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvKTsK ICAgICAgICAgICAgIGlmIChtYXRjaCA9PSBTZWxlY3Rvck1hdGNoZXMgfHwgbWF0Y2ggPT0gU2Vs ZWN0b3JGYWlsc0NvbXBsZXRlbHkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG1hdGNoOwogICAg ICAgICAgICAgaWYgKG5leHRDb250ZXh0LmVsZW1lbnQgPT0gbmV4dENvbnRleHQuc2NvcGUgJiYg bmV4dENvbnRleHQuYmVoYXZpb3JBdEJvdW5kYXJ5ICE9IFN0YXlzV2l0aGluVHJlZVNjb3BlKQpA QCAtMjI5LDcgKzIyOSw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2VsZWN0b3JDaGVja2Vy OjoKICAgICAgICAgICAgIHJldHVybiBTZWxlY3RvckZhaWxzQ29tcGxldGVseTsKICAgICAgICAg bmV4dENvbnRleHQuaXNTdWJTZWxlY3RvciA9IGZhbHNlOwogICAgICAgICBuZXh0Q29udGV4dC5l bGVtZW50U3R5bGUgPSAwOwotICAgICAgICByZXR1cm4gbWF0Y2gobmV4dENvbnRleHQsIGlnbm9y ZUR5bmFtaWNQc2V1ZG8pOworICAgICAgICByZXR1cm4gbWF0Y2hSZWN1cnNpdmVseShuZXh0Q29u dGV4dCwgaWdub3JlRHluYW1pY1BzZXVkbyk7CiAKICAgICBjYXNlIENTU1NlbGVjdG9yOjpEaXJl Y3RBZGphY2VudDoKICAgICAgICAgaWYgKG1fbW9kZSA9PSBSZXNvbHZpbmdTdHlsZSkgewpAQCAt MjQxLDcgKzI0MSw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2VsZWN0b3JDaGVja2VyOjoK ICAgICAgICAgICAgIHJldHVybiBTZWxlY3RvckZhaWxzQWxsU2libGluZ3M7CiAgICAgICAgIG5l eHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAgICAgbmV4dENvbnRleHQuZWxl bWVudFN0eWxlID0gMDsKLSAgICAgICAgcmV0dXJuIG1hdGNoKG5leHRDb250ZXh0LCBpZ25vcmVE eW5hbWljUHNldWRvKTsKKyAgICAgICAgcmV0dXJuIG1hdGNoUmVjdXJzaXZlbHkobmV4dENvbnRl eHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pOwogCiAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6SW5kaXJl Y3RBZGphY2VudDoKICAgICAgICAgaWYgKG1fbW9kZSA9PSBSZXNvbHZpbmdTdHlsZSkgewpAQCAt MjUyLDcgKzI1Miw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2VsZWN0b3JDaGVja2VyOjoK ICAgICAgICAgbmV4dENvbnRleHQuaXNTdWJTZWxlY3RvciA9IGZhbHNlOwogICAgICAgICBuZXh0 Q29udGV4dC5lbGVtZW50U3R5bGUgPSAwOwogICAgICAgICBmb3IgKDsgbmV4dENvbnRleHQuZWxl bWVudDsgbmV4dENvbnRleHQuZWxlbWVudCA9IG5leHRDb250ZXh0LmVsZW1lbnQtPnByZXZpb3Vz RWxlbWVudFNpYmxpbmcoKSkgewotICAgICAgICAgICAgTWF0Y2ggbWF0Y2ggPSB0aGlzLT5tYXRj aChuZXh0Q29udGV4dCwgaWdub3JlRHluYW1pY1BzZXVkbyk7CisgICAgICAgICAgICBNYXRjaCBt YXRjaCA9IHRoaXMtPm1hdGNoUmVjdXJzaXZlbHkobmV4dENvbnRleHQsIGlnbm9yZUR5bmFtaWNQ c2V1ZG8pOwogICAgICAgICAgICAgaWYgKG1hdGNoID09IFNlbGVjdG9yTWF0Y2hlcyB8fCBtYXRj aCA9PSBTZWxlY3RvckZhaWxzQWxsU2libGluZ3MgfHwgbWF0Y2ggPT0gU2VsZWN0b3JGYWlsc0Nv bXBsZXRlbHkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG1hdGNoOwogICAgICAgICB9OwpAQCAt MjY5LDcgKzI2OSw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2VsZWN0b3JDaGVja2VyOjoK ICAgICAgICAgICAgICYmICEobmV4dENvbnRleHQuaGFzU2Nyb2xsYmFyUHNldWRvICYmIG5leHRD b250ZXh0LnNlbGVjdG9yLT5tX21hdGNoID09IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzcykpCiAg ICAgICAgICAgICByZXR1cm4gU2VsZWN0b3JGYWlsc0NvbXBsZXRlbHk7CiAgICAgICAgIG5leHRD b250ZXh0LmlzU3ViU2VsZWN0b3IgPSB0cnVlOwotICAgICAgICByZXR1cm4gbWF0Y2gobmV4dENv bnRleHQsIGR5bmFtaWNQc2V1ZG8pOworICAgICAgICByZXR1cm4gbWF0Y2hSZWN1cnNpdmVseShu ZXh0Q29udGV4dCwgZHluYW1pY1BzZXVkbyk7CiAKICAgICBjYXNlIENTU1NlbGVjdG9yOjpTaGFk b3dEZXNjZW5kYW50OgogICAgICAgICB7CkBAIC0yODIsNyArMjgyLDcgQEAgU2VsZWN0b3JDaGVj a2VyOjpNYXRjaCBTZWxlY3RvckNoZWNrZXI6OgogICAgICAgICAgICAgbmV4dENvbnRleHQuZWxl bWVudCA9IHNoYWRvd0hvc3ROb2RlOwogICAgICAgICAgICAgbmV4dENvbnRleHQuaXNTdWJTZWxl Y3RvciA9IGZhbHNlOwogICAgICAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudFN0eWxlID0gMDsK LSAgICAgICAgICAgIHJldHVybiBtYXRjaChuZXh0Q29udGV4dCwgaWdub3JlRHluYW1pY1BzZXVk byk7CisgICAgICAgICAgICByZXR1cm4gbWF0Y2hSZWN1cnNpdmVseShuZXh0Q29udGV4dCwgaWdu b3JlRHluYW1pY1BzZXVkbyk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTU5Niw3ICs1OTYsNyBA QCBib29sIFNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUoY29uc3QgU2VsCiAgICAgICAgICAgICAg ICAgc3ViQ29udGV4dC5pc1N1YlNlbGVjdG9yID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBQc2V1 ZG9JZCBpZ25vcmVEeW5hbWljUHNldWRvID0gTk9QU0VVRE87CiAgICAgICAgICAgICAgICAgZm9y IChzdWJDb250ZXh0LnNlbGVjdG9yID0gc2VsZWN0b3ItPnNlbGVjdG9yTGlzdCgpLT5maXJzdCgp OyBzdWJDb250ZXh0LnNlbGVjdG9yOyBzdWJDb250ZXh0LnNlbGVjdG9yID0gQ1NTU2VsZWN0b3JM aXN0OjpuZXh0KHN1YkNvbnRleHQuc2VsZWN0b3IpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlm IChtYXRjaChzdWJDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvKSA9PSBTZWxlY3Rvck1hdGNo ZXMpCisgICAgICAgICAgICAgICAgICAgIGlmIChtYXRjaFJlY3Vyc2l2ZWx5KHN1YkNvbnRleHQs IGlnbm9yZUR5bmFtaWNQc2V1ZG8pID09IFNlbGVjdG9yTWF0Y2hlcykKICAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0K QEAgLTc5NCw3ICs3OTQsNyBAQCBib29sIFNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUoY29uc3Qg U2VsCiAgICAgICAgIFBzZXVkb0lkIGlnbm9yZUR5bmFtaWNQc2V1ZG8gPSBOT1BTRVVETzsKICAg ICAgICAgY29uc3QgQ1NTU2VsZWN0b3IqIGNvbnN0ICYgc2VsZWN0b3IgPSBjb250ZXh0LnNlbGVj dG9yOwogICAgICAgICBmb3IgKHN1YkNvbnRleHQuc2VsZWN0b3IgPSBzZWxlY3Rvci0+c2VsZWN0 b3JMaXN0KCktPmZpcnN0KCk7IHN1YkNvbnRleHQuc2VsZWN0b3I7IHN1YkNvbnRleHQuc2VsZWN0 b3IgPSBDU1NTZWxlY3Rvckxpc3Q6Om5leHQoc3ViQ29udGV4dC5zZWxlY3RvcikpIHsKLSAgICAg ICAgICAgIGlmIChtYXRjaChzdWJDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvKSA9PSBTZWxl Y3Rvck1hdGNoZXMpCisgICAgICAgICAgICBpZiAobWF0Y2hSZWN1cnNpdmVseShzdWJDb250ZXh0 LCBpZ25vcmVEeW5hbWljUHNldWRvKSA9PSBTZWxlY3Rvck1hdGNoZXMpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtOTMw LDcgKzkzMCw3IEBAIHVuc2lnbmVkIFNlbGVjdG9yQ2hlY2tlcjo6ZGV0ZXJtaW5lTGlua00KICAg ICByZXR1cm4gbGlua01hdGNoVHlwZTsKIH0KIAotYm9vbCBTZWxlY3RvckNoZWNrZXI6OmlzRnJh bWVGb2N1c2VkKGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpCitzdGF0aWMgYm9vbCBpc0ZyYW1lRm9j dXNlZChjb25zdCBFbGVtZW50KiBlbGVtZW50KQogewogICAgIHJldHVybiBlbGVtZW50LT5kb2N1 bWVudCgpLmZyYW1lKCkgJiYgZWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpLT5zZWxlY3Rpb24o KS5pc0ZvY3VzZWRBbmRBY3RpdmUoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxl Y3RvckNoZWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JD aGVja2VyLmgJKHJldmlzaW9uIDE1NjA2NSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3Rv ckNoZWNrZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsOCArNDMsOSBAQCBjbGFzcyBSZW5kZXJT dHlsZTsKIAogY2xhc3MgU2VsZWN0b3JDaGVja2VyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJM RShTZWxlY3RvckNoZWNrZXIpOwotcHVibGljOgogICAgIGVudW0gTWF0Y2ggeyBTZWxlY3Rvck1h dGNoZXMsIFNlbGVjdG9yRmFpbHNMb2NhbGx5LCBTZWxlY3RvckZhaWxzQWxsU2libGluZ3MsIFNl bGVjdG9yRmFpbHNDb21wbGV0ZWx5IH07CisKK3B1YmxpYzoKICAgICBlbnVtIFZpc2l0ZWRNYXRj aFR5cGUgeyBWaXNpdGVkTWF0Y2hEaXNhYmxlZCwgVmlzaXRlZE1hdGNoRW5hYmxlZCB9OwogICAg IGVudW0gTW9kZSB7IFJlc29sdmluZ1N0eWxlID0gMCwgQ29sbGVjdGluZ1J1bGVzLCBRdWVyeWlu Z1J1bGVzLCBTaGFyaW5nUnVsZXMgfTsKICAgICBlbnVtIEJlaGF2aW9yQXRCb3VuZGFyeSB7IERv ZXNOb3RDcm9zc0JvdW5kYXJ5LCBDcm9zc2VzQm91bmRhcnksIFN0YXlzV2l0aGluVHJlZVNjb3Bl IH07CkBAIC04MiwxMiArODMsMTAgQEAgcHVibGljOgogICAgICAgICBCZWhhdmlvckF0Qm91bmRh cnkgYmVoYXZpb3JBdEJvdW5kYXJ5OwogICAgIH07CiAKLSAgICBNYXRjaCBtYXRjaChjb25zdCBT ZWxlY3RvckNoZWNraW5nQ29udGV4dCYsIFBzZXVkb0lkJikgY29uc3Q7Ci0gICAgYm9vbCBjaGVj a09uZShjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYpIGNvbnN0OwotCi0gICAgYm9vbCBz dHJpY3RQYXJzaW5nKCkgY29uc3QgeyByZXR1cm4gbV9zdHJpY3RQYXJzaW5nOyB9Ci0KLSAgICBN b2RlIG1vZGUoKSBjb25zdCB7IHJldHVybiBtX21vZGU7IH0KKyAgICBib29sIG1hdGNoKGNvbnN0 IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb250ZXh0LCBQc2V1ZG9JZCYgcHNldWRvSWQpIGNv bnN0CisgICAgeworICAgICAgICByZXR1cm4gbWF0Y2hSZWN1cnNpdmVseShjb250ZXh0LCBwc2V1 ZG9JZCkgPT0gU2VsZWN0b3JNYXRjaGVzOworICAgIH0KIAogICAgIHN0YXRpYyBib29sIHRhZ01h dGNoZXMoY29uc3QgRWxlbWVudCosIGNvbnN0IFF1YWxpZmllZE5hbWUmKTsKICAgICBzdGF0aWMg Ym9vbCBpc0NvbW1vblBzZXVkb0NsYXNzU2VsZWN0b3IoY29uc3QgQ1NTU2VsZWN0b3IqKTsKQEAg LTk4LDkgKzk3LDEwIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdW5zaWduZWQgZGV0ZXJtaW5lTGlu a01hdGNoVHlwZShjb25zdCBDU1NTZWxlY3RvciopOwogCiBwcml2YXRlOgotICAgIGJvb2wgY2hl Y2tTY3JvbGxiYXJQc2V1ZG9DbGFzcyhjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYsIERv Y3VtZW50KiwgY29uc3QgQ1NTU2VsZWN0b3IqKSBjb25zdDsKKyAgICBNYXRjaCBtYXRjaFJlY3Vy c2l2ZWx5KGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiwgUHNldWRvSWQmKSBjb25zdDsK KyAgICBib29sIGNoZWNrT25lKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JikgY29uc3Q7 CiAKLSAgICBzdGF0aWMgYm9vbCBpc0ZyYW1lRm9jdXNlZChjb25zdCBFbGVtZW50Kik7CisgICAg Ym9vbCBjaGVja1Njcm9sbGJhclBzZXVkb0NsYXNzKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250 ZXh0JiwgRG9jdW1lbnQqLCBjb25zdCBDU1NTZWxlY3RvciopIGNvbnN0OwogCiAgICAgYm9vbCBt X3N0cmljdFBhcnNpbmc7CiAgICAgYm9vbCBtX2RvY3VtZW50SXNIVE1MOwpJbmRleDogU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSZXNvbHZlci5oCShyZXZpc2lvbiAxNTYwNjUpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSZXNvbHZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02NTMsNyArNjUzLDcgQEAg aW5saW5lIGJvb2wgY2hlY2tSZWdpb25TZWxlY3Rvcihjb25zdCBDUwogICAgIGZvciAoY29uc3Qg Q1NTU2VsZWN0b3IqIHMgPSByZWdpb25TZWxlY3RvcjsgczsgcyA9IENTU1NlbGVjdG9yTGlzdDo6 bmV4dChzKSkgewogICAgICAgICBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tpbmdDb250 ZXh0IHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0KHMsIHJlZ2lvbkVsZW1lbnQsIFNlbGVjdG9yQ2hl Y2tlcjo6VmlzaXRlZE1hdGNoRGlzYWJsZWQpOwogICAgICAgICBQc2V1ZG9JZCBpZ25vcmVEeW5h bWljUHNldWRvID0gTk9QU0VVRE87Ci0gICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2go c2VsZWN0b3JDaGVja2luZ0NvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pID09IFNlbGVjdG9y Q2hlY2tlcjo6U2VsZWN0b3JNYXRjaGVzKQorICAgICAgICBpZiAoc2VsZWN0b3JDaGVja2VyLm1h dGNoKHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvKSkKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCShyZXZpc2lvbiAxNTYwNjUpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0 LDcgQEAgaW5saW5lIGJvb2wgU2VsZWN0b3JEYXRhTGlzdDo6c2VsZWN0b3JNYQogICAgIHNlbGVj dG9yQ2hlY2tpbmdDb250ZXh0LmJlaGF2aW9yQXRCb3VuZGFyeSA9IFNlbGVjdG9yQ2hlY2tlcjo6 U3RheXNXaXRoaW5UcmVlU2NvcGU7CiAgICAgc2VsZWN0b3JDaGVja2luZ0NvbnRleHQuc2NvcGUg PSAhcm9vdE5vZGUtPmlzRG9jdW1lbnROb2RlKCkgJiYgcm9vdE5vZGUtPmlzQ29udGFpbmVyTm9k ZSgpID8gdG9Db250YWluZXJOb2RlKHJvb3ROb2RlKSA6IDA7CiAgICAgUHNldWRvSWQgaWdub3Jl RHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOwotICAgIHJldHVybiBzZWxlY3RvckNoZWNrZXIubWF0 Y2goc2VsZWN0b3JDaGVja2luZ0NvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pID09IFNlbGVj dG9yQ2hlY2tlcjo6U2VsZWN0b3JNYXRjaGVzOworICAgIHJldHVybiBzZWxlY3RvckNoZWNrZXIu bWF0Y2goc2VsZWN0b3JDaGVja2luZ0NvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pOwogfQog CiBib29sIFNlbGVjdG9yRGF0YUxpc3Q6Om1hdGNoZXMoRWxlbWVudCogdGFyZ2V0RWxlbWVudCkg Y29uc3QK