39467 2010-05-20 19:07:21 -0700 Remove and simplify custom bindings for Node 2010-05-22 16:46:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jschuh webkit-unassigned commit-queue jschuh oldest_to_newest 228697 0 jschuh 2010-05-20 19:07:21 -0700 Remove and simplify custom bindings for Node 228701 1 56662 jschuh 2010-05-20 19:19:01 -0700 Created attachment 56662 Patch 228913 2 jschuh 2010-05-21 08:01:20 -0700 This removes custom binding code that was made redundant by: http://trac.webkit.org/changeset/59866 229353 3 56662 commit-queue 2010-05-22 16:46:49 -0700 Comment on attachment 56662 Patch Clearing flags on attachment: 56662 Committed r60023: <http://trac.webkit.org/changeset/60023> 229354 4 commit-queue 2010-05-22 16:46:54 -0700 All reviewed patches have been landed. Closing bug. 56662 2010-05-20 19:19:01 -0700 2010-05-22 16:46:49 -0700 Patch bug-39467-20100520191900.patch text/plain 13561 jschuh SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTg5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDUtMjAgIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIGFuZCBzaW1wbGlmeSBjdXN0b20gYmluZGluZ3MgZm9yIE5vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NDY3CisKKyAgICAgICAgQ3Vz dG9tIGJpbmRpbmdzIGZvciBub2RlVmFsdWUgYW5kIHRleHRDb250ZW50IGFyZSBubyBsb25nZXIg bmVlZGVkLCAKKyAgICAgICAgYW5kIGNoaWxkIG1hbmlwdWxhdG9ycyBhcmUgc2ltcGxpZmllZCBi ZWNhdXNlIG9yaWdpbiBjaGVja3Mgd2VyZSBtb3ZlZCAKKyAgICAgICAgb3V0IG9mIHRoZSBiaW5k aW5ncyBieTogaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNTk4NjYKKworICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU05v ZGU6Omluc2VydEJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpKU05vZGU6OnJlcGxhY2VDaGls ZCk6CisgICAgICAgIChXZWJDb3JlOjpKU05vZGU6OnJlbW92ZUNoaWxkKToKKyAgICAgICAgKFdl YkNvcmU6OkpTTm9kZTo6YXBwZW5kQ2hpbGQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOE5vZGVDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhOb2RlOjppbnNlcnRCZWZv cmVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpWOE5vZGU6OnJlcGxhY2VDaGlsZENhbGxi YWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4Tm9kZTo6cmVtb3ZlQ2hpbGRDYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpWOE5vZGU6OmFwcGVuZENoaWxkQ2FsbGJhY2spOgorICAgICAgICAq IGRvbS9Ob2RlLmlkbDoKKwogMjAxMC0wNS0yMCAgWW91bmcgSGFuIExlZSAgPGpveWJyb0Bjb21w YW55MTAwLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdl YkNvcmUvYmluZGluZ3MvanMvSlNOb2RlQ3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHAJKHJldmlzaW9uIDU5ODg4KQorKysgV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCw1MSAr NjgsOSBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0 YXRpYyBpbmxpbmUgYm9vbCBpc0F0dHJGcmFtZVNyYyhFbGVtZW50ICplbGVtZW50LCBjb25zdCBT dHJpbmcmIG5hbWUpCi17Ci0gICAgcmV0dXJuIGVsZW1lbnQgJiYgKGVsZW1lbnQtPmhhc1RhZ05h bWUoSFRNTE5hbWVzOjppZnJhbWVUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVz OjpmcmFtZVRhZykpICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsICJzcmMiKTsKLX0KLQotdm9p ZCBKU05vZGU6OnNldE5vZGVWYWx1ZShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVl IHZhbHVlKQotewotICAgIE5vZGUqIGltcCA9IHN0YXRpY19jYXN0PE5vZGUqPihpbXBsKCkpOwot ICAgIFN0cmluZyBub2RlVmFsdWUgPSB2YWx1ZVRvU3RyaW5nV2l0aE51bGxDaGVjayhleGVjLCB2 YWx1ZSk7Ci0KLSAgICBpZiAoaW1wLT5ub2RlVHlwZSgpID09IE5vZGU6OkFUVFJJQlVURV9OT0RF KSB7Ci0gICAgICAgIEVsZW1lbnQqIG93bmVyRWxlbWVudCA9IHN0YXRpY19jYXN0PEF0dHIqPihp bXBsKCkpLT5vd25lckVsZW1lbnQoKTsKLSAgICAgICAgaWYgKG93bmVyRWxlbWVudCAmJiAhYWxs b3dTZXR0aW5nU3JjVG9KYXZhc2NyaXB0VVJMKGV4ZWMsIG93bmVyRWxlbWVudCwgaW1wLT5ub2Rl TmFtZSgpLCBub2RlVmFsdWUpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIEV4 Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgIGltcC0+c2V0Tm9kZVZhbHVlKG5vZGVWYWx1ZSwgZWMp OwotICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7Ci19Ci0KLXZvaWQgSlNOb2RlOjpzZXRU ZXh0Q29udGVudChKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVlIHZhbHVlKQotewot ICAgIE5vZGUqIGltcCA9IHN0YXRpY19jYXN0PE5vZGUqPihpbXBsKCkpOwotICAgIFN0cmluZyBu b2RlVmFsdWUgPSB2YWx1ZVRvU3RyaW5nV2l0aE51bGxDaGVjayhleGVjLCB2YWx1ZSk7Ci0KLSAg ICBpZiAoaW1wLT5ub2RlVHlwZSgpID09IE5vZGU6OkFUVFJJQlVURV9OT0RFKSB7Ci0gICAgICAg IEVsZW1lbnQqIG93bmVyRWxlbWVudCA9IHN0YXRpY19jYXN0PEF0dHIqPihpbXBsKCkpLT5vd25l ckVsZW1lbnQoKTsKLSAgICAgICAgaWYgKG93bmVyRWxlbWVudCAmJiAhYWxsb3dTZXR0aW5nU3Jj VG9KYXZhc2NyaXB0VVJMKGV4ZWMsIG93bmVyRWxlbWVudCwgaW1wLT5ub2RlTmFtZSgpLCBub2Rl VmFsdWUpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIEV4Y2VwdGlvbkNvZGUg ZWMgPSAwOwotICAgIGltcC0+c2V0VGV4dENvbnRlbnQobm9kZVZhbHVlLCBlYyk7Ci0gICAgc2V0 RE9NRXhjZXB0aW9uKGV4ZWMsIGVjKTsKLX0KLQogSlNWYWx1ZSBKU05vZGU6Omluc2VydEJlZm9y ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiB7CiAgICAgTm9kZSogaW1w ID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGltcGwoKSk7Ci0gICAgaWYgKGltcC0+bm9kZVR5cGUoKSA9 PSBOb2RlOjpBVFRSSUJVVEVfTk9ERSAmJiBpc0F0dHJGcmFtZVNyYyhzdGF0aWNfY2FzdDxBdHRy Kj4oaW1wbCgpKS0+b3duZXJFbGVtZW50KCksIGltcC0+bm9kZU5hbWUoKSkpIHsKLSAgICAgICAg c2V0RE9NRXhjZXB0aW9uKGV4ZWMsIE5PVF9TVVBQT1JURURfRVJSKTsKLSAgICAgICAgcmV0dXJu IGpzTnVsbCgpOwotICAgIH0KLQogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIGJvb2wg b2sgPSBpbXAtPmluc2VydEJlZm9yZSh0b05vZGUoYXJncy5hdCgwKSksIHRvTm9kZShhcmdzLmF0 KDEpKSwgZWMsIHRydWUpOwogICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7CkBAIC0xMjQs MTEgKzgyLDYgQEAgSlNWYWx1ZSBKU05vZGU6Omluc2VydEJlZm9yZShFeGVjU3RhdGUqIAogSlNW YWx1ZSBKU05vZGU6OnJlcGxhY2VDaGlsZChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3Qm IGFyZ3MpCiB7CiAgICAgTm9kZSogaW1wID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGltcGwoKSk7Ci0g ICAgaWYgKGltcC0+bm9kZVR5cGUoKSA9PSBOb2RlOjpBVFRSSUJVVEVfTk9ERSAmJiBpc0F0dHJG cmFtZVNyYyhzdGF0aWNfY2FzdDxBdHRyKj4oaW1wbCgpKS0+b3duZXJFbGVtZW50KCksIGltcC0+ bm9kZU5hbWUoKSkpIHsKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uKGV4ZWMsIE5PVF9TVVBQT1JU RURfRVJSKTsKLSAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwotICAgIH0KLQogICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOwogICAgIGJvb2wgb2sgPSBpbXAtPnJlcGxhY2VDaGlsZCh0b05vZGUoYXJn cy5hdCgwKSksIHRvTm9kZShhcmdzLmF0KDEpKSwgZWMsIHRydWUpOwogICAgIHNldERPTUV4Y2Vw dGlvbihleGVjLCBlYyk7CkBAIC0xNDAsMTEgKzkzLDYgQEAgSlNWYWx1ZSBKU05vZGU6OnJlcGxh Y2VDaGlsZChFeGVjU3RhdGUqIAogSlNWYWx1ZSBKU05vZGU6OnJlbW92ZUNoaWxkKEV4ZWNTdGF0 ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJncykKIHsKICAgICBOb2RlKiBpbXAgPSBzdGF0aWNf Y2FzdDxOb2RlKj4oaW1wbCgpKTsKLSAgICBpZiAoaW1wLT5ub2RlVHlwZSgpID09IE5vZGU6OkFU VFJJQlVURV9OT0RFICYmIGlzQXR0ckZyYW1lU3JjKHN0YXRpY19jYXN0PEF0dHIqPihpbXBsKCkp LT5vd25lckVsZW1lbnQoKSwgaW1wLT5ub2RlTmFtZSgpKSkgewotICAgICAgICBzZXRET01FeGNl cHRpb24oZXhlYywgTk9UX1NVUFBPUlRFRF9FUlIpOwotICAgICAgICByZXR1cm4ganNOdWxsKCk7 Ci0gICAgfQotCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgYm9vbCBvayA9IGltcC0+ cmVtb3ZlQ2hpbGQodG9Ob2RlKGFyZ3MuYXQoMCkpLCBlYyk7CiAgICAgc2V0RE9NRXhjZXB0aW9u KGV4ZWMsIGVjKTsKQEAgLTE1NiwxMSArMTA0LDYgQEAgSlNWYWx1ZSBKU05vZGU6OnJlbW92ZUNo aWxkKEV4ZWNTdGF0ZSogZQogSlNWYWx1ZSBKU05vZGU6OmFwcGVuZENoaWxkKEV4ZWNTdGF0ZSog ZXhlYywgY29uc3QgQXJnTGlzdCYgYXJncykKIHsKICAgICBOb2RlKiBpbXAgPSBzdGF0aWNfY2Fz dDxOb2RlKj4oaW1wbCgpKTsKLSAgICBpZiAoaW1wLT5ub2RlVHlwZSgpID09IE5vZGU6OkFUVFJJ QlVURV9OT0RFICYmIGlzQXR0ckZyYW1lU3JjKHN0YXRpY19jYXN0PEF0dHIqPihpbXBsKCkpLT5v d25lckVsZW1lbnQoKSwgaW1wLT5ub2RlTmFtZSgpKSkgewotICAgICAgICBzZXRET01FeGNlcHRp b24oZXhlYywgTk9UX1NVUFBPUlRFRF9FUlIpOwotICAgICAgICByZXR1cm4ganNOdWxsKCk7Ci0g ICAgfQotCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgYm9vbCBvayA9IGltcC0+YXBw ZW5kQ2hpbGQodG9Ob2RlKGFyZ3MuYXQoMCkpLCBlYywgdHJ1ZSk7CiAgICAgc2V0RE9NRXhjZXB0 aW9uKGV4ZWMsIGVjKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1 c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhOb2Rl Q3VzdG9tLmNwcAkocmV2aXNpb24gNTk4ODgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOE5vZGVDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw1NyArNTcsMTIgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNGcmFtZVNyYyhFbGVt ZW50ICplbGVtZW50LCBjb25zdCBTdHJpbmcmIG5hbWUpCi17Ci0gICAgcmV0dXJuIGVsZW1lbnQg JiYgKGVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppZnJhbWVUYWcpIHx8IGVsZW1lbnQt Pmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpmcmFtZVRhZykpICYmIGVxdWFsSWdub3JpbmdDYXNlKG5h bWUsICJzcmMiKTsKLX0KLQotdm9pZCBWOE5vZGU6OnRleHRDb250ZW50QWNjZXNzb3JTZXR0ZXIo djg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQotewotICAgIE5vZGUqIGltcCA9IFY4Tm9kZTo6 dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7Ci0gICAgU3RyaW5nIG5vZGVWYWx1ZSA9IHRvV2ViQ29y ZVN0cmluZ1dpdGhOdWxsQ2hlY2sodmFsdWUpOwotCi0gICAgaWYgKGltcC0+bm9kZVR5cGUoKSA9 PSBOb2RlOjpBVFRSSUJVVEVfTk9ERSkgewotICAgICAgICBFbGVtZW50ICogb3duZXJFbGVtZW50 ID0gVjhBdHRyOjp0b05hdGl2ZShpbmZvLkhvbGRlcigpKS0+b3duZXJFbGVtZW50KCk7Ci0gICAg ICAgIGlmIChvd25lckVsZW1lbnQgJiYgIVY4QmluZGluZ1NlY3VyaXR5OjphbGxvd1NldHRpbmdT cmNUb0phdmFzY3JpcHRVUkwoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwgb3duZXJFbGVtZW50LCBp bXAtPm5vZGVOYW1lKCksIG5vZGVWYWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQot Ci0gICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgaW1wLT5zZXRUZXh0Q29udGVudChub2Rl VmFsdWUsIGVjKTsKLSAgICBpZiAoZWMpCi0gICAgICAgIHRocm93RXJyb3IoZWMpOwotfQotCi12 b2lkIFY4Tm9kZTo6bm9kZVZhbHVlQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+ IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZv JiBpbmZvKQotewotICAgIE5vZGUqIGltcCA9IFY4Tm9kZTo6dG9OYXRpdmUoaW5mby5Ib2xkZXIo KSk7Ci0gICAgU3RyaW5nIG5vZGVWYWx1ZSA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2so dmFsdWUpOwotCi0gICAgaWYgKGltcC0+bm9kZVR5cGUoKSA9PSBOb2RlOjpBVFRSSUJVVEVfTk9E RSkgewotICAgICAgICBFbGVtZW50ICogb3duZXJFbGVtZW50ID0gVjhBdHRyOjp0b05hdGl2ZShp bmZvLkhvbGRlcigpKS0+b3duZXJFbGVtZW50KCk7Ci0gICAgICAgIGlmIChvd25lckVsZW1lbnQg JiYgIVY4QmluZGluZ1NlY3VyaXR5OjphbGxvd1NldHRpbmdTcmNUb0phdmFzY3JpcHRVUkwoVjhC aW5kaW5nU3RhdGU6Ok9ubHkoKSwgb3duZXJFbGVtZW50LCBpbXAtPm5vZGVOYW1lKCksIG5vZGVW YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgRXhjZXB0aW9uQ29kZSBl YyA9IDA7Ci0gICAgaW1wLT5zZXROb2RlVmFsdWUobm9kZVZhbHVlLCBlYyk7Ci0gICAgaWYgKGVj KQotICAgICAgICB0aHJvd0Vycm9yKGVjKTsKLX0KLQogLy8gVGhpcyBmdW5jdGlvbiBpcyBjdXN0 b21pemVkIHRvIHRha2UgYWR2YW50YWdlIG9mIHRoZSBvcHRpb25hbCA0dGggYXJndW1lbnQ6IHNo b3VsZExhenlBdHRhY2gKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6Omluc2VydEJlZm9y ZUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiB7CiAgICAgSU5DX1NUQVRTKCJE T00uTm9kZS5pbnNlcnRCZWZvcmUiKTsKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGhvbGRl ciA9IGFyZ3MuSG9sZGVyKCk7CiAgICAgTm9kZSogaW1wID0gVjhOb2RlOjp0b05hdGl2ZShob2xk ZXIpOwotCi0gICAgaWYgKGltcC0+bm9kZVR5cGUoKSA9PSBOb2RlOjpBVFRSSUJVVEVfTk9ERSAm JiBpc0ZyYW1lU3JjKFY4QXR0cjo6dG9OYXRpdmUoaG9sZGVyKS0+b3duZXJFbGVtZW50KCksIGlt cC0+bm9kZU5hbWUoKSkpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKE5PVF9T VVBQT1JURURfRVJSKTsKLSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwot ICAgIH0KLQogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIE5vZGUqIG5ld0NoaWxkID0g VjhOb2RlOjpIYXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4Tm9kZTo6dG9OYXRpdmUodjg6OkhhbmRs ZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwogICAgIE5vZGUqIHJlZkNoaWxkID0g VjhOb2RlOjpIYXNJbnN0YW5jZShhcmdzWzFdKSA/IFY4Tm9kZTo6dG9OYXRpdmUodjg6OkhhbmRs ZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzFdKSkgOiAwOwpAQCAtMTI3LDEyICs4Miw2IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6OnJlcGxhY2VDaGkKICAgICBJTkNfU1RBVFMoIkRP TS5Ob2RlLnJlcGxhY2VDaGlsZCIpOwogICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gaG9sZGVy ID0gYXJncy5Ib2xkZXIoKTsKICAgICBOb2RlKiBpbXAgPSBWOE5vZGU6OnRvTmF0aXZlKGhvbGRl cik7Ci0KLSAgICBpZiAoaW1wLT5ub2RlVHlwZSgpID09IE5vZGU6OkFUVFJJQlVURV9OT0RFICYm IGlzRnJhbWVTcmMoVjhBdHRyOjp0b05hdGl2ZShob2xkZXIpLT5vd25lckVsZW1lbnQoKSwgaW1w LT5ub2RlTmFtZSgpKSkgewotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oTk9UX1NV UFBPUlRFRF9FUlIpOwotICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7Ci0g ICAgfQotCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgTm9kZSogbmV3Q2hpbGQgPSBW OE5vZGU6Okhhc0luc3RhbmNlKGFyZ3NbMF0pID8gVjhOb2RlOjp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAgICAgTm9kZSogb2xkQ2hpbGQgPSBW OE5vZGU6Okhhc0luc3RhbmNlKGFyZ3NbMV0pID8gVjhOb2RlOjp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMV0pKSA6IDA7CkBAIC0xNTEsMTIgKzEwMCw2IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6OnJlbW92ZUNoaWwKICAgICBJTkNfU1RBVFMoIkRP TS5Ob2RlLnJlbW92ZUNoaWxkIik7CiAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIg PSBhcmdzLkhvbGRlcigpOwogICAgIE5vZGUqIGltcCA9IFY4Tm9kZTo6dG9OYXRpdmUoaG9sZGVy KTsKLQotICAgIGlmIChpbXAtPm5vZGVUeXBlKCkgPT0gTm9kZTo6QVRUUklCVVRFX05PREUgJiYg aXNGcmFtZVNyYyhWOEF0dHI6OnRvTmF0aXZlKGhvbGRlciktPm93bmVyRWxlbWVudCgpLCBpbXAt Pm5vZGVOYW1lKCkpKSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihOT1RfU1VQ UE9SVEVEX0VSUik7Ci0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAg ICB9Ci0KICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBOb2RlKiBvbGRDaGlsZCA9IFY4 Tm9kZTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOE5vZGU6OnRvTmF0aXZlKHY4OjpIYW5kbGU8 djg6Ok9iamVjdD46OkNhc3QoYXJnc1swXSkpIDogMDsKICAgICBib29sIHN1Y2Nlc3MgPSBpbXAt PnJlbW92ZUNoaWxkKG9sZENoaWxkLCBlYyk7CkBAIC0xNzUsMTIgKzExOCw2IEBAIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOE5vZGU6OmFwcGVuZENoaWwKICAgICBJTkNfU1RBVFMoIkRPTS5Ob2Rl LmFwcGVuZENoaWxkIik7CiAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBhcmdz LkhvbGRlcigpOwogICAgIE5vZGUqIGltcCA9IFY4Tm9kZTo6dG9OYXRpdmUoaG9sZGVyKTsKLQot ICAgIGlmIChpbXAtPm5vZGVUeXBlKCkgPT0gTm9kZTo6QVRUUklCVVRFX05PREUgJiYgaXNGcmFt ZVNyYyhWOEF0dHI6OnRvTmF0aXZlKGhvbGRlciktPm93bmVyRWxlbWVudCgpLCBpbXAtPm5vZGVO YW1lKCkpKSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihOT1RfU1VQUE9SVEVE X0VSUik7Ci0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAgICB9Ci0K ICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBOb2RlKiBuZXdDaGlsZCA9IFY4Tm9kZTo6 SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOE5vZGU6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9i amVjdD46OkNhc3QoYXJnc1swXSkpIDogMDsKICAgICBib29sIHN1Y2Nlc3MgPSBpbXAtPmFwcGVu ZENoaWxkKG5ld0NoaWxkLCBlYywgdHJ1ZSApOwpJbmRleDogV2ViQ29yZS9kb20vTm9kZS5pZGwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vTm9kZS5pZGwJKHJldmlzaW9uIDU5ODg4KQorKysg V2ViQ29yZS9kb20vTm9kZS5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAgbW9k dWxlIGNvcmUgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgW0NvbnZlcnROdWxsU3RyaW5n VG89TnVsbF0gRE9NU3RyaW5nICAgICAgICBub2RlTmFtZTsKIAogICAgICAgICAgICAgICAgICAv LyBGSVhNRTogdGhlIHNwZWMgc2F5cyB0aGlzIGNhbiBhbHNvIHJhaXNlIG9uIHJldHJpZXZhbC4K LSAgICAgICAgICAgICAgICAgYXR0cmlidXRlIFtDdXN0b21TZXR0ZXIsIENvbnZlcnROdWxsU3Ry aW5nVG89TnVsbCwgQ29udmVydE51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyAgICAgICAgbm9k ZVZhbHVlCisgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZSBbQ29udmVydE51bGxTdHJpbmdUbz1O dWxsLCBDb252ZXJ0TnVsbFRvTnVsbFN0cmluZ10gRE9NU3RyaW5nICAgICAgICBub2RlVmFsdWUK ICAgICAgICAgICAgICAgICAgICAgIHNldHRlciByYWlzZXMoRE9NRXhjZXB0aW9uKTsKIAogICAg ICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQgICBub2RlVHlwZTsKQEAgLTk2 LDcgKzk2LDcgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgW0Nv bnZlcnROdWxsU3RyaW5nVG89TnVsbF0gRE9NU3RyaW5nICAgICAgIGJhc2VVUkk7CiAKICAgICAg ICAgICAgICAgICAgLy8gRklYTUU6IHRoZSBzcGVjIHNheXMgdGhpcyBjYW4gYWxzbyByYWlzZSBv biByZXRyaWV2YWwuCi0gICAgICAgICAgICAgICAgIGF0dHJpYnV0ZSBbQ3VzdG9tU2V0dGVyLCBD b252ZXJ0TnVsbFN0cmluZ1RvPU51bGwsIENvbnZlcnROdWxsVG9OdWxsU3RyaW5nXSBET01TdHJp bmcgICAgICAgdGV4dENvbnRlbnQKKyAgICAgICAgICAgICAgICAgYXR0cmlidXRlIFtDb252ZXJ0 TnVsbFN0cmluZ1RvPU51bGwsIENvbnZlcnROdWxsVG9OdWxsU3RyaW5nXSBET01TdHJpbmcgICAg ICAgdGV4dENvbnRlbnQKICAgICAgICAgICAgICAgICAgICAgIHNldHRlciByYWlzZXMoRE9NRXhj ZXB0aW9uKTsKIAogICAgICAgICBib29sZWFuICAgICAgICAgICAgaXNTYW1lTm9kZShpbiBOb2Rl IG90aGVyKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDU5ODk2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUtMjAgIEp1c3RpbiBT Y2h1aCAgPGpzY2h1aEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGFuZCBzaW1wbGlmeSBjdXN0b20gYmluZGluZ3Mg Zm9yIE5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM5NDY3CisKKyAgICAgICAgQ2hpbGQgbWFuaXB1bGF0aW9uIG1ldGhvZHMgbm93IHRocm93IHNl Y3VyaXR5IGV4Y2VwdGlvbiBpbnN0ZWFkIG9mCisgICAgICAgIG5vdCBpbXBsZW1lbnRlZCBleGNl cHRpb24uCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L3hzcy1ERU5JRUQtaWZyYW1l LXNyYy1hbGlhcy1leHBlY3RlZC50eHQ6CisKIDIwMTAtMDUtMjAgIFpoZW55YW8gTW8gIDx6bW9A Z29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4 OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3hzcy1ERU5JRUQtaWZyYW1lLXNyYy1h bGlhcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9z ZWN1cml0eS94c3MtREVOSUVELWlmcmFtZS1zcmMtYWxpYXMtZXhwZWN0ZWQudHh0CShyZXZpc2lv biA1OTg4OCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkveHNzLURFTklFRC1p ZnJhbWUtc3JjLWFsaWFzLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMjAsNiArMjAs MTYgQEAgQ09OU09MRSBNRVNTQUdFOiBsaW5lIDE6IFVuc2FmZSBKYXZhU2NyaQogCiBDT05TT0xF IE1FU1NBR0U6IGxpbmUgMTogVW5zYWZlIEphdmFTY3JpcHQgYXR0ZW1wdCB0byBhY2Nlc3MgZnJh bWUgd2l0aCBVUkwgaHR0cDovL2xvY2FsaG9zdDo4MDgwL3NlY3VyaXR5L3Jlc291cmNlcy9pbm5v Y2VudC12aWN0aW0uaHRtbCBmcm9tIGZyYW1lIHdpdGggVVJMIGh0dHA6Ly8xMjcuMC4wLjE6ODAw MC9zZWN1cml0eS94c3MtREVOSUVELWlmcmFtZS1zcmMtYWxpYXMuaHRtbC4gRG9tYWlucywgcHJv dG9jb2xzIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgogCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTog VW5zYWZlIEphdmFTY3JpcHQgYXR0ZW1wdCB0byBhY2Nlc3MgZnJhbWUgd2l0aCBVUkwgaHR0cDov L2xvY2FsaG9zdDo4MDgwL3NlY3VyaXR5L3Jlc291cmNlcy9pbm5vY2VudC12aWN0aW0uaHRtbCBm cm9tIGZyYW1lIHdpdGggVVJMIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS94c3MtREVO SUVELWlmcmFtZS1zcmMtYWxpYXMuaHRtbC4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0cyBt dXN0IG1hdGNoLgorCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogVW5zYWZlIEphdmFTY3JpcHQg YXR0ZW1wdCB0byBhY2Nlc3MgZnJhbWUgd2l0aCBVUkwgaHR0cDovL2xvY2FsaG9zdDo4MDgwL3Nl Y3VyaXR5L3Jlc291cmNlcy9pbm5vY2VudC12aWN0aW0uaHRtbCBmcm9tIGZyYW1lIHdpdGggVVJM IGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS94c3MtREVOSUVELWlmcmFtZS1zcmMtYWxp YXMuaHRtbC4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgorCitDT05T T0xFIE1FU1NBR0U6IGxpbmUgMTogVW5zYWZlIEphdmFTY3JpcHQgYXR0ZW1wdCB0byBhY2Nlc3Mg ZnJhbWUgd2l0aCBVUkwgaHR0cDovL2xvY2FsaG9zdDo4MDgwL3NlY3VyaXR5L3Jlc291cmNlcy9p bm5vY2VudC12aWN0aW0uaHRtbCBmcm9tIGZyYW1lIHdpdGggVVJMIGh0dHA6Ly8xMjcuMC4wLjE6 ODAwMC9zZWN1cml0eS94c3MtREVOSUVELWlmcmFtZS1zcmMtYWxpYXMuaHRtbC4gRG9tYWlucywg cHJvdG9jb2xzIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgorCitDT05TT0xFIE1FU1NBR0U6IGxpbmUg MTogVW5zYWZlIEphdmFTY3JpcHQgYXR0ZW1wdCB0byBhY2Nlc3MgZnJhbWUgd2l0aCBVUkwgaHR0 cDovL2xvY2FsaG9zdDo4MDgwL3NlY3VyaXR5L3Jlc291cmNlcy9pbm5vY2VudC12aWN0aW0uaHRt bCBmcm9tIGZyYW1lIHdpdGggVVJMIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS94c3Mt REVOSUVELWlmcmFtZS1zcmMtYWxpYXMuaHRtbC4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0 cyBtdXN0IG1hdGNoLgorCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogVW5zYWZlIEphdmFTY3Jp cHQgYXR0ZW1wdCB0byBhY2Nlc3MgZnJhbWUgd2l0aCBVUkwgaHR0cDovL2xvY2FsaG9zdDo4MDgw L3NlY3VyaXR5L3Jlc291cmNlcy9pbm5vY2VudC12aWN0aW0uaHRtbCBmcm9tIGZyYW1lIHdpdGgg VVJMIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS94c3MtREVOSUVELWlmcmFtZS1zcmMt YWxpYXMuaHRtbC4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgorCiBU aGlzIHNjcmlwdCB0ZXN0cyBpZiBpZnJhbWUuc3JjIGNhbiBiZSBzZXQgdG8gYSBKYXZhU2NyaXB0 IFVSTCB2aWEgYWx0ZXJuYXRlIERPTSBpbnRlcmZhY2VzIChzdWNoIGFzIE5vZGUudGV4dENvbnRl bnQgb3IgTmFtZWROb2RlLnNldE5hbWVkSXRlbSkuIFRoZSB0ZXN0IGlzIHN1Y2Nlc3NmdWwgaWYg bm8gYWxlcnRzIGFwcGVhciBhbmQgdGhlIHBhZ2UgZmluaXNoZXMgbG9hZGluZy4KIAogCg==