68672 2011-09-22 17:55:42 -0700 Rename many obviously-correct call sites in WebCore using releaseRef to use it by its new name leakRef 2011-10-03 15:14:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 41374 1 darin darin dbates oldest_to_newest 471989 0 darin 2011-09-22 17:55:42 -0700 Rename many obviously-correct call sites in WebCore using releaseRef to use it by its new name leakRef 471990 1 108433 darin 2011-09-22 17:57:30 -0700 Created attachment 108433 Patch 472017 2 108433 dbates 2011-09-22 19:16:46 -0700 Comment on attachment 108433 Patch This looks sane to me. 472096 3 108433 webkit.review.bot 2011-09-23 00:09:31 -0700 Comment on attachment 108433 Patch Attachment 108433 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9798617 477276 4 darin 2011-10-03 15:14:42 -0700 Committed r96547: <http://trac.webkit.org/changeset/96547> 108433 2011-09-22 17:57:30 -0700 2011-09-23 00:09:31 -0700 Patch bug-68672-20110922175728.patch text/plain 23475 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NzY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNjYgQEAKKzIwMTEtMDktMjIgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBtYW55IG9idmlvdXNseS1j b3JyZWN0IGNhbGwgc2l0ZXMgaW4gV2ViQ29yZSB1c2luZyByZWxlYXNlUmVmIHRvIHVzZSBpdCBi eSBpdHMgbmV3IG5hbWUgbGVha1JlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Njg2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0RPTVdpbmRvd0Jhc2U6OmNvbW1vbkpTR2xvYmFsRGF0YSk6CisgICAgICAg ICogY3NzL0NTU0luaXRpYWxWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTSW5pdGlhbFZh bHVlOjpjcmVhdGVFeHBsaWNpdCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NJbml0aWFsVmFsdWU6 OmNyZWF0ZUltcGxpY2l0KToKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmluaXQpOgorICAgICAgICAqIGNz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlVUFTaGVldCk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZvckVsZW1lbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6d2hlZWxFdmVudCk6CisgICAgICAgICogcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1l RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UpOgor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlr dS9SZW5kZXJUaGVtZUhhaWt1LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjp0 aGVtZUZvclBhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvRE5TQ0ZOZXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RE5TUmVzb2x2ZVF1ZXVlOjpyZXNvbHZlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnJlbGVhc2VDb25uZWN0aW9uRm9yRG93bmxvYWQpOgor ICAgICAgICAqIHBsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWU6OnRoZW1lRm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU aGVtZVF0OjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKyAgICAgICAgKiBwbGF0Zm9y bS90ZXh0L0JpZGlDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpZGlDb250ZXh0Ojpj cmVhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL3d4L1JlbmRlclRoZW1lV3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OnRoZW1lRm9yUGFnZSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZTo6dGhlbWVGb3JQYWdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVD aHJvbWl1bU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjp0aGVtZUZvclBh Z2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtU2tpYTo6cGFpbnRTZWFyY2hGaWVs ZENhbmNlbEJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtU2tp YTo6cGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNEZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvbik6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OnRoZW1lRm9yUGFnZSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OnRo ZW1lRm9yUGFnZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU aGVtZTo6dGhlbWVGb3JQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpw YWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lV2luOjpwYWludFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVXaW46OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW5DRS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVmYXVsdFN0eWxlKToKKyAgICAg ICAgQ2FsbCBsZWFrUmVmIGluc3RlYWQgb2YgcmVsZWFzZVJlZi4gSSBkaWQgdGhpcyBvbmx5IGlu IHRoZSBjYXNlcyB3aGVyZQorICAgICAgICBpdCB3YXMgb2J2aW91cyB0byBtZSB0aGlzIHdhcyB0 aGUgcmlnaHQgd2F5IHRvIGRvIGl0LiBJJ2xsIGtlZXAgcmV2aXNpdGluZworICAgICAgICBzaXRl cyBzdGlsbCBjYWxsaW5nIGl0IHJlbGVhc2VSZWYgdW50aWwgdGhleSBhcmUgYWxsIGdvbmUuCisK IDIwMTEtMDktMjIgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIEFk ZCBFTkFCTEVfQ1NTX0ZJTFRFUlMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT RE9NV2luZG93QmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNET01XaW5kb3dCYXNlLmNwcAkocmV2aXNpb24gOTU3NjEpCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYs NyArMTY2LDcgQEAgSlNHbG9iYWxEYXRhKiBKU0RPTVdpbmRvd0Jhc2U6OmNvbW1vbkpTRwogCiAg ICAgc3RhdGljIEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSA9IDA7CiAgICAgaWYgKCFnbG9iYWxE YXRhKSB7Ci0gICAgICAgIGdsb2JhbERhdGEgPSBKU0dsb2JhbERhdGE6OmNyZWF0ZUxlYWtlZChU aHJlYWRTdGFja1R5cGVMYXJnZSwgTGFyZ2VIZWFwKS5yZWxlYXNlUmVmKCk7CisgICAgICAgIGds b2JhbERhdGEgPSBKU0dsb2JhbERhdGE6OmNyZWF0ZUxlYWtlZChUaHJlYWRTdGFja1R5cGVMYXJn ZSwgTGFyZ2VIZWFwKS5sZWFrUmVmKCk7CiAgICAgICAgIGdsb2JhbERhdGEtPnRpbWVvdXRDaGVj a2VyLnNldFRpbWVvdXRJbnRlcnZhbCgxMDAwMCk7IC8vIDEwIHNlY29uZHMKICNpZm5kZWYgTkRF QlVHCiAgICAgICAgIGdsb2JhbERhdGEtPmV4Y2x1c2l2ZVRocmVhZCA9IGN1cnJlbnRUaHJlYWQo KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbml0aWFsVmFsdWUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW5pdGlhbFZhbHVlLmgJKHJldmlzaW9uIDk1NzYx KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU0luaXRpYWxWYWx1ZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0zMCwxMiArMzAsMTIgQEAgY2xhc3MgQ1NTSW5pdGlhbFZhbHVlIDogcHVibGljIENTU1Zh bHVlIAogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU0luaXRpYWxWYWx1ZT4gY3Jl YXRlRXhwbGljaXQoKQogICAgIHsKLSAgICAgICAgc3RhdGljIENTU0luaXRpYWxWYWx1ZSogZXhw bGljaXRWYWx1ZSA9IGNyZWF0ZShmYWxzZSkucmVsZWFzZVJlZigpOworICAgICAgICBzdGF0aWMg Q1NTSW5pdGlhbFZhbHVlKiBleHBsaWNpdFZhbHVlID0gY3JlYXRlKGZhbHNlKS5sZWFrUmVmKCk7 CiAgICAgICAgIHJldHVybiBleHBsaWNpdFZhbHVlOwogICAgIH0KICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxDU1NJbml0aWFsVmFsdWU+IGNyZWF0ZUltcGxpY2l0KCkKICAgICB7Ci0gICAgICAgIHN0 YXRpYyBDU1NJbml0aWFsVmFsdWUqIGV4cGxpY2l0VmFsdWUgPSBjcmVhdGUodHJ1ZSkucmVsZWFz ZVJlZigpOworICAgICAgICBzdGF0aWMgQ1NTSW5pdGlhbFZhbHVlKiBleHBsaWNpdFZhbHVlID0g Y3JlYXRlKHRydWUpLmxlYWtSZWYoKTsKICAgICAgICAgcmV0dXJuIGV4cGxpY2l0VmFsdWU7CiAg ICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAJKHJl dmlzaW9uIDk1NzYxKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDIxICsyMzYsMjEgQEAgdm9pZCBDU1NQcmltaXRpdmVW YWx1ZTo6aW5pdChQYXNzUmVmUHRyPAogewogICAgIG1fdHlwZSA9IENTU19DT1VOVEVSOwogICAg IG1faGFzQ2FjaGVkQ1NTVGV4dCA9IGZhbHNlOwotICAgIG1fdmFsdWUuY291bnRlciA9IGMucmVs ZWFzZVJlZigpOworICAgIG1fdmFsdWUuY291bnRlciA9IGMubGVha1JlZigpOwogfQogCiB2b2lk IENTU1ByaW1pdGl2ZVZhbHVlOjppbml0KFBhc3NSZWZQdHI8UmVjdD4gcikKIHsKICAgICBtX3R5 cGUgPSBDU1NfUkVDVDsKICAgICBtX2hhc0NhY2hlZENTU1RleHQgPSBmYWxzZTsKLSAgICBtX3Zh bHVlLnJlY3QgPSByLnJlbGVhc2VSZWYoKTsKKyAgICBtX3ZhbHVlLnJlY3QgPSByLmxlYWtSZWYo KTsKIH0KIAogdm9pZCBDU1NQcmltaXRpdmVWYWx1ZTo6aW5pdChQYXNzUmVmUHRyPFF1YWQ+IHF1 YWQpCiB7CiAgICAgbV90eXBlID0gQ1NTX1FVQUQ7CiAgICAgbV9oYXNDYWNoZWRDU1NUZXh0ID0g ZmFsc2U7Ci0gICAgbV92YWx1ZS5xdWFkID0gcXVhZC5yZWxlYXNlUmVmKCk7CisgICAgbV92YWx1 ZS5xdWFkID0gcXVhZC5sZWFrUmVmKCk7CiB9CiAKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBP UlQpCkBAIC0yNTgsNyArMjU4LDcgQEAgdm9pZCBDU1NQcmltaXRpdmVWYWx1ZTo6aW5pdChQYXNz UmVmUHRyPAogewogICAgIG1fdHlwZSA9IENTU19EQVNIQk9BUkRfUkVHSU9OOwogICAgIG1faGFz Q2FjaGVkQ1NTVGV4dCA9IGZhbHNlOwotICAgIG1fdmFsdWUucmVnaW9uID0gci5yZWxlYXNlUmVm KCk7CisgICAgbV92YWx1ZS5yZWdpb24gPSByLmxlYWtSZWYoKTsKIH0KICNlbmRpZgogCkBAIC0y NjYsMTQgKzI2NiwxNCBAQCB2b2lkIENTU1ByaW1pdGl2ZVZhbHVlOjppbml0KFBhc3NSZWZQdHI8 CiB7CiAgICAgbV90eXBlID0gQ1NTX1BBSVI7CiAgICAgbV9oYXNDYWNoZWRDU1NUZXh0ID0gZmFs c2U7Ci0gICAgbV92YWx1ZS5wYWlyID0gcC5yZWxlYXNlUmVmKCk7CisgICAgbV92YWx1ZS5wYWly ID0gcC5sZWFrUmVmKCk7CiB9CiAKIHZvaWQgQ1NTUHJpbWl0aXZlVmFsdWU6OmluaXQoUGFzc1Jl ZlB0cjxDU1NXcmFwU2hhcGU+IHNoYXBlKQogewogICAgIG1fdHlwZSA9IENTU19TSEFQRTsKICAg ICBtX2hhc0NhY2hlZENTU1RleHQgPSBmYWxzZTsKLSAgICBtX3ZhbHVlLnNoYXBlID0gc2hhcGUu cmVsZWFzZVJlZigpOworICAgIG1fdmFsdWUuc2hhcGUgPSBzaGFwZS5sZWFrUmVmKCk7CiB9CiAK IENTU1ByaW1pdGl2ZVZhbHVlOjp+Q1NTUHJpbWl0aXZlVmFsdWUoKQpJbmRleDogU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gOTU3NjEpCisrKyBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0Myw3 ICs0NDMsNyBAQCBDU1NTdHlsZVNlbGVjdG9yOjpGZWF0dXJlczo6fkZlYXR1cmVzKCkKIAogc3Rh dGljIENTU1N0eWxlU2hlZXQqIHBhcnNlVUFTaGVldChjb25zdCBTdHJpbmcmIHN0cikKIHsKLSAg ICBDU1NTdHlsZVNoZWV0KiBzaGVldCA9IENTU1N0eWxlU2hlZXQ6OmNyZWF0ZSgpLnJlbGVhc2VS ZWYoKTsgLy8gbGVhayB0aGUgc2hlZXQgb24gcHVycG9zZQorICAgIENTU1N0eWxlU2hlZXQqIHNo ZWV0ID0gQ1NTU3R5bGVTaGVldDo6Y3JlYXRlKCkubGVha1JlZigpOyAvLyBsZWFrIHRoZSBzaGVl dCBvbiBwdXJwb3NlCiAgICAgc2hlZXQtPnBhcnNlU3RyaW5nKHN0cik7CiAgICAgcmV0dXJuIHNo ZWV0OwogfQpAQCAtMTAyNyw3ICsxMDI3LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gQ1NT U3R5bGVTZWxlY3RvcgogICAgIC8vIHdpbGwgdmFuaXNoIGlmIGEgc3R5bGUgcmVjYWxjIGhhcHBl bnMgZHVyaW5nIGxvYWRpbmcuCiAgICAgaWYgKGFsbG93U2hhcmluZyAmJiAhZS0+ZG9jdW1lbnQo KS0+aGF2ZVN0eWxlc2hlZXRzTG9hZGVkKCkgJiYgIWUtPnJlbmRlcmVyKCkpIHsKICAgICAgICAg aWYgKCFzX3N0eWxlTm90WWV0QXZhaWxhYmxlKSB7Ci0gICAgICAgICAgICBzX3N0eWxlTm90WWV0 QXZhaWxhYmxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZSgpLnJlbGVhc2VSZWYoKTsKKyAgICAgICAg ICAgIHNfc3R5bGVOb3RZZXRBdmFpbGFibGUgPSBSZW5kZXJTdHlsZTo6Y3JlYXRlKCkubGVha1Jl ZigpOwogICAgICAgICAgICAgc19zdHlsZU5vdFlldEF2YWlsYWJsZS0+cmVmKCk7CiAgICAgICAg ICAgICBzX3N0eWxlTm90WWV0QXZhaWxhYmxlLT5zZXREaXNwbGF5KE5PTkUpOwogICAgICAgICAg ICAgc19zdHlsZU5vdFlldEF2YWlsYWJsZS0+Zm9udCgpLnVwZGF0ZShtX2ZvbnRTZWxlY3Rvcik7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkocmV2aXNpb24gOTU3 NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTYzLDcgKzk2Myw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6cGFpbnRTY3JvbGxiYXJz KEdyYXBoaWMKIAogdm9pZCBTY3JvbGxWaWV3OjpwYWludFBhblNjcm9sbEljb24oR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0KQogewotICAgIHN0YXRpYyBJbWFnZSogcGFuU2Nyb2xsSWNvbiA9IElt YWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgicGFuSWNvbiIpLnJlbGVhc2VSZWYoKTsKKyAgICBz dGF0aWMgSW1hZ2UqIHBhblNjcm9sbEljb24gPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2Uo InBhbkljb24iKS5sZWFrUmVmKCk7CiAgICAgY29udGV4dC0+ZHJhd0ltYWdlKHBhblNjcm9sbElj b24sIENvbG9yU3BhY2VEZXZpY2VSR0IsIG1fcGFuU2Nyb2xsSWNvblBvaW50KTsKIH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCShy ZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVt ZUVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3OSw3ICszNzksNyBAQCBQYXNzUmVmUHRyPFJl bmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhlCiAgICAgaWYgKHBhZ2UpCiAgICAgICAgIHJldHVy biBSZW5kZXJUaGVtZUVmbDo6Y3JlYXRlKHBhZ2UpOwogCi0gICAgc3RhdGljIFJlbmRlclRoZW1l KiBmYWxsYmFjayA9IFJlbmRlclRoZW1lRWZsOjpjcmVhdGUoMCkucmVsZWFzZVJlZigpOworICAg IHN0YXRpYyBSZW5kZXJUaGVtZSogZmFsbGJhY2sgPSBSZW5kZXJUaGVtZUVmbDo6Y3JlYXRlKDAp LmxlYWtSZWYoKTsKICAgICByZXR1cm4gZmFsbGJhY2s7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAkocmV2aXNpb24gOTU3NjEp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTIsNyArMTEyLDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVu ZGVyVGhlbWVHdGs6OgogCiBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhl bWVGb3JQYWdlKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiBydCA9IFJl bmRlclRoZW1lR3RrOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCk7CisgICAgc3RhdGljIFJlbmRlclRo ZW1lKiBydCA9IFJlbmRlclRoZW1lR3RrOjpjcmVhdGUoKS5sZWFrUmVmKCk7CiAgICAgcmV0dXJu IHJ0OwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9SZW5kZXJUaGVt ZUhhaWt1LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9S ZW5kZXJUaGVtZUhhaWt1LmNwcAkocmV2aXNpb24gOTU3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9oYWlrdS9SZW5kZXJUaGVtZUhhaWt1LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMs NyArNDMsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZUhhaWt1CiAKIFBh c3NSZWZQdHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoUGFnZSopCiB7 Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiByZW5kZXJUaGVtZSA9IFJlbmRlclRoZW1lSGFpa3U6 OmNyZWF0ZSgpLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgUmVuZGVyVGhlbWUqIHJlbmRlclRo ZW1lID0gUmVuZGVyVGhlbWVIYWlrdTo6Y3JlYXRlKCkubGVha1JlZigpOwogICAgIHJldHVybiBy ZW5kZXJUaGVtZTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j Zi9ETlNDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jZi9ETlNDRk5ldC5jcHAJKHJldmlzaW9uIDk1NzYxKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9ETlNDRk5ldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Niw3 ICsxOTYsNyBAQCB2b2lkIEROU1Jlc29sdmVRdWV1ZTo6cmVzb2x2ZShjb25zdCBTdHJpCiAgICAg Q0ZIb3N0U2NoZWR1bGVXaXRoUnVuTG9vcChob3N0LmdldCgpLCBsb2FkZXJSdW5Mb29wKCksIGtD RlJ1bkxvb3BEZWZhdWx0TW9kZSk7CiAjZW5kaWYKICAgICBDRkhvc3RTdGFydEluZm9SZXNvbHV0 aW9uKGhvc3QuZ2V0KCksIGtDRkhvc3RBZGRyZXNzZXMsIDApOwotICAgIGhvc3QucmVsZWFzZVJl ZigpOyAvLyBUaGUgaG9zdCB3aWxsIGJlIHJlbGVhc2VkIGZyb20gY2xpZW50Q2FsbGJhY2soKS4K KyAgICBob3N0LmxlYWtSZWYoKTsgLy8gVGhlIGhvc3Qgd2lsbCBiZSByZWxlYXNlZCBmcm9tIGNs aWVudENhbGxiYWNrKCkuCiB9CiAKIHZvaWQgcHJlZmV0Y2hETlMoY29uc3QgU3RyaW5nJiBob3N0 bmFtZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VI YW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAkocmV2aXNpb24gOTU3NjEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02OTksNyArNjk5LDcgQEAgQ0ZVUkxDb25uZWN0aW9uUmVmIFJlc291 cmNlSGFuZGxlOjpjb25uZQogQ0ZVUkxDb25uZWN0aW9uUmVmIFJlc291cmNlSGFuZGxlOjpyZWxl YXNlQ29ubmVjdGlvbkZvckRvd25sb2FkKCkKIHsKICAgICBMT0coTmV0d29yaywgIkNGTmV0IC0g Sm9iICVwIHJlbGVhc2luZyBjb25uZWN0aW9uICVwIGZvciBkb3dubG9hZCIsIHRoaXMsIGQtPm1f Y29ubmVjdGlvbi5nZXQoKSk7Ci0gICAgcmV0dXJuIGQtPm1fY29ubmVjdGlvbi5yZWxlYXNlUmVm KCk7CisgICAgcmV0dXJuIGQtPm1fY29ubmVjdGlvbi5sZWFrUmVmKCk7CiB9CiAKIENGU3RyaW5n UmVmIFJlc291cmNlSGFuZGxlOjpzeW5jaHJvbm91c0xvYWRSdW5Mb29wTW9kZSgpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcAkocmV2aXNpb24g OTU3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTc2LDcgKzE3Niw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyVGhlbWU+ IFJlbmRlclRoZW1lOjp0aGUKICAgICBpZiAocGFnZSkKICAgICAgICAgcmV0dXJuIFJlbmRlclRo ZW1lUXQ6OmNyZWF0ZShwYWdlKTsKIAotICAgIHN0YXRpYyBSZW5kZXJUaGVtZSogZmFsbGJhY2sg PSBSZW5kZXJUaGVtZVF0OjpjcmVhdGUoMCkucmVsZWFzZVJlZigpOworICAgIHN0YXRpYyBSZW5k ZXJUaGVtZSogZmFsbGJhY2sgPSBSZW5kZXJUaGVtZVF0OjpjcmVhdGUoMCkubGVha1JlZigpOwog ICAgIHJldHVybiBmYWxsYmFjazsKIH0KIApAQCAtMTAzNCw4ICsxMDM0LDggQEAgYm9vbCBSZW5k ZXJUaGVtZVF0OjpwYWludFNlYXJjaEZpZWxkQ2FuYwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSAtIGNh bmNlbEJ1dHRvblNpemUgKyAxKSAvIDIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNh bmNlbEJ1dHRvblNpemUsIGNhbmNlbEJ1dHRvblNpemUpOwogICAgIEludFJlY3QgcGFpbnRpbmdS ZWN0ID0gY29udmVydFRvUGFpbnRpbmdSZWN0KGlucHV0UmVuZGVyQm94LCBvLCBjYW5jZWxCdXR0 b25SZWN0LCByKTsKLSAgICBzdGF0aWMgSW1hZ2UqIGNhbmNlbEltYWdlID0gSW1hZ2U6OmxvYWRQ bGF0Zm9ybVJlc291cmNlKCJzZWFyY2hDYW5jZWxCdXR0b24iKS5yZWxlYXNlUmVmKCk7Ci0gICAg c3RhdGljIEltYWdlKiBjYW5jZWxQcmVzc2VkSW1hZ2UgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVz b3VyY2UoInNlYXJjaENhbmNlbEJ1dHRvblByZXNzZWQiKS5yZWxlYXNlUmVmKCk7CisgICAgc3Rh dGljIEltYWdlKiBjYW5jZWxJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2Vh cmNoQ2FuY2VsQnV0dG9uIikubGVha1JlZigpOworICAgIHN0YXRpYyBJbWFnZSogY2FuY2VsUHJl c3NlZEltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hDYW5jZWxCdXR0 b25QcmVzc2VkIikubGVha1JlZigpOwogICAgIHBpLmNvbnRleHQtPmRyYXdJbWFnZShpc1ByZXNz ZWQobykgPyBjYW5jZWxQcmVzc2VkSW1hZ2UgOiBjYW5jZWxJbWFnZSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG8tPnN0eWxlKCktPmNvbG9yU3BhY2UoKSwgcGFpbnRpbmdSZWN0 KTsKICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0JpZGlDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0JpZGlDb250ZXh0LmNwcAkocmV2aXNpb24gOTU3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L0JpZGlDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIsMjAgKzQy LDIwIEBAIFBhc3NSZWZQdHI8QmlkaUNvbnRleHQ+IEJpZGlDb250ZXh0OjpjcmUKICAgICBBU1NF UlQobGV2ZWwgPD0gMSk7CiAgICAgaWYgKCFsZXZlbCkgewogICAgICAgICBpZiAoIW92ZXJyaWRl KSB7Ci0gICAgICAgICAgICBzdGF0aWMgQmlkaUNvbnRleHQqIGx0ckNvbnRleHQgPSBjcmVhdGVV bmNhY2hlZCgwLCBMZWZ0VG9SaWdodCwgZmFsc2UsIEZyb21TdHlsZU9yRE9NLCAwKS5yZWxlYXNl UmVmKCk7CisgICAgICAgICAgICBzdGF0aWMgQmlkaUNvbnRleHQqIGx0ckNvbnRleHQgPSBjcmVh dGVVbmNhY2hlZCgwLCBMZWZ0VG9SaWdodCwgZmFsc2UsIEZyb21TdHlsZU9yRE9NLCAwKS5sZWFr UmVmKCk7CiAgICAgICAgICAgICByZXR1cm4gbHRyQ29udGV4dDsKICAgICAgICAgfQogCi0gICAg ICAgIHN0YXRpYyBCaWRpQ29udGV4dCogbHRyT3ZlcnJpZGVDb250ZXh0ID0gY3JlYXRlVW5jYWNo ZWQoMCwgTGVmdFRvUmlnaHQsIHRydWUsIEZyb21TdHlsZU9yRE9NLCAwKS5yZWxlYXNlUmVmKCk7 CisgICAgICAgIHN0YXRpYyBCaWRpQ29udGV4dCogbHRyT3ZlcnJpZGVDb250ZXh0ID0gY3JlYXRl VW5jYWNoZWQoMCwgTGVmdFRvUmlnaHQsIHRydWUsIEZyb21TdHlsZU9yRE9NLCAwKS5sZWFrUmVm KCk7CiAgICAgICAgIHJldHVybiBsdHJPdmVycmlkZUNvbnRleHQ7CiAgICAgfQogCiAgICAgaWYg KCFvdmVycmlkZSkgewotICAgICAgICBzdGF0aWMgQmlkaUNvbnRleHQqIHJ0bENvbnRleHQgPSBj cmVhdGVVbmNhY2hlZCgxLCBSaWdodFRvTGVmdCwgZmFsc2UsIEZyb21TdHlsZU9yRE9NLCAwKS5y ZWxlYXNlUmVmKCk7CisgICAgICAgIHN0YXRpYyBCaWRpQ29udGV4dCogcnRsQ29udGV4dCA9IGNy ZWF0ZVVuY2FjaGVkKDEsIFJpZ2h0VG9MZWZ0LCBmYWxzZSwgRnJvbVN0eWxlT3JET00sIDApLmxl YWtSZWYoKTsKICAgICAgICAgcmV0dXJuIHJ0bENvbnRleHQ7CiAgICAgfQogCi0gICAgc3RhdGlj IEJpZGlDb250ZXh0KiBydGxPdmVycmlkZUNvbnRleHQgPSBjcmVhdGVVbmNhY2hlZCgxLCBSaWdo dFRvTGVmdCwgdHJ1ZSwgRnJvbVN0eWxlT3JET00sIDApLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0 aWMgQmlkaUNvbnRleHQqIHJ0bE92ZXJyaWRlQ29udGV4dCA9IGNyZWF0ZVVuY2FjaGVkKDEsIFJp Z2h0VG9MZWZ0LCB0cnVlLCBGcm9tU3R5bGVPckRPTSwgMCkubGVha1JlZigpOwogICAgIHJldHVy biBydGxPdmVycmlkZUNvbnRleHQ7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3d4L1JlbmRlclRoZW1lV3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3d4L1JlbmRlclRoZW1lV3guY3BwCShyZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3d4L1JlbmRlclRoZW1lV3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzcs NyArMTM3LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVuZGVyVGhlbWVXeDo6YwogCiBQ YXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKFBhZ2UqIHBh Z2UpCiB7Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiBydCA9IFJlbmRlclRoZW1lV3g6OmNyZWF0 ZSgpLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgUmVuZGVyVGhlbWUqIHJ0ID0gUmVuZGVyVGhl bWVXeDo6Y3JlYXRlKCkubGVha1JlZigpOwogICAgIHJldHVybiBydDsKIH0KIApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51 eC5jcHAJKHJldmlzaW9uIDk1NzYxKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1MaW51eC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDcgKzcwLDcgQEAg UGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVuZGVyVGhlbWVDaHJvbQogCiBQYXNzUmVmUHRyPFJl bmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKFBhZ2UqIHBhZ2UpCiB7Ci0gICAg c3RhdGljIFJlbmRlclRoZW1lKiBydCA9IFJlbmRlclRoZW1lQ2hyb21pdW1MaW51eDo6Y3JlYXRl KCkucmVsZWFzZVJlZigpOworICAgIHN0YXRpYyBSZW5kZXJUaGVtZSogcnQgPSBSZW5kZXJUaGVt ZUNocm9taXVtTGludXg6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKICAgICByZXR1cm4gcnQ7CiB9CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9t aXVtTWFjLm1tCShyZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3IEBA IE5TVmlldyogRmxpcHBlZFZpZXcoKQogCiBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJU aGVtZTo6dGhlbWVGb3JQYWdlKFBhZ2UqKQogewotICAgIHN0YXRpYyBSZW5kZXJUaGVtZSogcnQg PSBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCk7CisgICAgc3Rh dGljIFJlbmRlclRoZW1lKiBydCA9IFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OmNyZWF0ZSgpLmxl YWtSZWYoKTsKICAgICByZXR1cm4gcnQ7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lhLmNwcAkocmV2aXNpb24gOTU3 NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVNraWEu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsOCArMjkxLDggQEAgYm9vbCBSZW5kZXJUaGVtZUNo cm9taXVtU2tpYTo6cGFpbnRTZWFyYwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYW5j ZWxCdXR0b25TaXplLCBjYW5jZWxCdXR0b25TaXplKTsKICAgICBJbnRSZWN0IHBhaW50aW5nUmVj dCA9IGNvbnZlcnRUb1BhaW50aW5nUmVjdChpbnB1dFJlbmRlckJveCwgY2FuY2VsQnV0dG9uT2Jq ZWN0LCBjYW5jZWxCdXR0b25SZWN0LCByKTsKIAotICAgIHN0YXRpYyBJbWFnZSogY2FuY2VsSW1h Z2UgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaENhbmNlbCIpLnJlbGVhc2VS ZWYoKTsKLSAgICBzdGF0aWMgSW1hZ2UqIGNhbmNlbFByZXNzZWRJbWFnZSA9IEltYWdlOjpsb2Fk UGxhdGZvcm1SZXNvdXJjZSgic2VhcmNoQ2FuY2VsUHJlc3NlZCIpLnJlbGVhc2VSZWYoKTsKKyAg ICBzdGF0aWMgSW1hZ2UqIGNhbmNlbEltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNl KCJzZWFyY2hDYW5jZWwiKS5sZWFrUmVmKCk7CisgICAgc3RhdGljIEltYWdlKiBjYW5jZWxQcmVz c2VkSW1hZ2UgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaENhbmNlbFByZXNz ZWQiKS5sZWFrUmVmKCk7CiAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmRyYXdJbWFnZShpc1ByZXNz ZWQoY2FuY2VsQnV0dG9uT2JqZWN0KSA/IGNhbmNlbFByZXNzZWRJbWFnZSA6IGNhbmNlbEltYWdl LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FuY2VsQnV0dG9uT2JqZWN0LT5z dHlsZSgpLT5jb2xvclNwYWNlKCksIHBhaW50aW5nUmVjdCk7CiAgICAgcmV0dXJuIGZhbHNlOwpA QCAtMzM0LDcgKzMzNCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OnBhaW50U2Vh cmMKICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFnbmlmaWVyU2l6ZSwgbWFnbmlmaWVyU2l6 ZSk7CiAgICAgSW50UmVjdCBwYWludGluZ1JlY3QgPSBjb252ZXJ0VG9QYWludGluZ1JlY3QoaW5w dXRSZW5kZXJCb3gsIG1hZ25pZmllck9iamVjdCwgbWFnbmlmaWVyUmVjdCwgcik7CiAKLSAgICBz dGF0aWMgSW1hZ2UqIG1hZ25pZmllckltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNl KCJzZWFyY2hNYWduaWZpZXIiKS5yZWxlYXNlUmVmKCk7CisgICAgc3RhdGljIEltYWdlKiBtYWdu aWZpZXJJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2VhcmNoTWFnbmlmaWVy IikubGVha1JlZigpOwogICAgIHBhaW50SW5mby5jb250ZXh0LT5kcmF3SW1hZ2UobWFnbmlmaWVy SW1hZ2UsIG1hZ25pZmllck9iamVjdC0+c3R5bGUoKS0+Y29sb3JTcGFjZSgpLCBwYWludGluZ1Jl Y3QpOwogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTM2Nyw3ICszNjcsNyBAQCBib29sIFJlbmRl clRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjCiAgICAgICAgICAgICAgICAgICAgICAgICAg IG1hZ25pZmllcldpZHRoLCBtYWduaWZpZXJIZWlnaHQpOwogICAgIEludFJlY3QgcGFpbnRpbmdS ZWN0ID0gY29udmVydFRvUGFpbnRpbmdSZWN0KGlucHV0UmVuZGVyQm94LCBtYWduaWZpZXJPYmpl Y3QsIG1hZ25pZmllclJlY3QsIHIpOwogCi0gICAgc3RhdGljIEltYWdlKiBtYWduaWZpZXJJbWFn ZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2VhcmNoTWFnbmlmaWVyUmVzdWx0cyIp LnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgSW1hZ2UqIG1hZ25pZmllckltYWdlID0gSW1hZ2U6 OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hNYWduaWZpZXJSZXN1bHRzIikubGVha1JlZigp OwogICAgIHBhaW50SW5mby5jb250ZXh0LT5kcmF3SW1hZ2UobWFnbmlmaWVySW1hZ2UsIG1hZ25p Zmllck9iamVjdC0+c3R5bGUoKS0+Y29sb3JTcGFjZSgpLCBwYWludGluZ1JlY3QpOwogICAgIHJl dHVybiBmYWxzZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZUNocm9taXVtV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAJKHJldmlzaW9uIDk1NzYxKQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMzksNyArMjM5LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVuZGVyVGhlbWVD aHJvbQogCiBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdl KFBhZ2UqIHBhZ2UpCiB7Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiBydCA9IFJlbmRlclRoZW1l Q2hyb21pdW1XaW46OmNyZWF0ZSgpLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgUmVuZGVyVGhl bWUqIHJ0ID0gUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6Y3JlYXRlKCkubGVha1JlZigpOwogICAg IHJldHVybiBydDsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5tbQkocmV2aXNpb24gOTU3NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNCw3ICsxMjQsNyBAQCBlbnVt IHsKICNpZiBQTEFURk9STShNQUMpCiBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVt ZTo6dGhlbWVGb3JQYWdlKFBhZ2UqKQogewotICAgIHN0YXRpYyBSZW5kZXJUaGVtZSogcnQgPSBS ZW5kZXJUaGVtZU1hYzo6Y3JlYXRlKCkucmVsZWFzZVJlZigpOworICAgIHN0YXRpYyBSZW5kZXJU aGVtZSogcnQgPSBSZW5kZXJUaGVtZU1hYzo6Y3JlYXRlKCkubGVha1JlZigpOwogICAgIHJldHVy biBydDsKIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lU2FmYXJpLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVTYWZhcmkuY3BwCShyZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1LDggKzc1 LDggQEAgUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVuZGVyVGhlbWVTYWZhcgogCiBQYXNzUmVm UHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKFBhZ2UqIHBhZ2UpCiB7 Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiBzYWZhcmlUaGVtZSA9IFJlbmRlclRoZW1lU2FmYXJp OjpjcmVhdGUoKS5yZWxlYXNlUmVmKCk7Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiB3aW5kb3dz VGhlbWUgPSBSZW5kZXJUaGVtZVdpbjo6Y3JlYXRlKCkucmVsZWFzZVJlZigpOworICAgIHN0YXRp YyBSZW5kZXJUaGVtZSogc2FmYXJpVGhlbWUgPSBSZW5kZXJUaGVtZVNhZmFyaTo6Y3JlYXRlKCku bGVha1JlZigpOworICAgIHN0YXRpYyBSZW5kZXJUaGVtZSogd2luZG93c1RoZW1lID0gUmVuZGVy VGhlbWVXaW46OmNyZWF0ZSgpLmxlYWtSZWYoKTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIGlzIGNh bGxlZCBiZWZvcmUgU2V0dGluZ3MgaGFzIGJlZW4gaW5pdGlhbGl6ZWQgYnkgV2ViS2l0LCBzbyB3 aWxsIHJldHVybiBhCiAgICAgLy8gcG90ZW50aWFsbHkgd3JvbmcgYW5zd2VyIHRoZSB2ZXJ5IGZp cnN0IHRpbWUgaXQncyBjYWxsZWQgKHNlZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uY3BwCShyZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw3ICsx NjAsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZVdpbjo6CiAjaWYgIVVT RShTQUZBUklfVEhFTUUpCiBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZTo6dGhl bWVGb3JQYWdlKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgc3RhdGljIFJlbmRlclRoZW1lKiB3aW5UaGVt ZSA9IFJlbmRlclRoZW1lV2luOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCk7CisgICAgc3RhdGljIFJl bmRlclRoZW1lKiB3aW5UaGVtZSA9IFJlbmRlclRoZW1lV2luOjpjcmVhdGUoKS5sZWFrUmVmKCk7 CiAgICAgcmV0dXJuIHdpblRoZW1lOwogfQogI2VuZGlmCkBAIC04OTEsOCArODkxLDggQEAgYm9v bCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRTZWFyY2hGaWVsZENhbgogICAgIC8vIGJlIG9uZSBwaXhl bCBjbG9zZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRvIGxvb2sg YmV0dGVyIHdpdGggdGhlIHRleHQuCiAgICAgYm91bmRzLnNldFkocGFyZW50Qm94LnkoKSArIChw YXJlbnRCb3guaGVpZ2h0KCkgLSBib3VuZHMuaGVpZ2h0KCkgKyAxKSAvIDIpOwogCi0gICAgc3Rh dGljIEltYWdlKiBjYW5jZWxJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2Vh cmNoQ2FuY2VsIikucmVsZWFzZVJlZigpOwotICAgIHN0YXRpYyBJbWFnZSogY2FuY2VsUHJlc3Nl ZEltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hDYW5jZWxQcmVzc2Vk IikucmVsZWFzZVJlZigpOworICAgIHN0YXRpYyBJbWFnZSogY2FuY2VsSW1hZ2UgPSBJbWFnZTo6 bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaENhbmNlbCIpLmxlYWtSZWYoKTsKKyAgICBzdGF0 aWMgSW1hZ2UqIGNhbmNlbFByZXNzZWRJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJj ZSgic2VhcmNoQ2FuY2VsUHJlc3NlZCIpLmxlYWtSZWYoKTsKICAgICBwYWludEluZm8uY29udGV4 dC0+ZHJhd0ltYWdlKGlzUHJlc3NlZChvKSA/IGNhbmNlbFByZXNzZWRJbWFnZSA6IGNhbmNlbElt YWdlLCBvLT5zdHlsZSgpLT5jb2xvclNwYWNlKCksIGJvdW5kcyk7CiAgICAgcmV0dXJuIGZhbHNl OwogfQpAQCAtOTQxLDcgKzk0MSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVXaW46OnBhaW50U2VhcmNo RmllbGRSZXMKICAgICAvLyBiZSBvbmUgcGl4ZWwgY2xvc2VyIHRvIHRoZSBib3R0b20gb2YgdGhl IGZpZWxkLiAgVGhpcyB0ZW5kcyB0byBsb29rIGJldHRlciB3aXRoIHRoZSB0ZXh0LgogICAgIGJv dW5kcy5zZXRZKHBhcmVudEJveC55KCkgKyAocGFyZW50Qm94LmhlaWdodCgpIC0gYm91bmRzLmhl aWdodCgpICsgMSkgLyAyKTsKICAgICAKLSAgICBzdGF0aWMgSW1hZ2UqIG1hZ25pZmllckltYWdl ID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hNYWduaWZpZXIiKS5yZWxlYXNl UmVmKCk7CisgICAgc3RhdGljIEltYWdlKiBtYWduaWZpZXJJbWFnZSA9IEltYWdlOjpsb2FkUGxh dGZvcm1SZXNvdXJjZSgic2VhcmNoTWFnbmlmaWVyIikubGVha1JlZigpOwogICAgIHBhaW50SW5m by5jb250ZXh0LT5kcmF3SW1hZ2UobWFnbmlmaWVySW1hZ2UsIG8tPnN0eWxlKCktPmNvbG9yU3Bh Y2UoKSwgYm91bmRzKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC05NzcsNyArOTc3LDcgQEAg Ym9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRTZWFyY2hGaWVsZFJlcwogICAgIC8vIGJlIG9uZSBw aXhlbCBjbG9zZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRvIGxv b2sgYmV0dGVyIHdpdGggdGhlIHRleHQuCiAgICAgYm91bmRzLnNldFkocGFyZW50Qm94LnkoKSAr IChwYXJlbnRCb3guaGVpZ2h0KCkgLSBib3VuZHMuaGVpZ2h0KCkgKyAxKSAvIDIpOwogCi0gICAg c3RhdGljIEltYWdlKiBtYWduaWZpZXJJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJj ZSgic2VhcmNoTWFnbmlmaWVyUmVzdWx0cyIpLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgSW1h Z2UqIG1hZ25pZmllckltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFyY2hN YWduaWZpZXJSZXN1bHRzIikubGVha1JlZigpOwogICAgIHBhaW50SW5mby5jb250ZXh0LT5kcmF3 SW1hZ2UobWFnbmlmaWVySW1hZ2UsIG8tPnN0eWxlKCktPmNvbG9yU3BhY2UoKSwgYm91bmRzKTsK ICAgICByZXR1cm4gZmFsc2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVXaW5DRS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lV2luQ0UuY3BwCShyZXZpc2lvbiA5NTc2MSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbkNFLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsNyAr OTEsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZVdpbkNFCiAKIFBhc3NS ZWZQdHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoUGFnZSogcGFnZSkK IHsKLSAgICBzdGF0aWMgUmVuZGVyVGhlbWUqIHdpbmNlVGhlbWUgPSBSZW5kZXJUaGVtZVdpbkNF OjpjcmVhdGUoKS5yZWxlYXNlUmVmKCk7CisgICAgc3RhdGljIFJlbmRlclRoZW1lKiB3aW5jZVRo ZW1lID0gUmVuZGVyVGhlbWVXaW5DRTo6Y3JlYXRlKCkubGVha1JlZigpOwogICAgIHJldHVybiB3 aW5jZVRoZW1lOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAJKHJldmlzaW9uIDk1NzYxKQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGlubGluZSBSZW5kZXJTdHlsZSogZGVmYXVsdFN0 eWxlKCkKIHsKLSAgICBzdGF0aWMgUmVuZGVyU3R5bGUqIHNfZGVmYXVsdFN0eWxlID0gUmVuZGVy U3R5bGU6OmNyZWF0ZURlZmF1bHRTdHlsZSgpLnJlbGVhc2VSZWYoKTsKKyAgICBzdGF0aWMgUmVu ZGVyU3R5bGUqIHNfZGVmYXVsdFN0eWxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZURlZmF1bHRTdHls ZSgpLmxlYWtSZWYoKTsKICAgICByZXR1cm4gc19kZWZhdWx0U3R5bGU7CiB9CiAK