47786 2010-10-17 17:22:49 -0700 Remove explicit passing of user gesture in NavigationScheduler 2010-10-17 19:59:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue dglazkov eric jnd pkasting oldest_to_newest 295302 0 abarth 2010-10-17 17:22:49 -0700 Remove explicit passing of user gesture in NavigationScheduler 295303 1 70988 abarth 2010-10-17 17:25:09 -0700 Created attachment 70988 Patch 295310 2 70988 dglazkov 2010-10-17 19:29:52 -0700 Comment on attachment 70988 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70988&action=review Thanks for doing this Adam! This turns our previous rabbit-trail method into a much simpler design. > WebCore/ChangeLog:8 > + As requested by Mr. Glazkov, remove more explicit passing of the user Darn it, I gotta tell my Dad to stop trolling WebKit bug tracker. 295312 3 commit-queue 2010-10-17 19:58:57 -0700 The commit-queue encountered the following flaky tests while processing attachment 70988: [u'http/tests/security/xssAuditor/script-tag-with-source-entities.html'] Please file bugs against the tests. The commit-queue is continuing to process your patch. 295313 4 70988 commit-queue 2010-10-17 19:59:45 -0700 Comment on attachment 70988 Patch Clearing flags on attachment: 70988 Committed r69938: <http://trac.webkit.org/changeset/69938> 295314 5 commit-queue 2010-10-17 19:59:50 -0700 All reviewed patches have been landed. Closing bug. 70988 2010-10-17 17:25:09 -0700 2010-10-17 19:59:45 -0700 Patch bug-47786-20101017172508.patch text/plain 17038 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTkzNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDIgQEAKKzIwMTAtMTAtMTcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1v dmUgZXhwbGljaXQgcGFzc2luZyBvZiB1c2VyIGdlc3R1cmUgaW4gTmF2aWdhdGlvblNjaGVkdWxl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3ODYK KworICAgICAgICBBcyByZXF1ZXN0ZWQgYnkgTXIuIEdsYXprb3YsIHJlbW92ZSBtb3JlIGV4cGxp Y2l0IHBhc3Npbmcgb2YgdGhlIHVzZXIKKyAgICAgICAgZ2VzdHVyZSBzdGF0ZS4gIFdlIG5vdyB1 c2UgYSBzdGF0aWMgdG8gcGFzcyB0aGlzIGluZm9ybWF0aW9uIGFyb3VuZC4KKworICAgICAgICAq IGJpbmRpbmdzL2dlbmVyaWMvQmluZGluZ0ZyYW1lLmg6CisgICAgICAgIChXZWJDb3JlOjo6Om5h dmlnYXRlSWZBbGxvd2VkKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3Rv bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvdzo6c2V0TG9jYXRpb24pOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL0pTTG9jYXRpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SlNMb2NhdGlvbjo6cmVsb2FkKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhM b2NhdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOExvY2F0aW9uOjpyZWxvYWRD YWxsYmFjayk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0UmVzb3VyY2VUcmFja2lu Z0VuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cmVsb2Fk UGFnZSk6CisgICAgICAgICogbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2NoZWR1bGVkTmF2aWdhdGlvbjo6U2NoZWR1bGVkTmF2aWdhdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uOjpTY2hlZHVsZWRVUkxOYXZp Z2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjaGVkdWxlZFJlZGlyZWN0OjpTY2hlZHVsZWRS ZWRpcmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY2hlZHVsZWRMb2NhdGlvbkNoYW5nZTo6U2No ZWR1bGVkTG9jYXRpb25DaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U2NoZWR1bGVkUmVmcmVz aDo6U2NoZWR1bGVkUmVmcmVzaCk6CisgICAgICAgIChXZWJDb3JlOjpTY2hlZHVsZWRIaXN0b3J5 TmF2aWdhdGlvbjo6U2NoZWR1bGVkSGlzdG9yeU5hdmlnYXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6U2NoZWR1bGVkRm9ybVN1Ym1pc3Npb246OlNjaGVkdWxlZEZvcm1TdWJtaXNzaW9uKToKKyAg ICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hlZHVsZXI6OnNjaGVkdWxlUmVkaXJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6TmF2aWdhdGlvblNjaGVkdWxlcjo6bXVzdExvY2tCYWNrRm9yd2Fy ZExpc3QpOgorICAgICAgICAoV2ViQ29yZTo6TmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVM b2NhdGlvbkNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0aW9uU2NoZWR1bGVyOjpz Y2hlZHVsZUZvcm1TdWJtaXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hl ZHVsZXI6OnNjaGVkdWxlUmVmcmVzaCk6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0aW9uU2No ZWR1bGVyOjpzY2hlZHVsZUhpc3RvcnlOYXZpZ2F0aW9uKToKKyAgICAgICAgKiBsb2FkZXIvTmF2 aWdhdGlvblNjaGVkdWxlci5oOgorICAgICAgICAqIGxvYWRlci9TdWJmcmFtZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdWJmcmFtZUxvYWRlcjo6bG9hZE9yUmVkaXJlY3RTdWJmcmFt ZSk6CisKIDIwMTAtMTAtMTcgIEh5dW5nIFNvbmcgIDxiZWVyZ3VuQGNvbXBhbnkxMDAubmV0Pgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9iaW5kaW5n cy9nZW5lcmljL0JpbmRpbmdGcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv Z2VuZXJpYy9CaW5kaW5nRnJhbWUuaAkocmV2aXNpb24gNjk5MjUpCisrKyBXZWJDb3JlL2JpbmRp bmdzL2dlbmVyaWMvQmluZGluZ0ZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDcgKzQ5LDcg QEAgdm9pZCBCaW5kaW5nRnJhbWU8QmluZGluZz46Om5hdmlnYXRlSWZBbAogICAgIGlmICghYWN0 aXZlRnJhbWUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoIXByb3RvY29sSXNKYXZhU2NyaXB0 KHVybCkgfHwgc3RhdGUtPmFsbG93c0FjY2Vzc0Zyb21GcmFtZShmcmFtZSkpCi0gICAgICAgIGZy YW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UodXJsLnN0 cmluZygpLCBhY3RpdmVGcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSwgbG9ja0hp c3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHN0YXRlLT5wcm9jZXNzaW5nVXNlckdlc3R1cmUo KSk7CisgICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9jYXRp b25DaGFuZ2UodXJsLnN0cmluZygpLCBhY3RpdmVGcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVm ZXJyZXIoKSwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3Vz dG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3Vz dG9tLmNwcAkocmV2aXNpb24gNjk5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2lu ZG93Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEyLDcgKzUxMiw3IEBAIHZvaWQgSlNE T01XaW5kb3c6OnNldExvY2F0aW9uKEV4ZWNTdGF0ZSoKIAogICAgIGlmICghcHJvdG9jb2xJc0ph dmFTY3JpcHQodXJsKSB8fCBhbGxvd3NBY2Nlc3NGcm9tKGV4ZWMpKSB7CiAgICAgICAgIC8vIFdl IHdhbnQgYSBuZXcgaGlzdG9yeSBpdGVtIGlmIHRoaXMgSlMgd2FzIGNhbGxlZCB2aWEgYSB1c2Vy IGdlc3R1cmUKLSAgICAgICAgZnJhbWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1bGVM b2NhdGlvbkNoYW5nZSh1cmwsIGxleGljYWxGcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJy ZXIoKSwgIWxleGljYWxGcmFtZS0+c2NyaXB0KCktPmFueVBhZ2VJc1Byb2Nlc3NpbmdVc2VyR2Vz dHVyZSgpLCBmYWxzZSwgcHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpOworICAgICAgICBmcmFtZS0+ bmF2aWdhdGlvblNjaGVkdWxlcigpLT5zY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKHVybCwgbGV4aWNh bEZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLCAhbGV4aWNhbEZyYW1lLT5zY3Jp cHQoKS0+YW55UGFnZUlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCksIGZhbHNlKTsKICAgICB9CiB9 CiAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvSlNMb2NhdGlvbkN1c3RvbS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0xvY2F0aW9uQ3VzdG9tLmNwcAkocmV2aXNp b24gNjk5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTTG9jYXRpb25DdXN0b20uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMTMsNyArMzEzLDcgQEAgSlNWYWx1ZSBKU0xvY2F0aW9uOjpyZWxv YWQoRXhlY1N0YXRlKiBleAogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIAogICAgIGlm ICghcHJvdG9jb2xJc0phdmFTY3JpcHQoZnJhbWUtPmxvYWRlcigpLT51cmwoKSkpCi0gICAgICAg IGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlUmVmcmVzaChwcm9jZXNzaW5n VXNlckdlc3R1cmUoKSk7CisgICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNj aGVkdWxlUmVmcmVzaCgpOwogICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogfQogCkluZGV4OiBX ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcAkocmV2 aXNpb24gNjk5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3Vz dG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgyLDcgKzI4Miw3IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOExvY2F0aW9uOjpyZWxvYWQKICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQo KTsKIAogICAgIGlmICghcHJvdG9jb2xJc0phdmFTY3JpcHQoZnJhbWUtPmxvYWRlcigpLT51cmwo KSkpCi0gICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlUmVmcmVz aChwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSk7CisgICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2No ZWR1bGVyKCktPnNjaGVkdWxlUmVmcmVzaCgpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7 CiB9CiAKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCShy ZXZpc2lvbiA2OTkyNSkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYyLDcgKzExNjIsNyBAQCB2b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OnNldFJlc291cmNlVHJhCiAgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihJbnNwZWN0 b3JTdGF0ZTo6cmVzb3VyY2VUcmFja2luZ0VuYWJsZWQsIGVuYWJsZSk7CiAKICAgICBpZiAoZW5h YmxlKQotICAgICAgICBtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5uYXZpZ2F0aW9uU2No ZWR1bGVyKCktPnNjaGVkdWxlUmVmcmVzaCh0cnVlKTsKKyAgICAgICAgcmVsb2FkUGFnZSgpOwog fQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmVuc3VyZVNldHRpbmdzTG9hZGVkKCkKQEAg LTIxMjIsNyArMjEyMiw5IEBAIGJvb2wgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVzb3VyY2VDb250 ZW4KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZWxvYWRQYWdlKCkKIHsKLSAgICBtX2lu c3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxl UmVmcmVzaCh0cnVlKTsKKyAgICAvLyBGSVhNRTogV2h5IGRvIHdlIHNldCB0aGUgdXNlciBnZXN0 dXJlIGluZGljYXRvciBoZXJlPworICAgIFVzZXJHZXN0dXJlSW5kaWNhdG9yIGluZGljYXRvcihE ZWZpbml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0dXJlKTsKKyAgICBtX2luc3BlY3RlZFBhZ2UtPm1h aW5GcmFtZSgpLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlUmVmcmVzaCgpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9u U2NoZWR1bGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2No ZWR1bGVyLmNwcAkocmV2aXNpb24gNjk5MjUpCisrKyBXZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9u U2NoZWR1bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsMTMgKzUzLDEzIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogY2xhc3MgU2NoZWR1bGVkTmF2aWdhdGlvbiA6IHB1YmxpYyBOb25jb3B5 YWJsZSB7CiBwdWJsaWM6Ci0gICAgU2NoZWR1bGVkTmF2aWdhdGlvbihkb3VibGUgZGVsYXksIGJv b2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3YXJkTGlzdCwgYm9vbCB3YXNEdXJpbmdM b2FkLCBib29sIGlzTG9jYXRpb25DaGFuZ2UsIGJvb2wgd2FzVXNlckdlc3R1cmUpCisgICAgU2No ZWR1bGVkTmF2aWdhdGlvbihkb3VibGUgZGVsYXksIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9j a0JhY2tGb3J3YXJkTGlzdCwgYm9vbCB3YXNEdXJpbmdMb2FkLCBib29sIGlzTG9jYXRpb25DaGFu Z2UpCiAgICAgICAgIDogbV9kZWxheShkZWxheSkKICAgICAgICAgLCBtX2xvY2tIaXN0b3J5KGxv Y2tIaXN0b3J5KQogICAgICAgICAsIG1fbG9ja0JhY2tGb3J3YXJkTGlzdChsb2NrQmFja0Zvcndh cmRMaXN0KQogICAgICAgICAsIG1fd2FzRHVyaW5nTG9hZCh3YXNEdXJpbmdMb2FkKQogICAgICAg ICAsIG1faXNMb2NhdGlvbkNoYW5nZShpc0xvY2F0aW9uQ2hhbmdlKQotICAgICAgICAsIG1fd2Fz VXNlckdlc3R1cmUod2FzVXNlckdlc3R1cmUpCisgICAgICAgICwgbV93YXNVc2VyR2VzdHVyZShT Y3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkKICAgICB7CiAgICAgfQog ICAgIHZpcnR1YWwgflNjaGVkdWxlZE5hdmlnYXRpb24oKSB7IH0KQEAgLTg4LDggKzg4LDggQEAg cHJpdmF0ZToKIAogY2xhc3MgU2NoZWR1bGVkVVJMTmF2aWdhdGlvbiA6IHB1YmxpYyBTY2hlZHVs ZWROYXZpZ2F0aW9uIHsKIHB1YmxpYzoKLSAgICBTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKGRvdWJs ZSBkZWxheSwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGJvb2wg bG9ja0hpc3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3YXJkTGlzdCwgYm9vbCB3YXNVc2VyR2VzdHVy ZSwgYm9vbCBkdXJpbmdMb2FkLCBib29sIGlzTG9jYXRpb25DaGFuZ2UpCi0gICAgICAgIDogU2No ZWR1bGVkTmF2aWdhdGlvbihkZWxheSwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3Qs IGR1cmluZ0xvYWQsIGlzTG9jYXRpb25DaGFuZ2UsIHdhc1VzZXJHZXN0dXJlKQorICAgIFNjaGVk dWxlZFVSTE5hdmlnYXRpb24oZG91YmxlIGRlbGF5LCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg U3RyaW5nJiByZWZlcnJlciwgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRM aXN0LCBib29sIGR1cmluZ0xvYWQsIGJvb2wgaXNMb2NhdGlvbkNoYW5nZSkKKyAgICAgICAgOiBT Y2hlZHVsZWROYXZpZ2F0aW9uKGRlbGF5LCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlz dCwgZHVyaW5nTG9hZCwgaXNMb2NhdGlvbkNoYW5nZSkKICAgICAgICAgLCBtX3VybCh1cmwpCiAg ICAgICAgICwgbV9yZWZlcnJlcihyZWZlcnJlcikKICAgICAgICAgLCBtX2hhdmVUb2xkQ2xpZW50 KGZhbHNlKQpAQCAtMTI4LDIyICsxMjgsMjYgQEAgcHJpdmF0ZToKIAogY2xhc3MgU2NoZWR1bGVk UmVkaXJlY3QgOiBwdWJsaWMgU2NoZWR1bGVkVVJMTmF2aWdhdGlvbiB7CiBwdWJsaWM6Ci0gICAg U2NoZWR1bGVkUmVkaXJlY3QoZG91YmxlIGRlbGF5LCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBs b2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0LCBib29sIHdhc1VzZXJHZXN0dXJl KQotICAgICAgICA6IFNjaGVkdWxlZFVSTE5hdmlnYXRpb24oZGVsYXksIHVybCwgU3RyaW5nKCks IGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB3YXNVc2VyR2VzdHVyZSwgZmFsc2Us IGZhbHNlKSB7IH0KKyAgICBTY2hlZHVsZWRSZWRpcmVjdChkb3VibGUgZGVsYXksIGNvbnN0IFN0 cmluZyYgdXJsLCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QpCisg ICAgICAgIDogU2NoZWR1bGVkVVJMTmF2aWdhdGlvbihkZWxheSwgdXJsLCBTdHJpbmcoKSwgbG9j a0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIGZhbHNlLCBmYWxzZSkKKyAgICB7CisgICAg fQogCiAgICAgdmlydHVhbCBib29sIHNob3VsZFN0YXJ0VGltZXIoRnJhbWUqIGZyYW1lKSB7IHJl dHVybiBmcmFtZS0+bG9hZGVyKCktPmFsbEFuY2VzdG9yc0FyZUNvbXBsZXRlKCk7IH0KIH07CiAK IGNsYXNzIFNjaGVkdWxlZExvY2F0aW9uQ2hhbmdlIDogcHVibGljIFNjaGVkdWxlZFVSTE5hdmln YXRpb24gewogcHVibGljOgotICAgIFNjaGVkdWxlZExvY2F0aW9uQ2hhbmdlKGNvbnN0IFN0cmlu ZyYgdXJsLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxv Y2tCYWNrRm9yd2FyZExpc3QsIGJvb2wgd2FzVXNlckdlc3R1cmUsIGJvb2wgZHVyaW5nTG9hZCkK LSAgICAgICAgOiBTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKDAuMCwgdXJsLCByZWZlcnJlciwgbG9j a0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHdhc1VzZXJHZXN0dXJlLCBkdXJpbmdMb2Fk LCB0cnVlKSB7IH0KKyAgICBTY2hlZHVsZWRMb2NhdGlvbkNoYW5nZShjb25zdCBTdHJpbmcmIHVy bCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFj a0ZvcndhcmRMaXN0LCBib29sIGR1cmluZ0xvYWQpCisgICAgICAgIDogU2NoZWR1bGVkVVJMTmF2 aWdhdGlvbigwLjAsIHVybCwgcmVmZXJyZXIsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRM aXN0LCBkdXJpbmdMb2FkLCB0cnVlKSB7IH0KIH07CiAKIGNsYXNzIFNjaGVkdWxlZFJlZnJlc2gg OiBwdWJsaWMgU2NoZWR1bGVkVVJMTmF2aWdhdGlvbiB7CiBwdWJsaWM6Ci0gICAgU2NoZWR1bGVk UmVmcmVzaChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCB3 YXNVc2VyR2VzdHVyZSkKLSAgICAgICAgOiBTY2hlZHVsZWRVUkxOYXZpZ2F0aW9uKDAuMCwgdXJs LCByZWZlcnJlciwgdHJ1ZSwgdHJ1ZSwgd2FzVXNlckdlc3R1cmUsIGZhbHNlLCB0cnVlKSB7IH0K KyAgICBTY2hlZHVsZWRSZWZyZXNoKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHJl ZmVycmVyKQorICAgICAgICA6IFNjaGVkdWxlZFVSTE5hdmlnYXRpb24oMC4wLCB1cmwsIHJlZmVy cmVyLCB0cnVlLCB0cnVlLCBmYWxzZSwgdHJ1ZSkKKyAgICB7CisgICAgfQogCiAgICAgdmlydHVh bCB2b2lkIGZpcmUoRnJhbWUqIGZyYW1lKQogICAgIHsKQEAgLTE1NCw3ICsxNTgsMTEgQEAgcHVi bGljOgogCiBjbGFzcyBTY2hlZHVsZWRIaXN0b3J5TmF2aWdhdGlvbiA6IHB1YmxpYyBTY2hlZHVs ZWROYXZpZ2F0aW9uIHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBTY2hlZHVsZWRIaXN0b3J5TmF2 aWdhdGlvbihpbnQgaGlzdG9yeVN0ZXBzLCBib29sIHdhc1VzZXJHZXN0dXJlKSA6IFNjaGVkdWxl ZE5hdmlnYXRpb24oMCwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgdHJ1ZSwgd2FzVXNlckdlc3R1cmUp LCBtX2hpc3RvcnlTdGVwcyhoaXN0b3J5U3RlcHMpIHsgfQorICAgIGV4cGxpY2l0IFNjaGVkdWxl ZEhpc3RvcnlOYXZpZ2F0aW9uKGludCBoaXN0b3J5U3RlcHMpCisgICAgICAgIDogU2NoZWR1bGVk TmF2aWdhdGlvbigwLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCB0cnVlKQorICAgICAgICAsIG1faGlz dG9yeVN0ZXBzKGhpc3RvcnlTdGVwcykKKyAgICB7CisgICAgfQogCiAgICAgdmlydHVhbCB2b2lk IGZpcmUoRnJhbWUqIGZyYW1lKQogICAgIHsKQEAgLTE3OCw4ICsxODYsOCBAQCBwcml2YXRlOgog CiBjbGFzcyBTY2hlZHVsZWRGb3JtU3VibWlzc2lvbiA6IHB1YmxpYyBTY2hlZHVsZWROYXZpZ2F0 aW9uIHsKIHB1YmxpYzoKLSAgICBTY2hlZHVsZWRGb3JtU3VibWlzc2lvbihQYXNzUmVmUHRyPEZv cm1TdWJtaXNzaW9uPiBzdWJtaXNzaW9uLCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIGJvb2wg ZHVyaW5nTG9hZCwgYm9vbCB3YXNVc2VyR2VzdHVyZSkKLSAgICAgICAgOiBTY2hlZHVsZWROYXZp Z2F0aW9uKDAsIHN1Ym1pc3Npb24tPmxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3Qs IGR1cmluZ0xvYWQsIHRydWUsIHdhc1VzZXJHZXN0dXJlKQorICAgIFNjaGVkdWxlZEZvcm1TdWJt aXNzaW9uKFBhc3NSZWZQdHI8Rm9ybVN1Ym1pc3Npb24+IHN1Ym1pc3Npb24sIGJvb2wgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgYm9vbCBkdXJpbmdMb2FkKQorICAgICAgICA6IFNjaGVkdWxlZE5hdmln YXRpb24oMCwgc3VibWlzc2lvbi0+bG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwg ZHVyaW5nTG9hZCwgdHJ1ZSkKICAgICAgICAgLCBtX3N1Ym1pc3Npb24oc3VibWlzc2lvbikKICAg ICAgICAgLCBtX2hhdmVUb2xkQ2xpZW50KGZhbHNlKQogICAgIHsKQEAgLTI1OCwxNCArMjY2LDE0 IEBAIHZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVSZWRpcmUKIAogICAgIC8vIFdl IHdhbnQgYSBuZXcgYmFjay9mb3J3YXJkIGxpc3QgaXRlbSBpZiB0aGUgcmVmcmVzaCB0aW1lb3V0 IGlzID4gMSBzZWNvbmQuCiAgICAgaWYgKCFtX3JlZGlyZWN0IHx8IGRlbGF5IDw9IG1fcmVkaXJl Y3QtPmRlbGF5KCkpCi0gICAgICAgIHNjaGVkdWxlKGFkb3B0UHRyKG5ldyBTY2hlZHVsZWRSZWRp cmVjdChkZWxheSwgdXJsLCB0cnVlLCBkZWxheSA8PSAxLCBmYWxzZSkpKTsKKyAgICAgICAgc2No ZWR1bGUoYWRvcHRQdHIobmV3IFNjaGVkdWxlZFJlZGlyZWN0KGRlbGF5LCB1cmwsIHRydWUsIGRl bGF5IDw9IDEpKSk7CiB9CiAKLWJvb2wgTmF2aWdhdGlvblNjaGVkdWxlcjo6bXVzdExvY2tCYWNr Rm9yd2FyZExpc3QoRnJhbWUqIHRhcmdldEZyYW1lLCBib29sIHdhc1VzZXJHZXN0dXJlKQorYm9v bCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjptdXN0TG9ja0JhY2tGb3J3YXJkTGlzdChGcmFtZSogdGFy Z2V0RnJhbWUpCiB7CiAgICAgLy8gTm9uLXVzZXIgbmF2aWdhdGlvbiBiZWZvcmUgdGhlIHBhZ2Ug aGFzIGZpbmlzaGVkIGZpcmluZyBvbmxvYWQgc2hvdWxkIG5vdCBjcmVhdGUgYSBuZXcgYmFjay9m b3J3YXJkIGl0ZW0uCiAgICAgLy8gU2VlIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzQyODYxIGZvciB0 aGUgb3JpZ2luYWwgbW90aXZhdGlvbiBmb3IgdGhpcy4gICAgCi0gICAgaWYgKCF3YXNVc2VyR2Vz dHVyZSAmJiB0YXJnZXRGcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkgJiYgIXRhcmdl dEZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+d2FzT25sb2FkSGFuZGxlZCgpKQor ICAgIGlmICghU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkgJiYgdGFy Z2V0RnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpICYmICF0YXJnZXRGcmFtZS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPndhc09ubG9hZEhhbmRsZWQoKSkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgCiAgICAgLy8gTmF2aWdhdGlvbiBvZiBhIHN1YmZyYW1lIGR1cmluZyBs b2FkaW5nIG9mIGFuIGFuY2VzdG9yIGZyYW1lIGRvZXMgbm90IGNyZWF0ZSBhIG5ldyBiYWNrL2Zv cndhcmQgaXRlbS4KQEAgLTI3OSwxNCArMjg3LDE0IEBAIGJvb2wgTmF2aWdhdGlvblNjaGVkdWxl cjo6bXVzdExvY2tCYWNrRm8KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgTmF2aWdhdGlv blNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5nZShjb25zdCBTdHJpbmcmIHVybCwgY29u c3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0Zvcndh cmRMaXN0LCBib29sIHdhc1VzZXJHZXN0dXJlKQordm9pZCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjpz Y2hlZHVsZUxvY2F0aW9uQ2hhbmdlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHJl ZmVycmVyLCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QpCiB7CiAg ICAgaWYgKCFtX2ZyYW1lLT5wYWdlKCkpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAodXJsLmlz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbG9ja0JhY2tGb3J3YXJkTGlzdCA9IGxv Y2tCYWNrRm9yd2FyZExpc3QgfHwgbXVzdExvY2tCYWNrRm9yd2FyZExpc3QobV9mcmFtZSwgd2Fz VXNlckdlc3R1cmUpOworICAgIGxvY2tCYWNrRm9yd2FyZExpc3QgPSBsb2NrQmFja0ZvcndhcmRM aXN0IHx8IG11c3RMb2NrQmFja0ZvcndhcmRMaXN0KG1fZnJhbWUpOwogCiAgICAgRnJhbWVMb2Fk ZXIqIGxvYWRlciA9IG1fZnJhbWUtPmxvYWRlcigpOwogICAgIApAQCAtMzAyLDcgKzMxMCw3IEBA IHZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGkKICAgICAvLyBUaGlzIG1h eSBoYXBwZW4gd2hlbiBhIGZyYW1lIGNoYW5nZXMgdGhlIGxvY2F0aW9uIG9mIGFub3RoZXIgZnJh bWUuCiAgICAgYm9vbCBkdXJpbmdMb2FkID0gIWxvYWRlci0+c3RhdGVNYWNoaW5lKCktPmNvbW1p dHRlZEZpcnN0UmVhbERvY3VtZW50TG9hZCgpOwogCi0gICAgc2NoZWR1bGUoYWRvcHRQdHIobmV3 IFNjaGVkdWxlZExvY2F0aW9uQ2hhbmdlKHVybCwgcmVmZXJyZXIsIGxvY2tIaXN0b3J5LCBsb2Nr QmFja0ZvcndhcmRMaXN0LCB3YXNVc2VyR2VzdHVyZSwgZHVyaW5nTG9hZCkpKTsKKyAgICBzY2hl ZHVsZShhZG9wdFB0cihuZXcgU2NoZWR1bGVkTG9jYXRpb25DaGFuZ2UodXJsLCByZWZlcnJlciwg bG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIGR1cmluZ0xvYWQpKSk7CiB9CiAKIHZv aWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVGb3JtU3VibWlzc2lvbihQYXNzUmVmUHRy PEZvcm1TdWJtaXNzaW9uPiBzdWJtaXNzaW9uKQpAQCAtMzE5LDEzICszMjcsMTQgQEAgdm9pZCBO YXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZUZvcm1TdQogICAgIC8vIElmIHRoaXMgaXMgYSBj aGlsZCBmcmFtZSBhbmQgdGhlIGZvcm0gc3VibWlzc2lvbiB3YXMgdHJpZ2dlcmVkIGJ5IGEgc2Ny aXB0LCBsb2NrIHRoZSBiYWNrL2ZvcndhcmQgbGlzdAogICAgIC8vIHRvIG1hdGNoIElFIGFuZCBP cGVyYS4KICAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMyMzgzIGZvciB0aGUgb3JpZ2luYWwgbW90aXZhdGlvbiBmb3IgdGhpcy4KLSAgICBib29sIGlz VXNlckdlc3R1cmUgPSBtX2ZyYW1lLT5sb2FkZXIoKS0+aXNQcm9jZXNzaW5nVXNlckdlc3R1cmUo KTsKLSAgICBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSBtdXN0TG9ja0JhY2tGb3J3YXJkTGlz dChtX2ZyYW1lLCBpc1VzZXJHZXN0dXJlKSB8fCAoc3VibWlzc2lvbi0+c3RhdGUoKS0+Zm9ybVN1 Ym1pc3Npb25UcmlnZ2VyKCkgPT0gU3VibWl0dGVkQnlKYXZhU2NyaXB0ICYmIG1fZnJhbWUtPnRy ZWUoKS0+cGFyZW50KCkgJiYgIWlzVXNlckdlc3R1cmUpOworICAgIGJvb2wgbG9ja0JhY2tGb3J3 YXJkTGlzdCA9IG11c3RMb2NrQmFja0ZvcndhcmRMaXN0KG1fZnJhbWUpCisgICAgICAgIHx8IChz dWJtaXNzaW9uLT5zdGF0ZSgpLT5mb3JtU3VibWlzc2lvblRyaWdnZXIoKSA9PSBTdWJtaXR0ZWRC eUphdmFTY3JpcHQKKyAgICAgICAgICAgICYmIG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkgJiYg IVNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpKTsKIAotICAgIHNjaGVk dWxlKGFkb3B0UHRyKG5ldyBTY2hlZHVsZWRGb3JtU3VibWlzc2lvbihzdWJtaXNzaW9uLCBsb2Nr QmFja0ZvcndhcmRMaXN0LCBkdXJpbmdMb2FkLCBpc1VzZXJHZXN0dXJlKSkpOworICAgIHNjaGVk dWxlKGFkb3B0UHRyKG5ldyBTY2hlZHVsZWRGb3JtU3VibWlzc2lvbihzdWJtaXNzaW9uLCBsb2Nr QmFja0ZvcndhcmRMaXN0LCBkdXJpbmdMb2FkKSkpOwogfQogCi12b2lkIE5hdmlnYXRpb25TY2hl ZHVsZXI6OnNjaGVkdWxlUmVmcmVzaChib29sIHdhc1VzZXJHZXN0dXJlKQordm9pZCBOYXZpZ2F0 aW9uU2NoZWR1bGVyOjpzY2hlZHVsZVJlZnJlc2goKQogewogICAgIGlmICghbV9mcmFtZS0+cGFn ZSgpKQogICAgICAgICByZXR1cm47CkBAIC0zMzMsNyArMzQyLDcgQEAgdm9pZCBOYXZpZ2F0aW9u U2NoZWR1bGVyOjpzY2hlZHVsZVJlZnJlcwogICAgIGlmICh1cmwuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBzY2hlZHVsZShhZG9wdFB0cihuZXcgU2NoZWR1bGVkUmVmcmVzaCh1 cmwuc3RyaW5nKCksIG1fZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCksIHdhc1Vz ZXJHZXN0dXJlKSkpOworICAgIHNjaGVkdWxlKGFkb3B0UHRyKG5ldyBTY2hlZHVsZWRSZWZyZXNo KHVybC5zdHJpbmcoKSwgbV9mcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSkpKTsK IH0KIAogdm9pZCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZUhpc3RvcnlOYXZpZ2F0aW9u KGludCBzdGVwcykKQEAgLTM1MCw3ICszNTksNyBAQCB2b2lkIE5hdmlnYXRpb25TY2hlZHVsZXI6 OnNjaGVkdWxlSGlzdG9yCiAgICAgfQogCiAgICAgLy8gSW4gYWxsIG90aGVyIGNhc2VzLCBzY2hl ZHVsZSB0aGUgaGlzdG9yeSB0cmF2ZXJzYWwgdG8gb2NjdXIgYXN5bmNocm9ub3VzbHkuCi0gICAg c2NoZWR1bGUoYWRvcHRQdHIobmV3IFNjaGVkdWxlZEhpc3RvcnlOYXZpZ2F0aW9uKHN0ZXBzLCBt X2ZyYW1lLT5sb2FkZXIoKS0+aXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkpKTsKKyAgICBzY2hl ZHVsZShhZG9wdFB0cihuZXcgU2NoZWR1bGVkSGlzdG9yeU5hdmlnYXRpb24oc3RlcHMpKSk7CiB9 CiAKIHZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6dGltZXJGaXJlZChUaW1lcjxOYXZpZ2F0aW9u U2NoZWR1bGVyPiopCkluZGV4OiBXZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5oCShyZXZp c2lvbiA2OTkyNSkKKysrIFdlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuaAkod29y a2luZyBjb3B5KQpAQCAtNTYsOSArNTYsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBsb2NhdGlvbkNo YW5nZVBlbmRpbmcoKTsKIAogICAgIHZvaWQgc2NoZWR1bGVSZWRpcmVjdChkb3VibGUgZGVsYXks IGNvbnN0IFN0cmluZyYgdXJsKTsKLSAgICB2b2lkIHNjaGVkdWxlTG9jYXRpb25DaGFuZ2UoY29u c3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGJvb2wgbG9ja0hpc3Rvcnkg PSB0cnVlLCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSB0cnVlLCBib29sIHVzZXJHZXN0dXJl ID0gZmFsc2UpOworICAgIHZvaWQgc2NoZWR1bGVMb2NhdGlvbkNoYW5nZShjb25zdCBTdHJpbmcm IHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCBsb2NrSGlzdG9yeSA9IHRydWUsIGJv b2wgbG9ja0JhY2tGb3J3YXJkTGlzdCA9IHRydWUpOwogICAgIHZvaWQgc2NoZWR1bGVGb3JtU3Vi bWlzc2lvbihQYXNzUmVmUHRyPEZvcm1TdWJtaXNzaW9uPik7Ci0gICAgdm9pZCBzY2hlZHVsZVJl ZnJlc2goYm9vbCB1c2VyR2VzdHVyZSA9IGZhbHNlKTsKKyAgICB2b2lkIHNjaGVkdWxlUmVmcmVz aCgpOwogICAgIHZvaWQgc2NoZWR1bGVIaXN0b3J5TmF2aWdhdGlvbihpbnQgc3RlcHMpOwogCiAg ICAgdm9pZCBzdGFydFRpbWVyKCk7CkBAIC03MCw3ICs3MCw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCB0aW1lckZpcmVkKFRpbWVyPE5hdmlnYXRpb25TY2hlZHVsZXI+Kik7CiAgICAgdm9pZCBzY2hl ZHVsZShQYXNzT3duUHRyPFNjaGVkdWxlZE5hdmlnYXRpb24+KTsKIAotICAgIHN0YXRpYyBib29s IG11c3RMb2NrQmFja0ZvcndhcmRMaXN0KEZyYW1lKiB0YXJnZXRGcmFtZSwgYm9vbCBtdXN0TG9j a0lmRHVyaW5nTG9hZCk7CisgICAgc3RhdGljIGJvb2wgbXVzdExvY2tCYWNrRm9yd2FyZExpc3Qo RnJhbWUqIHRhcmdldEZyYW1lKTsKIAogICAgIEZyYW1lKiBtX2ZyYW1lOwogICAgIFRpbWVyPE5h dmlnYXRpb25TY2hlZHVsZXI+IG1fdGltZXI7CkluZGV4OiBXZWJDb3JlL2xvYWRlci9TdWJmcmFt ZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIu Y3BwCShyZXZpc2lvbiA2OTkyNSkKKysrIFdlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM5LDcgKzIzOSw3IEBAIEZyYW1lKiBTdWJmcmFtZUxvYWRl cjo6bG9hZE9yUmVkaXJlY3RTdWIKIHsKICAgICBGcmFtZSogZnJhbWUgPSBvd25lckVsZW1lbnQt PmNvbnRlbnRGcmFtZSgpOwogICAgIGlmIChmcmFtZSkKLSAgICAgICAgZnJhbWUtPm5hdmlnYXRp b25TY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlvbkNoYW5nZSh1cmwuc3RyaW5nKCksIG1fZnJh bWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCksIGxvY2tIaXN0b3J5LCBsb2NrQmFja0Zv cndhcmRMaXN0LCBtX2ZyYW1lLT5sb2FkZXIoKS0+aXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKSk7 CisgICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9jYXRpb25D aGFuZ2UodXJsLnN0cmluZygpLCBtX2ZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigp LCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAgICAgZWxzZQogICAgICAgICBm cmFtZSA9IGxvYWRTdWJmcmFtZShvd25lckVsZW1lbnQsIHVybCwgZnJhbWVOYW1lLCBtX2ZyYW1l LT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpKTsKICAgICByZXR1cm4gZnJhbWU7Cg==