121276 2013-09-12 22:41:57 -0700 [CTTE] RenderMenuList always has a HTMLSelectElement. 2013-09-12 23:15:42 -0700 1 1 1 Unclassified WebKit Java 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 928657 0 kling 2013-09-12 22:41:57 -0700 [CTTE] RenderMenuList always has a HTMLSelectElement. 928658 1 211509 kling 2013-09-12 22:42:24 -0700 Created attachment 211509 Patch 928660 2 211510 kling 2013-09-12 22:46:52 -0700 Created attachment 211510 Land 928661 3 211509 eflews.bot 2013-09-12 22:46:54 -0700 Comment on attachment 211509 Patch Attachment 211509 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1864029 928666 4 211510 commit-queue 2013-09-12 23:15:40 -0700 Comment on attachment 211510 Land Clearing flags on attachment: 211510 Committed r155673: <http://trac.webkit.org/changeset/155673> 928667 5 commit-queue 2013-09-12 23:15:42 -0700 All reviewed patches have been landed. Closing bug. 211509 2013-09-12 22:42:24 -0700 2013-09-12 22:46:54 -0700 Patch bug-121276.diff text/plain 11803 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNDM5OTcwLi5hMmIxMjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTMtMDktMTIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFtDVFRFXSBSZW5kZXJNZW51TGlzdCBhbHdheXMgaGFzIGEgSFRNTFNlbGVjdEVsZW1lbnQu CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjEyNzY+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyByZW5kZXJlciBpcyBuZXZlciBh bm9ueW1vdXMgYW5kIGFsd2F5cyBoYXMgYSBjb3JyZXNwb25kaW5nIEhUTUxTZWxlY3RFbGVtZW50 LgorICAgICAgICBEZWxldGVkIGVsZW1lbnQoKSBpbiBmYXZvciBvZiBIVE1MU2VsZWN0RWxlbWVu dCYgc2VsZWN0RWxlbWVudCgpLgorCisyMDEzLTA5LTEyICBBbmRyZWFzIEtsaW5nICA8YWtsaW5n QGFwcGxlLmNvbT4KKwogICAgICAgICBbQ1RURV0gVGlnaHRlbiBSZW5kZXJUZXh0Q29udHJvbCBl bGVtZW50IHR5cGluZy4KICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyMTI3NT4KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRleCBjZjI4OGY1Li45 NGU3NDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcApAQCAt MzQwLDcgKzM0MCw3IEBAIGJvb2wgSFRNTFNlbGVjdEVsZW1lbnQ6OmNhblNlbGVjdEFsbCgpIGNv bnN0CiBSZW5kZXJPYmplY3QqIEhUTUxTZWxlY3RFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5k ZXJBcmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKikKIHsKICAgICBpZiAodXNlc01lbnVMaXN0KCkp Ci0gICAgICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJNZW51TGlzdCh0aGlzKTsKKyAgICAg ICAgcmV0dXJuIG5ldyAoYXJlbmEpIFJlbmRlck1lbnVMaXN0KCp0aGlzKTsKICAgICByZXR1cm4g bmV3IChhcmVuYSkgUmVuZGVyTGlzdEJveCgqdGhpcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCmluZGV4IDczN2FmOWIuLmJlMmVlMTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcApAQCAtNTQsOCArNTQs OCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAK LVJlbmRlck1lbnVMaXN0OjpSZW5kZXJNZW51TGlzdChFbGVtZW50KiBlbGVtZW50KQotICAgIDog UmVuZGVyRmxleGlibGVCb3goZWxlbWVudCkKK1JlbmRlck1lbnVMaXN0OjpSZW5kZXJNZW51TGlz dChIVE1MU2VsZWN0RWxlbWVudCYgZWxlbWVudCkKKyAgICA6IFJlbmRlckZsZXhpYmxlQm94KCZl bGVtZW50KQogICAgICwgbV9idXR0b25UZXh0KDApCiAgICAgLCBtX2lubmVyQmxvY2soMCkKICAg ICAsIG1fbmVlZHNPcHRpb25zV2lkdGhVcGRhdGUodHJ1ZSkKQEAgLTYzLDkgKzYzLDYgQEAgUmVu ZGVyTWVudUxpc3Q6OlJlbmRlck1lbnVMaXN0KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgLCBtX2xh c3RBY3RpdmVJbmRleCgtMSkKICAgICAsIG1fcG9wdXBJc1Zpc2libGUoZmFsc2UpCiB7Ci0gICAg QVNTRVJUKGVsZW1lbnQpOwotICAgIEFTU0VSVChlbGVtZW50LT5pc0hUTUxFbGVtZW50KCkpOwot ICAgIEFTU0VSVChpc0hUTUxTZWxlY3RFbGVtZW50KGVsZW1lbnQpKTsKIH0KIAogUmVuZGVyTWVu dUxpc3Q6On5SZW5kZXJNZW51TGlzdCgpCkBAIC0xMzIsOSArMTI5LDEwIEBAIHZvaWQgUmVuZGVy TWVudUxpc3Q6OmFkanVzdElubmVyU3R5bGUoKQogICAgIH0KIH0KIAotaW5saW5lIEhUTUxTZWxl Y3RFbGVtZW50KiBSZW5kZXJNZW51TGlzdDo6c2VsZWN0RWxlbWVudCgpIGNvbnN0CitIVE1MU2Vs ZWN0RWxlbWVudCYgUmVuZGVyTWVudUxpc3Q6OnNlbGVjdEVsZW1lbnQoKSBjb25zdAogewotICAg IHJldHVybiB0b0hUTUxTZWxlY3RFbGVtZW50KGVsZW1lbnQoKSk7CisgICAgQVNTRVJUKFJlbmRl ck9iamVjdDo6bm9kZSgpKTsKKyAgICByZXR1cm4gdG9IVE1MU2VsZWN0RWxlbWVudCgqUmVuZGVy T2JqZWN0Ojpub2RlKCkpOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjphZGRDaGlsZChSZW5k ZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQpAQCAtMTc1LDcg KzE3Myw3IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVy ZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkCiB2b2lkIFJlbmRlck1lbnVMaXN0Ojp1 cGRhdGVPcHRpb25zV2lkdGgoKQogewogICAgIGZsb2F0IG1heE9wdGlvbldpZHRoID0gMDsKLSAg ICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgp LT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1z ID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpOwogICAgIGludCBzaXplID0gbGlzdEl0ZW1z LnNpemUoKTsgICAgCiAgICAgRm9udENhY2hlUHVyZ2VQcmV2ZW50ZXIgZm9udENhY2hlUHVyZ2VQ cmV2ZW50ZXI7CiAKQEAgLTIxNyw3ICsyMTUsNyBAQCB2b2lkIFJlbmRlck1lbnVMaXN0Ojp1cGRh dGVGcm9tRWxlbWVudCgpCiAgICAgaWYgKG1fcG9wdXBJc1Zpc2libGUpCiAgICAgICAgIG1fcG9w dXAtPnVwZGF0ZUZyb21FbGVtZW50KCk7CiAgICAgZWxzZQotICAgICAgICBzZXRUZXh0RnJvbU9w dGlvbihzZWxlY3RFbGVtZW50KCktPnNlbGVjdGVkSW5kZXgoKSk7CisgICAgICAgIHNldFRleHRG cm9tT3B0aW9uKHNlbGVjdEVsZW1lbnQoKS5zZWxlY3RlZEluZGV4KCkpOwogfQogCiB2b2lkIFJl bmRlck1lbnVMaXN0OjpzZXRUZXh0RnJvbU9wdGlvbihpbnQgb3B0aW9uSW5kZXgpCkBAIC0zNDIs OCArMzQwLDcgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6c2hvd1BvcHVwKCkKICAgICBGbG9hdFBv aW50IGFic1RvcExlZnQgPSBsb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludCgpLCBVc2VUcmFuc2Zv cm1zKTsKICAgICBJbnRSZWN0IGFic0JvdW5kcyA9IGFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdu b3JpbmdUcmFuc2Zvcm1zKCk7CiAgICAgYWJzQm91bmRzLnNldExvY2F0aW9uKHJvdW5kZWRJbnRQ b2ludChhYnNUb3BMZWZ0KSk7Ci0gICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNlbGVj dEVsZW1lbnQoKTsKLSAgICBtX3BvcHVwLT5zaG93KGFic0JvdW5kcywgJnZpZXcoKS5mcmFtZVZp ZXcoKSwgc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChzZWxlY3QtPnNlbGVjdGVkSW5kZXgoKSkp OworICAgIG1fcG9wdXAtPnNob3coYWJzQm91bmRzLCAmdmlldygpLmZyYW1lVmlldygpLCBzZWxl Y3RFbGVtZW50KCkub3B0aW9uVG9MaXN0SW5kZXgoc2VsZWN0RWxlbWVudCgpLnNlbGVjdGVkSW5k ZXgoKSkpOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjpoaWRlUG9wdXAoKQpAQCAtMzU2LDI3 ICszNTMsMjUgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkKHVuc2lnbmVkIGxp c3RJbmRleCwgYm9vbCBmaXJlT25DaGFuZ2UpCiB7CiAgICAgLy8gQ2hlY2sgdG8gZW5zdXJlIGEg cGFnZSBuYXZpZ2F0aW9uIGhhcyBub3Qgb2NjdXJyZWQgd2hpbGUKICAgICAvLyB0aGUgcG9wdXAg d2FzIHVwLgotICAgIERvY3VtZW50JiBkb2N1bWVudCA9IGVsZW1lbnQoKS0+ZG9jdW1lbnQoKTsK LSAgICBpZiAoJmRvY3VtZW50ICE9IGRvY3VtZW50LmZyYW1lKCktPmRvY3VtZW50KCkpCisgICAg aWYgKCZkb2N1bWVudCgpICE9IGRvY3VtZW50KCkuZnJhbWUoKS0+ZG9jdW1lbnQoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIAotICAgIEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSBzZWxlY3RF bGVtZW50KCk7Ci0gICAgc2VsZWN0LT5vcHRpb25TZWxlY3RlZEJ5VXNlcihzZWxlY3QtPmxpc3RU b09wdGlvbkluZGV4KGxpc3RJbmRleCksIGZpcmVPbkNoYW5nZSk7CisKKyAgICBzZWxlY3RFbGVt ZW50KCkub3B0aW9uU2VsZWN0ZWRCeVVzZXIoc2VsZWN0RWxlbWVudCgpLmxpc3RUb09wdGlvbklu ZGV4KGxpc3RJbmRleCksIGZpcmVPbkNoYW5nZSk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6 Omxpc3RCb3hTZWxlY3RJdGVtKGludCBsaXN0SW5kZXgsIGJvb2wgYWxsb3dNdWx0aXBseVNlbGVj dGlvbnMsIGJvb2wgc2hpZnQsIGJvb2wgZmlyZU9uQ2hhbmdlTm93KQogewotICAgIHNlbGVjdEVs ZW1lbnQoKS0+bGlzdEJveFNlbGVjdEl0ZW0obGlzdEluZGV4LCBhbGxvd011bHRpcGx5U2VsZWN0 aW9ucywgc2hpZnQsIGZpcmVPbkNoYW5nZU5vdyk7CisgICAgc2VsZWN0RWxlbWVudCgpLmxpc3RC b3hTZWxlY3RJdGVtKGxpc3RJbmRleCwgYWxsb3dNdWx0aXBseVNlbGVjdGlvbnMsIHNoaWZ0LCBm aXJlT25DaGFuZ2VOb3cpOwogfQogCiBib29sIFJlbmRlck1lbnVMaXN0OjptdWx0aXBsZSgpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIHNlbGVjdEVsZW1lbnQoKS0+bXVsdGlwbGUoKTsKKyAgICByZXR1 cm4gc2VsZWN0RWxlbWVudCgpLm11bHRpcGxlKCk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6 OmRpZFNldFNlbGVjdGVkSW5kZXgoaW50IGxpc3RJbmRleCkKIHsKLSAgICBkaWRVcGRhdGVBY3Rp dmVPcHRpb24oc2VsZWN0RWxlbWVudCgpLT5saXN0VG9PcHRpb25JbmRleChsaXN0SW5kZXgpKTsK KyAgICBkaWRVcGRhdGVBY3RpdmVPcHRpb24oc2VsZWN0RWxlbWVudCgpLmxpc3RUb09wdGlvbklu ZGV4KGxpc3RJbmRleCkpOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjpkaWRVcGRhdGVBY3Rp dmVPcHRpb24oaW50IG9wdGlvbkluZGV4KQpAQCAtMzg4LDkgKzM4Myw4IEBAIHZvaWQgUmVuZGVy TWVudUxpc3Q6OmRpZFVwZGF0ZUFjdGl2ZU9wdGlvbihpbnQgb3B0aW9uSW5kZXgpCiAgICAgICAg IHJldHVybjsKICAgICBtX2xhc3RBY3RpdmVJbmRleCA9IG9wdGlvbkluZGV4OwogCi0gICAgSFRN TFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNlbGVjdEVsZW1lbnQoKTsKLSAgICBpbnQgbGlzdElu ZGV4ID0gc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChvcHRpb25JbmRleCk7Ci0gICAgaWYgKGxp c3RJbmRleCA8IDAgfHwgbGlzdEluZGV4ID49IHN0YXRpY19jYXN0PGludD4oc2VsZWN0LT5saXN0 SXRlbXMoKS5zaXplKCkpKQorICAgIGludCBsaXN0SW5kZXggPSBzZWxlY3RFbGVtZW50KCkub3B0 aW9uVG9MaXN0SW5kZXgob3B0aW9uSW5kZXgpOworICAgIGlmIChsaXN0SW5kZXggPCAwIHx8IGxp c3RJbmRleCA+PSBzdGF0aWNfY2FzdDxpbnQ+KHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKS5z aXplKCkpKQogICAgICAgICByZXR1cm47CiAKICAgICBIVE1MRWxlbWVudCogbGlzdEl0ZW0gPSBz ZWxlY3QtPmxpc3RJdGVtcygpW2xpc3RJbmRleF07CkBAIC00MDMsOCArMzk3LDcgQEAgdm9pZCBS ZW5kZXJNZW51TGlzdDo6ZGlkVXBkYXRlQWN0aXZlT3B0aW9uKGludCBvcHRpb25JbmRleCkKIAog U3RyaW5nIFJlbmRlck1lbnVMaXN0OjppdGVtVGV4dCh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0 CiB7Ci0gICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNlbGVjdEVsZW1lbnQoKTsKLSAg ICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0LT5saXN0SXRl bXMoKTsKKyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0 RWxlbWVudCgpLmxpc3RJdGVtcygpOwogICAgIGlmIChsaXN0SW5kZXggPj0gbGlzdEl0ZW1zLnNp emUoKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCkBAIC00MzIsNyArNDI1LDcgQEAgU3Ry aW5nIFJlbmRlck1lbnVMaXN0OjppdGVtSWNvbih1bnNpZ25lZCkgY29uc3QKIFN0cmluZyBSZW5k ZXJNZW51TGlzdDo6aXRlbUFjY2Vzc2liaWxpdHlUZXh0KHVuc2lnbmVkIGxpc3RJbmRleCkgY29u c3QKIHsKICAgICAvLyBBbGxvdyB0aGUgYWNjZXNzaWJsZSBuYW1lIGJlIGNoYW5nZWQgaWYgbmVj ZXNzYXJ5LgotICAgIGNvbnN0IFZlY3RvcjxIVE1MRWxlbWVudCo+JiBsaXN0SXRlbXMgPSBzZWxl Y3RFbGVtZW50KCktPmxpc3RJdGVtcygpOworICAgIGNvbnN0IFZlY3RvcjxIVE1MRWxlbWVudCo+ JiBsaXN0SXRlbXMgPSBzZWxlY3RFbGVtZW50KCkubGlzdEl0ZW1zKCk7CiAgICAgaWYgKGxpc3RJ bmRleCA+PSBsaXN0SXRlbXMuc2l6ZSgpKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAg cmV0dXJuIGxpc3RJdGVtc1tsaXN0SW5kZXhdLT5mYXN0R2V0QXR0cmlidXRlKGFyaWFfbGFiZWxB dHRyKTsKQEAgLTQ0MCw3ICs0MzMsNyBAQCBTdHJpbmcgUmVuZGVyTWVudUxpc3Q6Oml0ZW1BY2Nl c3NpYmlsaXR5VGV4dCh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0CiAgICAgCiBTdHJpbmcgUmVu ZGVyTWVudUxpc3Q6Oml0ZW1Ub29sVGlwKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIHsKLSAg ICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgp LT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1z ID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpOwogICAgIGlmIChsaXN0SW5kZXggPj0gbGlz dEl0ZW1zLnNpemUoKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIHJldHVybiBsaXN0 SXRlbXNbbGlzdEluZGV4XS0+dGl0bGUoKTsKQEAgLTQ0OCw3ICs0NDEsNyBAQCBTdHJpbmcgUmVu ZGVyTWVudUxpc3Q6Oml0ZW1Ub29sVGlwKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIAogYm9v bCBSZW5kZXJNZW51TGlzdDo6aXRlbUlzRW5hYmxlZCh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0 CiB7Ci0gICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVs ZW1lbnQoKS0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxp c3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBpZiAobGlzdEluZGV4 ID49IGxpc3RJdGVtcy5zaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBIVE1MRWxl bWVudCogZWxlbWVudCA9IGxpc3RJdGVtc1tsaXN0SW5kZXhdOwpAQCAtNDY4LDcgKzQ2MSw3IEBA IGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc0VuYWJsZWQodW5zaWduZWQgbGlzdEluZGV4KSBj b25zdAogCiBQb3B1cE1lbnVTdHlsZSBSZW5kZXJNZW51TGlzdDo6aXRlbVN0eWxlKHVuc2lnbmVk IGxpc3RJbmRleCkgY29uc3QKIHsKLSAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlz dEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBWZWN0b3I8 SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpOwog ICAgIGlmIChsaXN0SW5kZXggPj0gbGlzdEl0ZW1zLnNpemUoKSkgewogICAgICAgICAvLyBJZiB3 ZSBhcmUgbWFraW5nIGFuIG91dCBvZiBib3VuZHMgYWNjZXNzLCB0aGVuIHdlIHdhbnQgdG8gdXNl IHRoZSBzdHlsZQogICAgICAgICAvLyBvZiBhIGRpZmZlcmVudCBvcHRpb24gZWxlbWVudCAoaW5k ZXggMCkuIEhvd2V2ZXIsIGlmIHRoZXJlIGlzbid0IGFuIG9wdGlvbiBlbGVtZW50CkBAIC00OTMs NyArNDg2LDcgQEAgUG9wdXBNZW51U3R5bGUgUmVuZGVyTWVudUxpc3Q6Oml0ZW1TdHlsZSh1bnNp Z25lZCBsaXN0SW5kZXgpIGNvbnN0CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmdldEl0ZW1CYWNr Z3JvdW5kQ29sb3IodW5zaWduZWQgbGlzdEluZGV4LCBDb2xvciYgaXRlbUJhY2tncm91bmRDb2xv ciwgYm9vbCYgaXRlbUhhc0N1c3RvbUJhY2tncm91bmRDb2xvcikgY29uc3QKIHsKLSAgICBjb25z dCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLT5saXN0 SXRlbXMoKTsKKyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2Vs ZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpOwogICAgIGlmIChsaXN0SW5kZXggPj0gbGlzdEl0ZW1z LnNpemUoKSkgewogICAgICAgICBpdGVtQmFja2dyb3VuZENvbG9yID0gc3R5bGUoKS0+dmlzaXRl ZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgaXRl bUhhc0N1c3RvbUJhY2tncm91bmRDb2xvciA9IGZhbHNlOwpAQCAtNTM5LDcgKzUzMiw3IEBAIFBh c3NSZWZQdHI8U2Nyb2xsYmFyPiBSZW5kZXJNZW51TGlzdDo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9s bGFibGVBcmVhKiBzY3JvbGxhYmxlCiAgICAgUmVmUHRyPFNjcm9sbGJhcj4gd2lkZ2V0OwogICAg IGJvb2wgaGFzQ3VzdG9tU2Nyb2xsYmFyU3R5bGUgPSBzdHlsZSgpLT5oYXNQc2V1ZG9TdHlsZShT Q1JPTExCQVIpOwogICAgIGlmIChoYXNDdXN0b21TY3JvbGxiYXJTdHlsZSkKLSAgICAgICAgd2lk Z2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIoc2Nyb2xsYWJsZUFy ZWEsIG9yaWVudGF0aW9uLCBlbGVtZW50KCkpOworICAgICAgICB3aWRnZXQgPSBSZW5kZXJTY3Jv bGxiYXI6OmNyZWF0ZUN1c3RvbVNjcm9sbGJhcihzY3JvbGxhYmxlQXJlYSwgb3JpZW50YXRpb24s ICZzZWxlY3RFbGVtZW50KCkpOwogICAgIGVsc2UKICAgICAgICAgd2lkZ2V0ID0gU2Nyb2xsYmFy OjpjcmVhdGVOYXRpdmVTY3JvbGxiYXIoc2Nyb2xsYWJsZUFyZWEsIG9yaWVudGF0aW9uLCBjb250 cm9sU2l6ZSk7CiAgICAgcmV0dXJuIHdpZGdldC5yZWxlYXNlKCk7CkBAIC01NzgsMTMgKzU3MSwx MiBAQCBMYXlvdXRVbml0IFJlbmRlck1lbnVMaXN0OjpjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25z dAogCiBpbnQgUmVuZGVyTWVudUxpc3Q6Omxpc3RTaXplKCkgY29uc3QKIHsKLSAgICByZXR1cm4g c2VsZWN0RWxlbWVudCgpLT5saXN0SXRlbXMoKS5zaXplKCk7CisgICAgcmV0dXJuIHNlbGVjdEVs ZW1lbnQoKS5saXN0SXRlbXMoKS5zaXplKCk7CiB9CiAKIGludCBSZW5kZXJNZW51TGlzdDo6c2Vs ZWN0ZWRJbmRleCgpIGNvbnN0CiB7Ci0gICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNl bGVjdEVsZW1lbnQoKTsKLSAgICByZXR1cm4gc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChzZWxl Y3QtPnNlbGVjdGVkSW5kZXgoKSk7CisgICAgcmV0dXJuIHNlbGVjdEVsZW1lbnQoKS5vcHRpb25U b0xpc3RJbmRleChzZWxlY3RFbGVtZW50KCkuc2VsZWN0ZWRJbmRleCgpKTsKIH0KIAogdm9pZCBS ZW5kZXJNZW51TGlzdDo6cG9wdXBEaWRIaWRlKCkKQEAgLTU5NCwxOSArNTg2LDE5IEBAIHZvaWQg UmVuZGVyTWVudUxpc3Q6OnBvcHVwRGlkSGlkZSgpCiAKIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0 ZW1Jc1NlcGFyYXRvcih1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0CiB7Ci0gICAgY29uc3QgVmVj dG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1z KCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVs ZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICByZXR1cm4gbGlzdEluZGV4IDwgbGlzdEl0ZW1zLnNp emUoKSAmJiBsaXN0SXRlbXNbbGlzdEluZGV4XS0+aGFzVGFnTmFtZShoclRhZyk7CiB9CiAKIGJv b2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc0xhYmVsKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3QK IHsKLSAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxl bWVudCgpLT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlz dEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpOwogICAgIHJldHVybiBsaXN0SW5k ZXggPCBsaXN0SXRlbXMuc2l6ZSgpICYmIGlzSFRNTE9wdEdyb3VwRWxlbWVudChsaXN0SXRlbXNb bGlzdEluZGV4XSk7CiB9CiAKIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc1NlbGVjdGVkKHVu c2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIHsKLSAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQq PiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBW ZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVt cygpOwogICAgIGlmIChsaXN0SW5kZXggPj0gbGlzdEl0ZW1zLnNpemUoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gbGlzdEl0ZW1zW2xpc3RJbmRl eF07CkBAIC02MTUsNyArNjA3LDcgQEAgYm9vbCBSZW5kZXJNZW51TGlzdDo6aXRlbUlzU2VsZWN0 ZWQodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdAogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjpzZXRU ZXh0RnJvbUl0ZW0odW5zaWduZWQgbGlzdEluZGV4KQogewotICAgIHNldFRleHRGcm9tT3B0aW9u KHNlbGVjdEVsZW1lbnQoKS0+bGlzdFRvT3B0aW9uSW5kZXgobGlzdEluZGV4KSk7CisgICAgc2V0 VGV4dEZyb21PcHRpb24oc2VsZWN0RWxlbWVudCgpLmxpc3RUb09wdGlvbkluZGV4KGxpc3RJbmRl eCkpOwogfQogCiBGb250U2VsZWN0b3IqIFJlbmRlck1lbnVMaXN0Ojpmb250U2VsZWN0b3IoKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuaAppbmRleCBlZjFl MzQ1Li5jMGM2YzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3Qu aApAQCAtNDMsMTAgKzQzLDExIEBAIGNsYXNzIFJlbmRlclRleHQ7CiBjbGFzcyBSZW5kZXJNZW51 TGlzdCBGSU5BTCA6IHB1YmxpYyBSZW5kZXJGbGV4aWJsZUJveCwgcHJpdmF0ZSBQb3B1cE1lbnVD bGllbnQgewogCiBwdWJsaWM6Ci0gICAgUmVuZGVyTWVudUxpc3QoRWxlbWVudCopOworICAgIGV4 cGxpY2l0IFJlbmRlck1lbnVMaXN0KEhUTUxTZWxlY3RFbGVtZW50Jik7CiAgICAgdmlydHVhbCB+ UmVuZGVyTWVudUxpc3QoKTsKIAotcHVibGljOgorICAgIEhUTUxTZWxlY3RFbGVtZW50JiBzZWxl Y3RFbGVtZW50KCkgY29uc3Q7CisKICAgICBib29sIHBvcHVwSXNWaXNpYmxlKCkgY29uc3QgeyBy ZXR1cm4gbV9wb3B1cElzVmlzaWJsZTsgfQogICAgIHZvaWQgc2hvd1BvcHVwKCk7CiAgICAgdm9p ZCBoaWRlUG9wdXAoKTsKQEAgLTU4LDcgKzU5LDcgQEAgcHVibGljOgogICAgIFN0cmluZyB0ZXh0 KCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdEVsZW1l bnQoKSBjb25zdDsKKyAgICB2b2lkIGVsZW1lbnQoKSBjb25zdCBXVEZfREVMRVRFRF9GVU5DVElP TjsKIAogICAgIHZpcnR1YWwgYm9vbCBpc01lbnVMaXN0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsg fQogCg== 211510 2013-09-12 22:46:52 -0700 2013-09-12 23:15:40 -0700 Land land-121276.diff text/plain 12506 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNDM5OTcwLi4xNmFhNDRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTMtMDktMTIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFtDVFRFXSBSZW5kZXJNZW51TGlzdCBhbHdheXMgaGFzIGEgSFRNTFNlbGVjdEVsZW1lbnQu CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjEyNzY+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQW5kZXJzIENhcmxzc29uLgorCisgICAgICAgIFRoaXMgcmVuZGVyZXIgaXMgbmV2ZXIg YW5vbnltb3VzIGFuZCBhbHdheXMgaGFzIGEgY29ycmVzcG9uZGluZyBIVE1MU2VsZWN0RWxlbWVu dC4KKyAgICAgICAgRGVsZXRlZCBlbGVtZW50KCkgaW4gZmF2b3Igb2YgSFRNTFNlbGVjdEVsZW1l bnQmIHNlbGVjdEVsZW1lbnQoKS4KKworMjAxMy0wOS0xMiAgQW5kcmVhcyBLbGluZyAgPGFrbGlu Z0BhcHBsZS5jb20+CisKICAgICAgICAgW0NUVEVdIFRpZ2h0ZW4gUmVuZGVyVGV4dENvbnRyb2wg ZWxlbWVudCB0eXBpbmcuCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjEyNzU+CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAKaW5kZXggY2YyODhmNS4u OTRlNzQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAKQEAg LTM0MCw3ICszNDAsNyBAQCBib29sIEhUTUxTZWxlY3RFbGVtZW50OjpjYW5TZWxlY3RBbGwoKSBj b25zdAogUmVuZGVyT2JqZWN0KiBIVE1MU2VsZWN0RWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIoUmVu ZGVyQXJlbmEqIGFyZW5hLCBSZW5kZXJTdHlsZSopCiB7CiAgICAgaWYgKHVzZXNNZW51TGlzdCgp KQotICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyTWVudUxpc3QodGhpcyk7CisgICAg ICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJNZW51TGlzdCgqdGhpcyk7CiAgICAgcmV0dXJu IG5ldyAoYXJlbmEpIFJlbmRlckxpc3RCb3goKnRoaXMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAppbmRleCA3MzdhZjliLi43OWQ4MDFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKQEAgLTU0LDggKzU0 LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwog Ci1SZW5kZXJNZW51TGlzdDo6UmVuZGVyTWVudUxpc3QoRWxlbWVudCogZWxlbWVudCkKLSAgICA6 IFJlbmRlckZsZXhpYmxlQm94KGVsZW1lbnQpCitSZW5kZXJNZW51TGlzdDo6UmVuZGVyTWVudUxp c3QoSFRNTFNlbGVjdEVsZW1lbnQmIGVsZW1lbnQpCisgICAgOiBSZW5kZXJGbGV4aWJsZUJveCgm ZWxlbWVudCkKICAgICAsIG1fYnV0dG9uVGV4dCgwKQogICAgICwgbV9pbm5lckJsb2NrKDApCiAg ICAgLCBtX25lZWRzT3B0aW9uc1dpZHRoVXBkYXRlKHRydWUpCkBAIC02Myw5ICs2Myw2IEBAIFJl bmRlck1lbnVMaXN0OjpSZW5kZXJNZW51TGlzdChFbGVtZW50KiBlbGVtZW50KQogICAgICwgbV9s YXN0QWN0aXZlSW5kZXgoLTEpCiAgICAgLCBtX3BvcHVwSXNWaXNpYmxlKGZhbHNlKQogewotICAg IEFTU0VSVChlbGVtZW50KTsKLSAgICBBU1NFUlQoZWxlbWVudC0+aXNIVE1MRWxlbWVudCgpKTsK LSAgICBBU1NFUlQoaXNIVE1MU2VsZWN0RWxlbWVudChlbGVtZW50KSk7CiB9CiAKIFJlbmRlck1l bnVMaXN0Ojp+UmVuZGVyTWVudUxpc3QoKQpAQCAtMTMyLDkgKzEyOSwxMCBAQCB2b2lkIFJlbmRl ck1lbnVMaXN0OjphZGp1c3RJbm5lclN0eWxlKCkKICAgICB9CiB9CiAKLWlubGluZSBIVE1MU2Vs ZWN0RWxlbWVudCogUmVuZGVyTWVudUxpc3Q6OnNlbGVjdEVsZW1lbnQoKSBjb25zdAorSFRNTFNl bGVjdEVsZW1lbnQmIFJlbmRlck1lbnVMaXN0OjpzZWxlY3RFbGVtZW50KCkgY29uc3QKIHsKLSAg ICByZXR1cm4gdG9IVE1MU2VsZWN0RWxlbWVudChlbGVtZW50KCkpOworICAgIEFTU0VSVChSZW5k ZXJPYmplY3Q6Om5vZGUoKSk7CisgICAgcmV0dXJuIHRvSFRNTFNlbGVjdEVsZW1lbnQoKlJlbmRl ck9iamVjdDo6bm9kZSgpKTsKIH0KIAogdm9pZCBSZW5kZXJNZW51TGlzdDo6YWRkQ2hpbGQoUmVu ZGVyT2JqZWN0KiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKQEAgLTE3NSw3 ICsxNzMsNyBAQCB2b2lkIFJlbmRlck1lbnVMaXN0OjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZl cmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZAogdm9pZCBSZW5kZXJNZW51TGlzdDo6 dXBkYXRlT3B0aW9uc1dpZHRoKCkKIHsKICAgICBmbG9hdCBtYXhPcHRpb25XaWR0aCA9IDA7Ci0g ICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQo KS0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVt cyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBpbnQgc2l6ZSA9IGxpc3RJdGVt cy5zaXplKCk7ICAgIAogICAgIEZvbnRDYWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdl UHJldmVudGVyOwogCkBAIC0yMTcsMTYgKzIxNSwxNSBAQCB2b2lkIFJlbmRlck1lbnVMaXN0Ojp1 cGRhdGVGcm9tRWxlbWVudCgpCiAgICAgaWYgKG1fcG9wdXBJc1Zpc2libGUpCiAgICAgICAgIG1f cG9wdXAtPnVwZGF0ZUZyb21FbGVtZW50KCk7CiAgICAgZWxzZQotICAgICAgICBzZXRUZXh0RnJv bU9wdGlvbihzZWxlY3RFbGVtZW50KCktPnNlbGVjdGVkSW5kZXgoKSk7CisgICAgICAgIHNldFRl eHRGcm9tT3B0aW9uKHNlbGVjdEVsZW1lbnQoKS5zZWxlY3RlZEluZGV4KCkpOwogfQogCiB2b2lk IFJlbmRlck1lbnVMaXN0OjpzZXRUZXh0RnJvbU9wdGlvbihpbnQgb3B0aW9uSW5kZXgpCiB7Ci0g ICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNlbGVjdEVsZW1lbnQoKTsKLSAgICBjb25z dCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0LT5saXN0SXRlbXMoKTsK KyAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVu dCgpLmxpc3RJdGVtcygpOwogICAgIGludCBzaXplID0gbGlzdEl0ZW1zLnNpemUoKTsKIAotICAg IGludCBpID0gc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChvcHRpb25JbmRleCk7CisgICAgaW50 IGkgPSBzZWxlY3RFbGVtZW50KCkub3B0aW9uVG9MaXN0SW5kZXgob3B0aW9uSW5kZXgpOwogICAg IFN0cmluZyB0ZXh0ID0gZW1wdHlTdHJpbmcoKTsKICAgICBpZiAoaSA+PSAwICYmIGkgPCBzaXpl KSB7CiAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBsaXN0SXRlbXNbaV07CkBAIC0zNDIsOCAr MzM5LDcgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6c2hvd1BvcHVwKCkKICAgICBGbG9hdFBvaW50 IGFic1RvcExlZnQgPSBsb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludCgpLCBVc2VUcmFuc2Zvcm1z KTsKICAgICBJbnRSZWN0IGFic0JvdW5kcyA9IGFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3Jp bmdUcmFuc2Zvcm1zKCk7CiAgICAgYWJzQm91bmRzLnNldExvY2F0aW9uKHJvdW5kZWRJbnRQb2lu dChhYnNUb3BMZWZ0KSk7Ci0gICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHNlbGVjdEVs ZW1lbnQoKTsKLSAgICBtX3BvcHVwLT5zaG93KGFic0JvdW5kcywgJnZpZXcoKS5mcmFtZVZpZXco KSwgc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChzZWxlY3QtPnNlbGVjdGVkSW5kZXgoKSkpOwor ICAgIG1fcG9wdXAtPnNob3coYWJzQm91bmRzLCAmdmlldygpLmZyYW1lVmlldygpLCBzZWxlY3RF bGVtZW50KCkub3B0aW9uVG9MaXN0SW5kZXgoc2VsZWN0RWxlbWVudCgpLnNlbGVjdGVkSW5kZXgo KSkpOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjpoaWRlUG9wdXAoKQpAQCAtMzU2LDI3ICsz NTIsMjUgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkKHVuc2lnbmVkIGxpc3RJ bmRleCwgYm9vbCBmaXJlT25DaGFuZ2UpCiB7CiAgICAgLy8gQ2hlY2sgdG8gZW5zdXJlIGEgcGFn ZSBuYXZpZ2F0aW9uIGhhcyBub3Qgb2NjdXJyZWQgd2hpbGUKICAgICAvLyB0aGUgcG9wdXAgd2Fz IHVwLgotICAgIERvY3VtZW50JiBkb2N1bWVudCA9IGVsZW1lbnQoKS0+ZG9jdW1lbnQoKTsKLSAg ICBpZiAoJmRvY3VtZW50ICE9IGRvY3VtZW50LmZyYW1lKCktPmRvY3VtZW50KCkpCisgICAgaWYg KCZkb2N1bWVudCgpICE9IGRvY3VtZW50KCkuZnJhbWUoKS0+ZG9jdW1lbnQoKSkKICAgICAgICAg cmV0dXJuOwotICAgIAotICAgIEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSBzZWxlY3RFbGVt ZW50KCk7Ci0gICAgc2VsZWN0LT5vcHRpb25TZWxlY3RlZEJ5VXNlcihzZWxlY3QtPmxpc3RUb09w dGlvbkluZGV4KGxpc3RJbmRleCksIGZpcmVPbkNoYW5nZSk7CisKKyAgICBzZWxlY3RFbGVtZW50 KCkub3B0aW9uU2VsZWN0ZWRCeVVzZXIoc2VsZWN0RWxlbWVudCgpLmxpc3RUb09wdGlvbkluZGV4 KGxpc3RJbmRleCksIGZpcmVPbkNoYW5nZSk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6Omxp c3RCb3hTZWxlY3RJdGVtKGludCBsaXN0SW5kZXgsIGJvb2wgYWxsb3dNdWx0aXBseVNlbGVjdGlv bnMsIGJvb2wgc2hpZnQsIGJvb2wgZmlyZU9uQ2hhbmdlTm93KQogewotICAgIHNlbGVjdEVsZW1l bnQoKS0+bGlzdEJveFNlbGVjdEl0ZW0obGlzdEluZGV4LCBhbGxvd011bHRpcGx5U2VsZWN0aW9u cywgc2hpZnQsIGZpcmVPbkNoYW5nZU5vdyk7CisgICAgc2VsZWN0RWxlbWVudCgpLmxpc3RCb3hT ZWxlY3RJdGVtKGxpc3RJbmRleCwgYWxsb3dNdWx0aXBseVNlbGVjdGlvbnMsIHNoaWZ0LCBmaXJl T25DaGFuZ2VOb3cpOwogfQogCiBib29sIFJlbmRlck1lbnVMaXN0OjptdWx0aXBsZSgpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIHNlbGVjdEVsZW1lbnQoKS0+bXVsdGlwbGUoKTsKKyAgICByZXR1cm4g c2VsZWN0RWxlbWVudCgpLm11bHRpcGxlKCk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmRp ZFNldFNlbGVjdGVkSW5kZXgoaW50IGxpc3RJbmRleCkKIHsKLSAgICBkaWRVcGRhdGVBY3RpdmVP cHRpb24oc2VsZWN0RWxlbWVudCgpLT5saXN0VG9PcHRpb25JbmRleChsaXN0SW5kZXgpKTsKKyAg ICBkaWRVcGRhdGVBY3RpdmVPcHRpb24oc2VsZWN0RWxlbWVudCgpLmxpc3RUb09wdGlvbkluZGV4 KGxpc3RJbmRleCkpOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0OjpkaWRVcGRhdGVBY3RpdmVP cHRpb24oaW50IG9wdGlvbkluZGV4KQpAQCAtMzg4LDEyICszODIsMTEgQEAgdm9pZCBSZW5kZXJN ZW51TGlzdDo6ZGlkVXBkYXRlQWN0aXZlT3B0aW9uKGludCBvcHRpb25JbmRleCkKICAgICAgICAg cmV0dXJuOwogICAgIG1fbGFzdEFjdGl2ZUluZGV4ID0gb3B0aW9uSW5kZXg7CiAKLSAgICBIVE1M U2VsZWN0RWxlbWVudCogc2VsZWN0ID0gc2VsZWN0RWxlbWVudCgpOwotICAgIGludCBsaXN0SW5k ZXggPSBzZWxlY3QtPm9wdGlvblRvTGlzdEluZGV4KG9wdGlvbkluZGV4KTsKLSAgICBpZiAobGlz dEluZGV4IDwgMCB8fCBsaXN0SW5kZXggPj0gc3RhdGljX2Nhc3Q8aW50PihzZWxlY3QtPmxpc3RJ dGVtcygpLnNpemUoKSkpCisgICAgaW50IGxpc3RJbmRleCA9IHNlbGVjdEVsZW1lbnQoKS5vcHRp b25Ub0xpc3RJbmRleChvcHRpb25JbmRleCk7CisgICAgaWYgKGxpc3RJbmRleCA8IDAgfHwgbGlz dEluZGV4ID49IHN0YXRpY19jYXN0PGludD4oc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVtcygpLnNp emUoKSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEhUTUxFbGVtZW50KiBsaXN0SXRlbSA9IHNl bGVjdC0+bGlzdEl0ZW1zKClbbGlzdEluZGV4XTsKKyAgICBIVE1MRWxlbWVudCogbGlzdEl0ZW0g PSBzZWxlY3RFbGVtZW50KCkubGlzdEl0ZW1zKClbbGlzdEluZGV4XTsKICAgICBBU1NFUlQobGlz dEl0ZW0pOwogICAgIGlmIChsaXN0SXRlbS0+YXR0YWNoZWQoKSkgewogICAgICAgICBpZiAoQWNj ZXNzaWJpbGl0eU1lbnVMaXN0KiBtZW51TGlzdCA9IHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlN ZW51TGlzdCo+KGRvY3VtZW50KCkuYXhPYmplY3RDYWNoZSgpLT5nZXQodGhpcykpKQpAQCAtNDAz LDggKzM5Niw3IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmRpZFVwZGF0ZUFjdGl2ZU9wdGlvbihp bnQgb3B0aW9uSW5kZXgpCiAKIFN0cmluZyBSZW5kZXJNZW51TGlzdDo6aXRlbVRleHQodW5zaWdu ZWQgbGlzdEluZGV4KSBjb25zdAogewotICAgIEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSBz ZWxlY3RFbGVtZW50KCk7Ci0gICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVt cyA9IHNlbGVjdC0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4m IGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBpZiAobGlzdElu ZGV4ID49IGxpc3RJdGVtcy5zaXplKCkpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIApAQCAt NDMyLDcgKzQyNCw3IEBAIFN0cmluZyBSZW5kZXJNZW51TGlzdDo6aXRlbUljb24odW5zaWduZWQp IGNvbnN0CiBTdHJpbmcgUmVuZGVyTWVudUxpc3Q6Oml0ZW1BY2Nlc3NpYmlsaXR5VGV4dCh1bnNp Z25lZCBsaXN0SW5kZXgpIGNvbnN0CiB7CiAgICAgLy8gQWxsb3cgdGhlIGFjY2Vzc2libGUgbmFt ZSBiZSBjaGFuZ2VkIGlmIG5lY2Vzc2FyeS4KLSAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQq PiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLT5saXN0SXRlbXMoKTsKKyAgICBjb25zdCBW ZWN0b3I8SFRNTEVsZW1lbnQqPiYgbGlzdEl0ZW1zID0gc2VsZWN0RWxlbWVudCgpLmxpc3RJdGVt cygpOwogICAgIGlmIChsaXN0SW5kZXggPj0gbGlzdEl0ZW1zLnNpemUoKSkKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogICAgIHJldHVybiBsaXN0SXRlbXNbbGlzdEluZGV4XS0+ZmFzdEdldEF0 dHJpYnV0ZShhcmlhX2xhYmVsQXR0cik7CkBAIC00NDAsNyArNDMyLDcgQEAgU3RyaW5nIFJlbmRl ck1lbnVMaXN0OjppdGVtQWNjZXNzaWJpbGl0eVRleHQodW5zaWduZWQgbGlzdEluZGV4KSBjb25z dAogICAgIAogU3RyaW5nIFJlbmRlck1lbnVMaXN0OjppdGVtVG9vbFRpcCh1bnNpZ25lZCBsaXN0 SW5kZXgpIGNvbnN0CiB7Ci0gICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVt cyA9IHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxF bGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBp ZiAobGlzdEluZGV4ID49IGxpc3RJdGVtcy5zaXplKCkpCiAgICAgICAgIHJldHVybiBTdHJpbmco KTsKICAgICByZXR1cm4gbGlzdEl0ZW1zW2xpc3RJbmRleF0tPnRpdGxlKCk7CkBAIC00NDgsNyAr NDQwLDcgQEAgU3RyaW5nIFJlbmRlck1lbnVMaXN0OjppdGVtVG9vbFRpcCh1bnNpZ25lZCBsaXN0 SW5kZXgpIGNvbnN0CiAKIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc0VuYWJsZWQodW5zaWdu ZWQgbGlzdEluZGV4KSBjb25zdAogewotICAgIGNvbnN0IFZlY3RvcjxIVE1MRWxlbWVudCo+JiBs aXN0SXRlbXMgPSBzZWxlY3RFbGVtZW50KCktPmxpc3RJdGVtcygpOworICAgIGNvbnN0IFZlY3Rv cjxIVE1MRWxlbWVudCo+JiBsaXN0SXRlbXMgPSBzZWxlY3RFbGVtZW50KCkubGlzdEl0ZW1zKCk7 CiAgICAgaWYgKGxpc3RJbmRleCA+PSBsaXN0SXRlbXMuc2l6ZSgpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgSFRNTEVsZW1lbnQqIGVsZW1lbnQgPSBsaXN0SXRlbXNbbGlzdEluZGV4XTsK QEAgLTQ2OCw3ICs0NjAsNyBAQCBib29sIFJlbmRlck1lbnVMaXN0OjppdGVtSXNFbmFibGVkKHVu c2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIAogUG9wdXBNZW51U3R5bGUgUmVuZGVyTWVudUxpc3Q6 Oml0ZW1TdHlsZSh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0CiB7Ci0gICAgY29uc3QgVmVjdG9y PEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1zKCk7 CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1l bnQoKS5saXN0SXRlbXMoKTsKICAgICBpZiAobGlzdEluZGV4ID49IGxpc3RJdGVtcy5zaXplKCkp IHsKICAgICAgICAgLy8gSWYgd2UgYXJlIG1ha2luZyBhbiBvdXQgb2YgYm91bmRzIGFjY2Vzcywg dGhlbiB3ZSB3YW50IHRvIHVzZSB0aGUgc3R5bGUKICAgICAgICAgLy8gb2YgYSBkaWZmZXJlbnQg b3B0aW9uIGVsZW1lbnQgKGluZGV4IDApLiBIb3dldmVyLCBpZiB0aGVyZSBpc24ndCBhbiBvcHRp b24gZWxlbWVudApAQCAtNDkzLDcgKzQ4NSw3IEBAIFBvcHVwTWVudVN0eWxlIFJlbmRlck1lbnVM aXN0OjppdGVtU3R5bGUodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdAogCiB2b2lkIFJlbmRlck1l bnVMaXN0OjpnZXRJdGVtQmFja2dyb3VuZENvbG9yKHVuc2lnbmVkIGxpc3RJbmRleCwgQ29sb3Im IGl0ZW1CYWNrZ3JvdW5kQ29sb3IsIGJvb2wmIGl0ZW1IYXNDdXN0b21CYWNrZ3JvdW5kQ29sb3Ip IGNvbnN0CiB7Ci0gICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNl bGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50 Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBpZiAobGlz dEluZGV4ID49IGxpc3RJdGVtcy5zaXplKCkpIHsKICAgICAgICAgaXRlbUJhY2tncm91bmRDb2xv ciA9IHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRD b2xvcik7CiAgICAgICAgIGl0ZW1IYXNDdXN0b21CYWNrZ3JvdW5kQ29sb3IgPSBmYWxzZTsKQEAg LTUzOSw3ICs1MzEsNyBAQCBQYXNzUmVmUHRyPFNjcm9sbGJhcj4gUmVuZGVyTWVudUxpc3Q6OmNy ZWF0ZVNjcm9sbGJhcihTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZQogICAgIFJlZlB0cjxTY3Jv bGxiYXI+IHdpZGdldDsKICAgICBib29sIGhhc0N1c3RvbVNjcm9sbGJhclN0eWxlID0gc3R5bGUo KS0+aGFzUHNldWRvU3R5bGUoU0NST0xMQkFSKTsKICAgICBpZiAoaGFzQ3VzdG9tU2Nyb2xsYmFy U3R5bGUpCi0gICAgICAgIHdpZGdldCA9IFJlbmRlclNjcm9sbGJhcjo6Y3JlYXRlQ3VzdG9tU2Ny b2xsYmFyKHNjcm9sbGFibGVBcmVhLCBvcmllbnRhdGlvbiwgZWxlbWVudCgpKTsKKyAgICAgICAg d2lkZ2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIoc2Nyb2xsYWJs ZUFyZWEsIG9yaWVudGF0aW9uLCAmc2VsZWN0RWxlbWVudCgpKTsKICAgICBlbHNlCiAgICAgICAg IHdpZGdldCA9IFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKHNjcm9sbGFibGVBcmVh LCBvcmllbnRhdGlvbiwgY29udHJvbFNpemUpOwogICAgIHJldHVybiB3aWRnZXQucmVsZWFzZSgp OwpAQCAtNTc4LDEzICs1NzAsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJNZW51TGlzdDo6Y2xpZW50 UGFkZGluZ1JpZ2h0KCkgY29uc3QKIAogaW50IFJlbmRlck1lbnVMaXN0OjpsaXN0U2l6ZSgpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1zKCkuc2l6ZSgpOwor ICAgIHJldHVybiBzZWxlY3RFbGVtZW50KCkubGlzdEl0ZW1zKCkuc2l6ZSgpOwogfQogCiBpbnQg UmVuZGVyTWVudUxpc3Q6OnNlbGVjdGVkSW5kZXgoKSBjb25zdAogewotICAgIEhUTUxTZWxlY3RF bGVtZW50KiBzZWxlY3QgPSBzZWxlY3RFbGVtZW50KCk7Ci0gICAgcmV0dXJuIHNlbGVjdC0+b3B0 aW9uVG9MaXN0SW5kZXgoc2VsZWN0LT5zZWxlY3RlZEluZGV4KCkpOworICAgIHJldHVybiBzZWxl Y3RFbGVtZW50KCkub3B0aW9uVG9MaXN0SW5kZXgoc2VsZWN0RWxlbWVudCgpLnNlbGVjdGVkSW5k ZXgoKSk7CiB9CiAKIHZvaWQgUmVuZGVyTWVudUxpc3Q6OnBvcHVwRGlkSGlkZSgpCkBAIC01OTQs MTkgKzU4NSwxOSBAQCB2b2lkIFJlbmRlck1lbnVMaXN0Ojpwb3B1cERpZEhpZGUoKQogCiBib29s IFJlbmRlck1lbnVMaXN0OjppdGVtSXNTZXBhcmF0b3IodW5zaWduZWQgbGlzdEluZGV4KSBjb25z dAogewotICAgIGNvbnN0IFZlY3RvcjxIVE1MRWxlbWVudCo+JiBsaXN0SXRlbXMgPSBzZWxlY3RF bGVtZW50KCktPmxpc3RJdGVtcygpOworICAgIGNvbnN0IFZlY3RvcjxIVE1MRWxlbWVudCo+JiBs aXN0SXRlbXMgPSBzZWxlY3RFbGVtZW50KCkubGlzdEl0ZW1zKCk7CiAgICAgcmV0dXJuIGxpc3RJ bmRleCA8IGxpc3RJdGVtcy5zaXplKCkgJiYgbGlzdEl0ZW1zW2xpc3RJbmRleF0tPmhhc1RhZ05h bWUoaHJUYWcpOwogfQogCiBib29sIFJlbmRlck1lbnVMaXN0OjppdGVtSXNMYWJlbCh1bnNpZ25l ZCBsaXN0SW5kZXgpIGNvbnN0CiB7Ci0gICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxp c3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9y PEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS5saXN0SXRlbXMoKTsK ICAgICByZXR1cm4gbGlzdEluZGV4IDwgbGlzdEl0ZW1zLnNpemUoKSAmJiBpc0hUTUxPcHRHcm91 cEVsZW1lbnQobGlzdEl0ZW1zW2xpc3RJbmRleF0pOwogfQogCiBib29sIFJlbmRlck1lbnVMaXN0 OjppdGVtSXNTZWxlY3RlZCh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0CiB7Ci0gICAgY29uc3Qg VmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVjdEVsZW1lbnQoKS0+bGlzdEl0 ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPEhUTUxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IHNlbGVj dEVsZW1lbnQoKS5saXN0SXRlbXMoKTsKICAgICBpZiAobGlzdEluZGV4ID49IGxpc3RJdGVtcy5z aXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBIVE1MRWxlbWVudCogZWxlbWVudCA9 IGxpc3RJdGVtc1tsaXN0SW5kZXhdOwpAQCAtNjE1LDcgKzYwNiw3IEBAIGJvb2wgUmVuZGVyTWVu dUxpc3Q6Oml0ZW1Jc1NlbGVjdGVkKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIAogdm9pZCBS ZW5kZXJNZW51TGlzdDo6c2V0VGV4dEZyb21JdGVtKHVuc2lnbmVkIGxpc3RJbmRleCkKIHsKLSAg ICBzZXRUZXh0RnJvbU9wdGlvbihzZWxlY3RFbGVtZW50KCktPmxpc3RUb09wdGlvbkluZGV4KGxp c3RJbmRleCkpOworICAgIHNldFRleHRGcm9tT3B0aW9uKHNlbGVjdEVsZW1lbnQoKS5saXN0VG9P cHRpb25JbmRleChsaXN0SW5kZXgpKTsKIH0KIAogRm9udFNlbGVjdG9yKiBSZW5kZXJNZW51TGlz dDo6Zm9udFNlbGVjdG9yKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNZW51TGlzdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1l bnVMaXN0LmgKaW5kZXggZWYxZTM0NS4uYzBjNmM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lbnVMaXN0LmgKQEAgLTQzLDEwICs0MywxMSBAQCBjbGFzcyBSZW5kZXJUZXh0 OwogY2xhc3MgUmVuZGVyTWVudUxpc3QgRklOQUwgOiBwdWJsaWMgUmVuZGVyRmxleGlibGVCb3gs IHByaXZhdGUgUG9wdXBNZW51Q2xpZW50IHsKIAogcHVibGljOgotICAgIFJlbmRlck1lbnVMaXN0 KEVsZW1lbnQqKTsKKyAgICBleHBsaWNpdCBSZW5kZXJNZW51TGlzdChIVE1MU2VsZWN0RWxlbWVu dCYpOwogICAgIHZpcnR1YWwgflJlbmRlck1lbnVMaXN0KCk7CiAKLXB1YmxpYzoKKyAgICBIVE1M U2VsZWN0RWxlbWVudCYgc2VsZWN0RWxlbWVudCgpIGNvbnN0OworCiAgICAgYm9vbCBwb3B1cElz VmlzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcG9wdXBJc1Zpc2libGU7IH0KICAgICB2b2lkIHNo b3dQb3B1cCgpOwogICAgIHZvaWQgaGlkZVBvcHVwKCk7CkBAIC01OCw3ICs1OSw3IEBAIHB1Ymxp YzoKICAgICBTdHJpbmcgdGV4dCgpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIEhUTUxTZWxlY3RF bGVtZW50KiBzZWxlY3RFbGVtZW50KCkgY29uc3Q7CisgICAgdm9pZCBlbGVtZW50KCkgY29uc3Qg V1RGX0RFTEVURURfRlVOQ1RJT047CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNNZW51TGlzdCgpIGNv bnN0IHsgcmV0dXJuIHRydWU7IH0KIAo=