47459 2010-10-09 14:47:00 -0700 Add WebKit2 version of runBeforeUnloadConfirmPanelWithMessage 2010-10-09 14:58:30 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sam webkit-unassigned webkit.review.bot oldest_to_newest 292206 0 sam 2010-10-09 14:47:00 -0700 Add WebKit2 version of runBeforeUnloadConfirmPanelWithMessage 292208 1 sam 2010-10-09 14:47:13 -0700 <rdar://problem/8447690> 292209 2 70376 sam 2010-10-09 14:49:24 -0700 Created attachment 70376 Patch 292211 3 webkit.review.bot 2010-10-09 14:51:12 -0700 Attachment 70376 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:161: Extra space between WKPageRunBeforeUnloadConfirmPanelCallback and runBeforeUnloadConfirmPanel [whitespace/declaration] [3] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 292213 4 70376 mitz 2010-10-09 14:55:13 -0700 Comment on attachment 70376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70376&action=review > WebKitTools/MiniBrowser/mac/BrowserWindowController.m:505 > + NSAlert* alert = [[NSAlert alloc] init]; Misplaced space. 292214 5 sam 2010-10-09 14:58:30 -0700 Landed in r69460. 70376 2010-10-09 14:49:24 -0700 2010-10-09 14:55:13 -0700 Patch patcher.diff text/plain 14152 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTQ1OSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMTAtMDkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV2Vi S2l0MiB2ZXJzaW9uIG9mIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbFdpdGhNZXNzYWdlCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDQ3NjkwPgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc0NTkKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwOgorICAg ICAgICAoUVdLUGFnZTo6UVdLUGFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0V2luZG93RnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdldFdpbmRvd0ZyYW1lKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpjYW5SdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJ Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OmNhblJ1bkJlZm9yZVVu bG9hZENvbmZpcm1QYW5lbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlVJQ2xpZW50OjpydW5CZWZv cmVVbmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVSUNsaWVudC5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpjYW5SdW5CZWZvcmVVbmxvYWRD b25maXJtUGFuZWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OnJ1bkJlZm9y ZVVubG9hZENvbmZpcm1QYW5lbCk6CisgICAgICAgIFBpcGUgY2FsbHMgdGhyb3VnaCB0byB0aGUg VUlQcm9jZXNzLgorCiAyMDEwLTEwLTA5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkocmV2aXNpb24gNjk0NTcpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NjUsNiArODY1LDI2IEBAIHZvaWQgV2Vi UGFnZVByb3h5Ojpjb250ZW50c1NpemVDaGFuZ2VkKHUKICAgICBtX3VpQ2xpZW50LmNvbnRlbnRz U2l6ZUNoYW5nZWQodGhpcywgc2l6ZSwgcHJvY2VzcygpLT53ZWJGcmFtZShmcmFtZUlEKSk7CiB9 CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRXaW5kb3dGcmFtZShjb25zdCBGbG9hdFJlY3QmIG5l d1dpbmRvd0ZyYW1lKQoreworICAgIG1fdWlDbGllbnQuc2V0V2luZG93RnJhbWUodGhpcywgbV9w YWdlQ2xpZW50LT50cmFuc2Zvcm1Ub0RldmljZVNwYWNlKG5ld1dpbmRvd0ZyYW1lKSk7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5OjpnZXRXaW5kb3dGcmFtZShGbG9hdFJlY3QmIG5ld1dpbmRvd0Zy YW1lKQoreworICAgIG5ld1dpbmRvd0ZyYW1lID0gbV9wYWdlQ2xpZW50LT50cmFuc2Zvcm1Ub1Vz ZXJTcGFjZShtX3VpQ2xpZW50LndpbmRvd0ZyYW1lKHRoaXMpKTsKK30KKwordm9pZCBXZWJQYWdl UHJveHk6OmNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChib29sJiBjYW5SdW4pCit7Cisg ICAgY2FuUnVuID0gbV91aUNsaWVudC5jYW5SdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoKTsK K30KKwordm9pZCBXZWJQYWdlUHJveHk6OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChjb25z dCBTdHJpbmcmIG1lc3NhZ2UsIHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wmIHNob3VsZENsb3NlKQor eworICAgIHNob3VsZENsb3NlID0gbV91aUNsaWVudC5ydW5CZWZvcmVVbmxvYWRDb25maXJtUGFu ZWwodGhpcywgbWVzc2FnZSwgcHJvY2VzcygpLT53ZWJGcmFtZShmcmFtZUlEKSk7Cit9CisKIC8v IEJhY2tGb3J3YXJkTGlzdAogCiB2b2lkIFdlYlBhZ2VQcm94eTo6YmFja0ZvcndhcmRBZGRJdGVt KHVpbnQ2NF90IGl0ZW1JRCkKQEAgLTk3MSwxNiArOTkxLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRpZFZhbGlkYXRlTWVudUl0ZW0oYwogICAgIG1fcGFnZUNsaWVudC0+c2V0RWRpdENvbW1hbmRT dGF0ZShjb21tYW5kTmFtZSwgaXNFbmFibGVkLCBzdGF0ZSk7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5OjpzZXRXaW5kb3dGcmFtZShjb25zdCBGbG9hdFJlY3QmIG5ld1dpbmRvd0ZyYW1lKQotewot ICAgIG1fdWlDbGllbnQuc2V0V2luZG93RnJhbWUodGhpcywgbV9wYWdlQ2xpZW50LT50cmFuc2Zv cm1Ub0RldmljZVNwYWNlKG5ld1dpbmRvd0ZyYW1lKSk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5 OjpnZXRXaW5kb3dGcmFtZShGbG9hdFJlY3QmIG5ld1dpbmRvd0ZyYW1lKQotewotICAgIG5ld1dp bmRvd0ZyYW1lID0gbV9wYWdlQ2xpZW50LT50cmFuc2Zvcm1Ub1VzZXJTcGFjZShtX3VpQ2xpZW50 LndpbmRvd0ZyYW1lKHRoaXMpKTsKLX0KLQogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVF dmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiB7CiAgICAgV2ViRXZlbnQ6 OlR5cGUgdHlwZSA9IHN0YXRpY19jYXN0PFdlYkV2ZW50OjpUeXBlPihvcGFxdWVUeXBlKTsKSW5k ZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA2OTQ1NykKKysrIFdlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDcsNiArMjQ3LDcg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgd2lsbFN1Ym1pdEZvcm0odWludDY0X3QgZnJhbWVJRCwg dWludDY0X3Qgc291cmNlRnJhbWVJRCwgY29uc3QgU3RyaW5nUGFpclZlY3RvciYgdGV4dEZpZWxk VmFsdWVzLCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqKTsK IAorICAgIC8vIFVJIGNsaWVudAogICAgIHZvaWQgY3JlYXRlTmV3UGFnZSh1aW50NjRfdCYgbmV3 UGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJik7CiAgICAgdm9pZCBzaG93UGFnZSgp OwogICAgIHZvaWQgY2xvc2VQYWdlKCk7CkBAIC0yNTYsNiArMjU3LDEwIEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRTdGF0dXNUZXh0KGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbW91c2VEaWRN b3ZlT3ZlckVsZW1lbnQodWludDMyX3QgbW9kaWZpZXJzLCBDb3JlSVBDOjpBcmd1bWVudERlY29k ZXIqKTsKICAgICB2b2lkIGNvbnRlbnRzU2l6ZUNoYW5nZWQodWludDY0X3QgZnJhbWVJRCwgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYpOworICAgIHZvaWQgc2V0V2luZG93RnJhbWUoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0Jik7CisgICAgdm9pZCBnZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9h dFJlY3QmKTsKKyAgICB2b2lkIGNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChib29sJiBj YW5SdW4pOworICAgIHZvaWQgcnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKGNvbnN0IFN0cmlu ZyYgbWVzc2FnZSwgdWludDY0X3QgZnJhbWVJRCwgYm9vbCYgc2hvdWxkQ2xvc2UpOwogCiAgICAg Ly8gQmFjay9Gb3J3YXJkIGxpc3QgbWFuYWdlbWVudAogICAgIHZvaWQgYmFja0ZvcndhcmRBZGRJ dGVtKHVpbnQ2NF90IGl0ZW1JRCk7CkBAIC0yNzgsMTAgKzI4Myw3IEBAIHByaXZhdGU6CiAgICAg dm9pZCBzZXRUb29sVGlwKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgc2V0Q3Vyc29yKGNvbnN0 IFdlYkNvcmU6OkN1cnNvciYpOwogICAgIHZvaWQgZGlkVmFsaWRhdGVNZW51SXRlbShjb25zdCBT dHJpbmcmIGNvbW1hbmROYW1lLCBib29sIGlzRW5hYmxlZCwgaW50MzJfdCBzdGF0ZSk7Ci0KLSAg ICB2b2lkIHNldFdpbmRvd0ZyYW1lKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwotICAgIHZv aWQgZ2V0V2luZG93RnJhbWUoV2ViQ29yZTo6RmxvYXRSZWN0Jik7Ci0KKyAgICAKICAgICB2b2lk IGRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpOwogCiAg ICAgdm9pZCBkaWRSdW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29uc3QgU3RyaW5nJiwgdWludDY0 X3QpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgko cmV2aXNpb24gNjk0NTcpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFn ZVByb3h5IHsKICAgICBUYWtlRm9jdXMoYm9vbCBkaXJlY3Rpb24pCiAgICAgU2V0V2luZG93RnJh bWUoV2ViQ29yZTo6RmxvYXRSZWN0IHdpbmRvd0ZyYW1lKQogICAgIEdldFdpbmRvd0ZyYW1lKCkg LT4gKFdlYkNvcmU6OkZsb2F0UmVjdCB3aW5kb3dGcmFtZSkKKyAgICBDYW5SdW5CZWZvcmVVbmxv YWRDb25maXJtUGFuZWwoKSAtPiAoYm9vbCBjYW5SdW4pCisgICAgUnVuQmVmb3JlVW5sb2FkQ29u ZmlybVBhbmVsKFdURjo6U3RyaW5nIG1lc3NhZ2UsIHVpbnQ2NF90IGZyYW1lSUQpIC0+IChib29s IHNob3VsZENsb3NlKQogCiAgICAgIyBQb2xpY3kgbWVzc2FnZXMuCiAgICAgRGVjaWRlUG9saWN5 Rm9yTUlNRVR5cGUodWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgTUlNRVR5cGUsIFdURjo6 U3RyaW5nIHVybCwgdWludDY0X3QgbGlzdGVuZXJJRCkKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNz L1dlYlVJQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNs aWVudC5jcHAJKHJldmlzaW9uIDY5NDU3KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGll bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTMsNCArMTUzLDE3IEBAIEZsb2F0UmVjdCBXZWJV SUNsaWVudDo6d2luZG93RnJhbWUoV2ViUGEKICAgICByZXR1cm4gdG9JbXBsKG1fcGFnZVVJQ2xp ZW50LmdldFdpbmRvd0ZyYW1lKHRvQVBJKHBhZ2UpLCBtX3BhZ2VVSUNsaWVudC5jbGllbnRJbmZv KSk7CiB9CiAKK2Jvb2wgV2ViVUlDbGllbnQ6OmNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bCgpCit7CisgICAgcmV0dXJuIG1fcGFnZVVJQ2xpZW50LnJ1bkJlZm9yZVVubG9hZENvbmZpcm1Q YW5lbDsKK30KKworYm9vbCBXZWJVSUNsaWVudDo6cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs KFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBXZWJGcmFtZVByb3h5 KiBmcmFtZSkKK3sKKyAgICBpZiAoIW1fcGFnZVVJQ2xpZW50LnJ1bkJlZm9yZVVubG9hZENvbmZp cm1QYW5lbCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gbV9wYWdlVUlDbGll bnQucnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKHRvQVBJKHBhZ2UpLCB0b0FQSShtZXNzYWdl LmltcGwoKSksIHRvQVBJKGZyYW1lKSwgbV9wYWdlVUlDbGllbnQuY2xpZW50SW5mbyk7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGll bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5oCShyZXZp c2lvbiA2OTQ1NykKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTUwLDE3ICs1MCwyMyBAQCBwdWJsaWM6CiAgICAgUGFzc1JlZlB0cjxXZWJQYWdl UHJveHk+IGNyZWF0ZU5ld1BhZ2UoV2ViUGFnZVByb3h5Kik7CiAgICAgdm9pZCBzaG93UGFnZShX ZWJQYWdlUHJveHkqKTsKICAgICB2b2lkIGNsb3NlKFdlYlBhZ2VQcm94eSopOworCiAgICAgdm9p ZCBydW5KYXZhU2NyaXB0QWxlcnQoV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiwgV2ViRnJh bWVQcm94eSopOwogICAgIGJvb2wgcnVuSmF2YVNjcmlwdENvbmZpcm0oV2ViUGFnZVByb3h5Kiwg Y29uc3QgU3RyaW5nJiwgV2ViRnJhbWVQcm94eSopOwogICAgIFN0cmluZyBydW5KYXZhU2NyaXB0 UHJvbXB0KFdlYlBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFdlYkZy YW1lUHJveHkqKTsKKwogICAgIHZvaWQgc2V0U3RhdHVzVGV4dChXZWJQYWdlUHJveHkqLCBjb25z dCBTdHJpbmcmKTsKICAgICB2b2lkIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KFdlYlBhZ2VQcm94 eSosIFdlYkV2ZW50OjpNb2RpZmllcnMsIEFQSU9iamVjdCopOworCiAgICAgdm9pZCBjb250ZW50 c1NpemVDaGFuZ2VkKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvcmU6OkludFNpemUmLCBXZWJG cmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWROb3RIYW5kbGVLZXlFdmVudChXZWJQYWdlUHJveHkq LCBjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50Jik7CiAKICAgICB2b2lkIHNldFdpbmRvd0Zy YW1lKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAgIFdlYkNv cmU6OkZsb2F0UmVjdCB3aW5kb3dGcmFtZShXZWJQYWdlUHJveHkqKTsKIAorICAgIGJvb2wgY2Fu UnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKCk7CisgICAgYm9vbCBydW5CZWZvcmVVbmxvYWRD b25maXJtUGFuZWwoV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiwgV2ViRnJhbWVQcm94eSop OworCiBwcml2YXRlOgogICAgIFdLUGFnZVVJQ2xpZW50IG1fcGFnZVVJQ2xpZW50OwogfTsKSW5k ZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA2OTQ1NykKKysrIFdlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNiArMTQxLDcg QEAgdHlwZWRlZiB2b2lkICgqV0tQYWdlQ29udGVudHNTaXplQ2hhbmdlZAogdHlwZWRlZiB2b2lk ICgqV0tQYWdlRGlkTm90SGFuZGxlS2V5RXZlbnRDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdL TmF0aXZlRXZlbnRQdHIgZXZlbnQsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiBX S1JlY3QgKCpXS1BhZ2VHZXRXaW5kb3dGcmFtZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29u c3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VTZXRXaW5kb3dGcmFt ZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tSZWN0IGZyYW1lLCBjb25zdCB2b2lkICpjbGll bnRJbmZvKTsKK3R5cGVkZWYgYm9vbCAoKldLUGFnZVJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiAKIHN0cnVjdCBXS1BhZ2VVSUNsaWVu dCB7CiAgICAgaW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uOwpAQCAtMTU3LDYgKzE1OCw3IEBAIHN0cnVjdCBX S1BhZ2VVSUNsaWVudCB7CiAgICAgV0tQYWdlRGlkTm90SGFuZGxlS2V5RXZlbnRDYWxsYmFjayAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWROb3RIYW5kbGVLZXlFdmVudDsKICAg ICBXS1BhZ2VHZXRXaW5kb3dGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdldFdpbmRvd0ZyYW1lOwogICAgIFdLUGFnZVNldFdpbmRvd0ZyYW1lQ2Fs bGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2V0V2luZG93RnJh bWU7CisgICAgV0tQYWdlUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICAgICBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWw7CiB9OwogdHlw ZWRlZiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgV0tQYWdlVUlDbGllbnQ7CiAKSW5kZXg6IFdlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDY5NDU3KQorKysgV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsOCArMjgz LDkgQEAgUVdLUGFnZTo6UVdLUGFnZShXS1BhZ2VOYW1lc3BhY2VSZWYgbmFtZQogICAgICAgICAw LCAgLyogbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQgKi8KICAgICAgICAgMCwgIC8qIGNvbnRlbnRz U2l6ZUNoYW5nZWQgKi8KICAgICAgICAgMCwgIC8qIGRpZE5vdEhhbmRsZUtleUV2ZW50ICovCi0g ICAgICAgIDAsICAvKiBnZXRXaW5kb3dSZWN0ICovCi0gICAgICAgIDAgICAvKiBzZXRXaW5kb3dS ZWN0ICovCisgICAgICAgIDAsICAvKiBnZXRXaW5kb3dGcmFtZSAqLworICAgICAgICAwLCAgLyog c2V0V2luZG93RnJhbWUgKi8KKyAgICAgICAgMCAgIC8qIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1Q YW5lbCAqLwogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHBhZ2VSZWYoKSwgJnVp Q2xpZW50KTsKIH0KSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCShyZXZpc2lvbiA2OTQ1NykKKysrIFdlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMDQsMTQgKzIwNCwyNiBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6YWRkTWVzc2Fn ZVRvQ29uc29sCiAKIGJvb2wgV2ViQ2hyb21lQ2xpZW50OjpjYW5SdW5CZWZvcmVVbmxvYWRDb25m aXJtUGFuZWwoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwor ICAgIGJvb2wgY2FuUnVuID0gZmFsc2U7CisgICAgaWYgKCFXZWJQcm9jZXNzOjpzaGFyZWQoKS5j b25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNhblJ1bkJlZm9y ZVVubG9hZENvbmZpcm1QYW5lbCgpLAorICAgICAgICAgICAgTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6Q2FuUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsOjpSZXBseShjYW5SdW4pLAorICAgICAg ICAgICAgbV9wYWdlLT5wYWdlSUQoKSwgQ29yZUlQQzo6Q29ubmVjdGlvbjo6Tm9UaW1lb3V0KSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGNhblJ1bjsKIH0KIAogYm9vbCBX ZWJDaHJvbWVDbGllbnQ6OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChjb25zdCBTdHJpbmcm IG1lc3NhZ2UsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJl dHVybiBmYWxzZTsKKyAgICBXZWJGcmFtZSogd2ViRnJhbWUgPSAgc3RhdGljX2Nhc3Q8V2ViRnJh bWVMb2FkZXJDbGllbnQqPihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+d2ViRnJhbWUoKTsK KworICAgIGJvb2wgc2hvdWxkQ2xvc2UgPSBmYWxzZTsKKyAgICBpZiAoIVdlYlByb2Nlc3M6OnNo YXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVu QmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKG1lc3NhZ2UsIHdlYkZyYW1lLT5mcmFtZUlEKCkpLAor ICAgICAgICAgICAgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuQmVmb3JlVW5sb2FkQ29uZmly bVBhbmVsOjpSZXBseShzaG91bGRDbG9zZSksCisgICAgICAgICAgICBtX3BhZ2UtPnBhZ2VJRCgp LCBDb3JlSVBDOjpDb25uZWN0aW9uOjpOb1RpbWVvdXQpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICByZXR1cm4gc2hvdWxkQ2xvc2U7CiB9CiAKIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojpj bG9zZVdpbmRvd1Nvb24oKQpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNjk0NTkpCisrKyBXZWJLaXRUb29s cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0wOSAg U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJLaXQyIHZlcnNpb24gb2YgcnVuQmVmb3JlVW5s b2FkQ29uZmlybVBhbmVsV2l0aE1lc3NhZ2UKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0NDc2 OTA+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzQ1 OQorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06 CisgICAgICAgIChydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAoLVtCcm93 c2VyV2luZG93Q29udHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAgICAgICAgKiBXZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6Y3JlYXRlT3RoZXJQYWdl KToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorCiAyMDEwLTEw LTA5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2Vy V2luZG93Q29udHJvbGxlci5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL01pbmlCcm93c2Vy L21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCShyZXZpc2lvbiA2OTQ1NykKKysrIFdlYktp dFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCSh3b3JraW5n IGNvcHkpCkBAIC01MDAsNiArNTAwLDMwIEBAIHN0YXRpYyB2b2lkIHNldFdpbmRvd0ZyYW1lKFdL UGFnZVJlZiBwYWcKICAgICBbWyhCcm93c2VyV2luZG93Q29udHJvbGxlciAqKWNsaWVudEluZm8g d2luZG93XSBzZXRGcmFtZTpDR1JlY3RNYWtlKHJlY3Qub3JpZ2luLngsIHJlY3Qub3JpZ2luLnks IHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5zaXplLmhlaWdodCkgZGlzcGxheTpZRVNdOwogfQogCitz dGF0aWMgYm9vbCBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoV0tQYWdlUmVmIHBhZ2UsIFdL U3RyaW5nUmVmIG1lc3NhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pCit7CisgICAgTlNBbGVydCogYWxlcnQgPSBbW05TQWxlcnQgYWxsb2NdIGluaXRdOworCisg ICAgV0tVUkxSZWYgd2tVUkwgPSBXS0ZyYW1lQ29weVVSTChmcmFtZSk7CisgICAgQ0ZVUkxSZWYg Y2ZVUkwgPSBXS1VSTENvcHlDRlVSTCgwLCB3a1VSTCk7CisgICAgV0tSZWxlYXNlKHdrVVJMKTsK KworICAgIFthbGVydCBzZXRNZXNzYWdlVGV4dDpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpA IkJlZm9yZVVubG9hZCBjb25maXJtIGRpYWxvZyBmcm9tICVALiIsIFsoTlNVUkwgKiljZlVSTCBh YnNvbHV0ZVN0cmluZ11dXTsKKyAgICBDRlJlbGVhc2UoY2ZVUkwpOworCisgICAgQ0ZTdHJpbmdS ZWYgY2ZNZXNzYWdlID0gV0tTdHJpbmdDb3B5Q0ZTdHJpbmcoMCwgbWVzc2FnZSk7CisgICAgW2Fs ZXJ0IHNldEluZm9ybWF0aXZlVGV4dDooTlNTdHJpbmcgKiljZk1lc3NhZ2VdOworICAgIENGUmVs ZWFzZShjZk1lc3NhZ2UpOworCisgICAgW2FsZXJ0IGFkZEJ1dHRvbldpdGhUaXRsZTpAIk9LIl07 CisgICAgW2FsZXJ0IGFkZEJ1dHRvbldpdGhUaXRsZTpAIkNhbmNlbCJdOworCisgICAgTlNJbnRl Z2VyIGJ1dHRvbiA9IFthbGVydCBydW5Nb2RhbF07CisgICAgW2FsZXJ0IHJlbGVhc2VdOworCisg ICAgcmV0dXJuIGJ1dHRvbiA9PSBOU0FsZXJ0Rmlyc3RCdXR0b25SZXR1cm47Cit9CisKIC0gKHZv aWQpYXdha2VGcm9tTmliCiB7CiAgICAgX3dlYlZpZXcgPSBbW1dLVmlldyBhbGxvY10gaW5pdFdp dGhGcmFtZTpbY29udGFpbmVyVmlldyBmcmFtZV0gcGFnZU5hbWVzcGFjZVJlZjpfcGFnZU5hbWVz cGFjZV07CkBAIC01NTYsNyArNTgwLDggQEAgLSAodm9pZClhd2FrZUZyb21OaWIKICAgICAgICAg Y29udGVudHNTaXplQ2hhbmdlZCwKICAgICAgICAgMCwgICAgICAgICAgLyogZGlkTm90SGFuZGxl S2V5RXZlbnQgKi8KICAgICAgICAgZ2V0V2luZG93RnJhbWUsCi0gICAgICAgIHNldFdpbmRvd0Zy YW1lCisgICAgICAgIHNldFdpbmRvd0ZyYW1lLAorICAgICAgICBydW5CZWZvcmVVbmxvYWRDb25m aXJtUGFuZWwKICAgICB9OwogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChfd2ViVmlldy5wYWdl UmVmLCAmdWlDbGllbnQpOwogfQpJbmRleDogV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDY5NDU3KQorKysgV2ViS2l0VG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEx OSw3ICsxMTksOCBAQCBzdGF0aWMgV0tQYWdlUmVmIGNyZWF0ZU90aGVyUGFnZShXS1BhZ2VSCiAg ICAgICAgIDAsCiAgICAgICAgIDAsCiAgICAgICAgIGdldFdpbmRvd0ZyYW1lT3RoZXJQYWdlLAot ICAgICAgICBzZXRXaW5kb3dGcmFtZU90aGVyUGFnZQorICAgICAgICBzZXRXaW5kb3dGcmFtZU90 aGVyUGFnZSwKKyAgICAgICAgMAogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KG5l d1BhZ2UsICZvdGhlclBhZ2VVSUNsaWVudCk7CiAKQEAgLTIwMiw3ICsyMDMsOCBAQCB2b2lkIFRl c3RDb250cm9sbGVyOjppbml0aWFsaXplKGludCBhcmdjCiAgICAgICAgIDAsCiAgICAgICAgIDAs CiAgICAgICAgIGdldFdpbmRvd0ZyYW1lTWFpblBhZ2UsCi0gICAgICAgIHNldFdpbmRvd0ZyYW1l TWFpblBhZ2UKKyAgICAgICAgc2V0V2luZG93RnJhbWVNYWluUGFnZSwKKyAgICAgICAgMCwKICAg ICB9OwogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChtX21haW5XZWJWaWV3LT5wYWdlKCksICZw YWdlVUlDbGllbnQpOwogCg==