193207 2019-01-07 13:45:14 -0800 Remove use of NetworkProcess::singleton for downloads 2019-01-07 14:30:30 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson webkit-bug-importer oldest_to_newest 1492372 0 achristensen 2019-01-07 13:45:14 -0800 Remove use of NetworkProcess::singleton for downloads 1492374 1 358524 achristensen 2019-01-07 13:45:54 -0800 Created attachment 358524 Patch 1492405 2 358524 beidson 2019-01-07 14:24:37 -0800 Comment on attachment 358524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358524&action=review > Source/WebKit/NetworkProcess/Downloads/PendingDownload.h:51 > + PendingDownload(IPC::Connection*, NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName); > + PendingDownload(IPC::Connection*, std::unique_ptr<NetworkLoad>&&, ResponseCompletionHandler&&, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&); Sure wish we could make these take Connection& 1492408 3 achristensen 2019-01-07 14:29:37 -0800 Wouldn't it be great? http://trac.webkit.org/r239699 1492411 4 webkit-bug-importer 2019-01-07 14:30:30 -0800 <rdar://problem/47096626> 358524 2019-01-07 13:45:54 -0800 2019-01-07 14:24:37 -0800 Patch bug-193207-20190107134553.patch text/plain 13552 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk2OTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE5LTAxLTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHVzZSBv ZiBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uIGZvciBkb3dubG9hZHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzIwNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4g IFRoZSBEb3dubG9hZE1hbmFnZXIgaXMgbm93IGEgbWVtYmVyIG9mIHRoZSBOZXR3b3JrUHJvY2Vz cyBpbnN0ZWFkIG9mIGEgc3RhdGljIHNpbmdsZXRvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkOjpE b3dubG9hZCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkOjpkaWRSZWNlaXZlQ2hhbGxlbmdl KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaDoKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjpzdGFydERvd25sb2FkKToKKyAgICAgICAgKFdl YktpdDo6RG93bmxvYWRNYW5hZ2VyOjpjb252ZXJ0TmV0d29ya0xvYWRUb0Rvd25sb2FkKToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmg6CisgICAg ICAgIChXZWJLaXQ6OkRvd25sb2FkTWFuYWdlcjo6Y2xpZW50KToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvUGVuZGluZ0Rvd25sb2FkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGVuZGluZ0Rvd25sb2FkOjpQZW5kaW5nRG93bmxvYWQpOgorICAgICAgICAoV2ViS2l0OjpQZW5k aW5nRG93bmxvYWQ6Om1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvUGVuZGluZ0Rvd25sb2FkLmg6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya0xvYWRDaGVja2VyLmNwcDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpOZXR3 b3JrUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkb3dubG9hZE1h bmFnZXIpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6CisKIDIw MTktMDEtMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAg ICBbQ29jb2FdIEFkZCBTUEkgdG8gY2hlY2sgaWYgYSBXS1dlYlZpZXcgaGFzIGFuIGluc3BlY3Rv ciBmcm9udGVuZApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9h ZENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0xvYWRDaGVja2VyLmNwcAkocmV2aXNpb24gMjM5NjcwKQorKysgU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZENoZWNrZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiTmV0d29ya0xv YWRDaGVja2VyLmgiCiAKKyNpbmNsdWRlICJEb3dubG9hZC5oIgogI2luY2x1ZGUgIkxvZ2dpbmcu aCIKICNpbmNsdWRlICJOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuaCIKICNpbmNsdWRlICJO ZXR3b3JrUHJvY2Vzcy5oIgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDIzOTY4MCkKKysrIFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQs NiArMTI0LDcgQEAgTmV0d29ya1Byb2Nlc3M6Ok5ldHdvcmtQcm9jZXNzKCkKICAgICAsIG1fY2Fj aGVNb2RlbChDYWNoZU1vZGVsOjpEb2N1bWVudFZpZXdlcikKICAgICAsIG1fZGlza0NhY2hlSXNE aXNhYmxlZEZvclRlc3RpbmcoZmFsc2UpCiAgICAgLCBtX2NhbkhhbmRsZUhUVFBTU2VydmVyVHJ1 c3RFdmFsdWF0aW9uKHRydWUpCisgICAgLCBtX2Rvd25sb2FkTWFuYWdlcigqdGhpcykKICNpZiBQ TEFURk9STShDT0NPQSkKICAgICAsIG1fY2xlYXJDYWNoZURpc3BhdGNoR3JvdXAoMCkKICNlbmRp ZgpAQCAtMTY1LDggKzE2Niw3IEBAIEF1dGhlbnRpY2F0aW9uTWFuYWdlciYgTmV0d29ya1Byb2Nl c3M6OmEKIAogRG93bmxvYWRNYW5hZ2VyJiBOZXR3b3JrUHJvY2Vzczo6ZG93bmxvYWRNYW5hZ2Vy KCkKIHsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8RG93bmxvYWRNYW5hZ2VyPiBkb3dubG9h ZE1hbmFnZXIoKnRoaXMpOwotICAgIHJldHVybiBkb3dubG9hZE1hbmFnZXI7CisgICAgcmV0dXJu IG1fZG93bmxvYWRNYW5hZ2VyOwogfQogCiAjaWYgRU5BQkxFKFBST1hJTUlUWV9ORVRXT1JLSU5H KQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu aAkocmV2aXNpb24gMjM5NjgzKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCw2IEBAIGNsYXNzIE5ldHdv cmtQcm9jZXNzIDogcHVibGljIENoaWxkUHJvY2UKICNlbmRpZgogewogICAgIFdURl9NQUtFX05P TkNPUFlBQkxFKE5ldHdvcmtQcm9jZXNzKTsKLSAgICBmcmllbmQgTmV2ZXJEZXN0cm95ZWQ8RG93 bmxvYWRNYW5hZ2VyPjsKIHB1YmxpYzoKICAgICB+TmV0d29ya1Byb2Nlc3MoKTsKICAgICBzdGF0 aWMgTmV0d29ya1Byb2Nlc3MmIHNpbmdsZXRvbigpOwpAQCAtMjExLDYgKzIxMCw5IEBAIHB1Ymxp YzoKIAogICAgIGNvbnN0IFN0cmluZyYgdWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcigpIGNvbnN0 IHsgcmV0dXJuIG1fdWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcjsgfQogCisgICAgdm9pZCByZWYo KSBjb25zdCBvdmVycmlkZSB7IFRocmVhZFNhZmVSZWZDb3VudGVkPE5ldHdvcmtQcm9jZXNzPjo6 cmVmKCk7IH0KKyAgICB2b2lkIGRlcmVmKCkgY29uc3Qgb3ZlcnJpZGUgeyBUaHJlYWRTYWZlUmVm Q291bnRlZDxOZXR3b3JrUHJvY2Vzcz46OmRlcmVmKCk7IH0KKyAgICAKIHByaXZhdGU6CiAgICAg TmV0d29ya1Byb2Nlc3MoKTsKIApAQCAtMjQ3LDYgKzI0OSw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBkaWRDcmVhdGVEb3dubG9hZCgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlkRGVzdHJveURvd25s b2FkKCkgb3ZlcnJpZGU7CiAgICAgSVBDOjpDb25uZWN0aW9uKiBkb3dubG9hZFByb3h5Q29ubmVj dGlvbigpIG92ZXJyaWRlOworICAgIElQQzo6Q29ubmVjdGlvbiogcGFyZW50UHJvY2Vzc0Nvbm5l Y3Rpb25Gb3JEb3dubG9hZHMoKSBvdmVycmlkZSB7IHJldHVybiBwYXJlbnRQcm9jZXNzQ29ubmVj dGlvbigpOyB9CiAgICAgQXV0aGVudGljYXRpb25NYW5hZ2VyJiBkb3dubG9hZHNBdXRoZW50aWNh dGlvbk1hbmFnZXIoKSBvdmVycmlkZTsKICAgICB2b2lkIHBlbmRpbmdEb3dubG9hZENhbmNlbGVk KERvd25sb2FkSUQpIG92ZXJyaWRlOwogCkBAIC0zNTQsNiArMzU3LDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1fZGlza0NhY2hlSXNEaXNhYmxlZEZvclRlc3Rpbmc7CiAgICAgYm9vbCBtX2Nhbkhh bmRsZUhUVFBTU2VydmVyVHJ1c3RFdmFsdWF0aW9uOwogICAgIFN0cmluZyBtX3VpUHJvY2Vzc0J1 bmRsZUlkZW50aWZpZXI7CisgICAgRG93bmxvYWRNYW5hZ2VyIG1fZG93bmxvYWRNYW5hZ2VyOwog CiAgICAgUmVmUHRyPE5ldHdvcmtDYWNoZTo6Q2FjaGU+IG1fY2FjaGU7CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5jcHAJ KHJldmlzaW9uIDIzOTY3MCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL0Rvd25sb2FkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsNyBAQCB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIERvd25sb2FkOjpEb3dubG9hZChEb3dubG9hZE1hbmFnZXImIGRv d25sb2FkTWFuYWdlciwgRG93bmxvYWRJRCBkb3dubG9hZElELCBOZXR3b3JrRGF0YVRhc2smIGRv d25sb2FkLCBjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIHN1 Z2dlc3RlZE5hbWUpCiAgICAgOiBtX2Rvd25sb2FkTWFuYWdlcihkb3dubG9hZE1hbmFnZXIpCiAg ICAgLCBtX2Rvd25sb2FkSUQoZG93bmxvYWRJRCkKKyAgICAsIG1fY2xpZW50KGRvd25sb2FkTWFu YWdlci5jbGllbnQoKSkKICAgICAsIG1fZG93bmxvYWQoJmRvd25sb2FkKQogICAgICwgbV9zZXNz aW9uSUQoc2Vzc2lvbklEKQogICAgICwgbV9zdWdnZXN0ZWROYW1lKHN1Z2dlc3RlZE5hbWUpCkBA IC02NSw2ICs2Niw3IEBAIERvd25sb2FkOjpEb3dubG9hZChEb3dubG9hZE1hbmFnZXImIGRvd24K IERvd25sb2FkOjpEb3dubG9hZChEb3dubG9hZE1hbmFnZXImIGRvd25sb2FkTWFuYWdlciwgRG93 bmxvYWRJRCBkb3dubG9hZElELCBOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2sqIGRvd25sb2FkLCBj b25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZE5h bWUpCiAgICAgOiBtX2Rvd25sb2FkTWFuYWdlcihkb3dubG9hZE1hbmFnZXIpCiAgICAgLCBtX2Rv d25sb2FkSUQoZG93bmxvYWRJRCkKKyAgICAsIG1fY2xpZW50KGRvd25sb2FkTWFuYWdlci5jbGll bnQoKSkKICAgICAsIG1fZG93bmxvYWRUYXNrKGRvd25sb2FkKQogICAgICwgbV9zZXNzaW9uSUQo c2Vzc2lvbklEKQogICAgICwgbV9zdWdnZXN0ZWROYW1lKHN1Z2dlc3RlZE5hbWUpCkBAIC05OCw3 ICsxMDAsNyBAQCB2b2lkIERvd25sb2FkOjpkaWRSZWNlaXZlQ2hhbGxlbmdlKGNvbnN0CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuYXV0 aGVudGljYXRpb25NYW5hZ2VyKCkuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKCp0 aGlzLCBjaGFsbGVuZ2UsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBtX2NsaWVu dC0+ZG93bmxvYWRzQXV0aGVudGljYXRpb25NYW5hZ2VyKCkuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlKCp0aGlzLCBjaGFsbGVuZ2UsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KTsKIH0KIAogdm9pZCBEb3dubG9hZDo6ZGlkQ3JlYXRlRGVzdGluYXRpb24oY29uc3QgU3RyaW5n JiBwYXRoKQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25s b2Fkcy9Eb3dubG9hZC5oCShyZXZpc2lvbiAyMzk2NzApCisrKyBTb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsy Niw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkRvd25sb2FkSUQuaCIKKyNpbmNsdWRl ICJEb3dubG9hZE1hbmFnZXIuaCIKICNpbmNsdWRlICJNZXNzYWdlU2VuZGVyLmgiCiAjaW5jbHVk ZSAiTmV0d29ya0RhdGFUYXNrLmgiCiAjaW5jbHVkZSAiU2FuZGJveEV4dGVuc2lvbi5oIgpAQCAt NTcsNyArNTgsNiBAQCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotY2xhc3MgRG93bmxvYWRNYW5hZ2VyOwogY2xhc3MgTmV0d29ya0RhdGFUYXNrOwogY2xh c3MgTmV0d29ya1Nlc3Npb247CiBjbGFzcyBXZWJQYWdlOwpAQCAtMTAxLDYgKzEwMSw3IEBAIHBy aXZhdGU6CiAKICAgICBEb3dubG9hZE1hbmFnZXImIG1fZG93bmxvYWRNYW5hZ2VyOwogICAgIERv d25sb2FkSUQgbV9kb3dubG9hZElEOworICAgIFJlZjxEb3dubG9hZE1hbmFnZXI6OkNsaWVudD4g bV9jbGllbnQ7CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OkJsb2JEYXRhRmlsZVJlZmVy ZW5jZT4+IG1fYmxvYkZpbGVSZWZlcmVuY2VzOwogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9u PiBtX3NhbmRib3hFeHRlbnNpb247CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5jcHAJKHJldmlzaW9u IDIzOTY3MCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25s b2FkTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDcgQEAgdm9pZCBEb3du bG9hZE1hbmFnZXI6OnN0YXJ0RG93bmxvYWQoTmV0dwogICAgICAgICBwYXJhbWV0ZXJzLmJsb2JG aWxlUmVmZXJlbmNlcyA9IE5ldHdvcmtCbG9iUmVnaXN0cnk6OnNpbmdsZXRvbigpLmZpbGVzSW5C bG9iKCpjb25uZWN0aW9uLCByZXF1ZXN0LnVybCgpKTsKICAgICBwYXJhbWV0ZXJzLnN0b3JlZENy ZWRlbnRpYWxzUG9saWN5ID0gc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkgPyBTdG9yZWRDcmVkZW50 aWFsc1BvbGljeTo6RG9Ob3RVc2UgOiBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOwogCi0g ICAgbV9wZW5kaW5nRG93bmxvYWRzLmFkZChkb3dubG9hZElELCBzdGQ6Om1ha2VfdW5pcXVlPFBl bmRpbmdEb3dubG9hZD4oV1RGTW92ZShwYXJhbWV0ZXJzKSwgZG93bmxvYWRJRCwgKm5ldHdvcmtT ZXNzaW9uLCBzdWdnZXN0ZWROYW1lKSk7CisgICAgbV9wZW5kaW5nRG93bmxvYWRzLmFkZChkb3du bG9hZElELCBzdGQ6Om1ha2VfdW5pcXVlPFBlbmRpbmdEb3dubG9hZD4obV9jbGllbnQucGFyZW50 UHJvY2Vzc0Nvbm5lY3Rpb25Gb3JEb3dubG9hZHMoKSwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgZG93 bmxvYWRJRCwgKm5ldHdvcmtTZXNzaW9uLCBzdWdnZXN0ZWROYW1lKSk7CiB9CiAKIHZvaWQgRG93 bmxvYWRNYW5hZ2VyOjpkYXRhVGFza0JlY2FtZURvd25sb2FkVGFzayhEb3dubG9hZElEIGRvd25s b2FkSUQsIHN0ZDo6dW5pcXVlX3B0cjxEb3dubG9hZD4mJiBkb3dubG9hZCkKQEAgLTkyLDcgKzky LDcgQEAgdm9pZCBEb3dubG9hZE1hbmFnZXI6OndpbGxEZWNpZGVQZW5kaW5nRAogdm9pZCBEb3du bG9hZE1hbmFnZXI6OmNvbnZlcnROZXR3b3JrTG9hZFRvRG93bmxvYWQoRG93bmxvYWRJRCBkb3du bG9hZElELCBzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0xvYWQ+JiYgbmV0d29ya0xvYWQsIFJlc3Bv bnNlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlciwgVmVjdG9yPFJlZlB0cjxX ZWJDb3JlOjpCbG9iRGF0YUZpbGVSZWZlcmVuY2U+PiYmIGJsb2JGaWxlUmVmZXJlbmNlcywgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSkKIHsKICAgICBBU1NFUlQoIW1fcGVuZGluZ0Rvd25sb2Fkcy5jb250YWlucyhkb3dubG9h ZElEKSk7Ci0gICAgbV9wZW5kaW5nRG93bmxvYWRzLmFkZChkb3dubG9hZElELCBzdGQ6Om1ha2Vf dW5pcXVlPFBlbmRpbmdEb3dubG9hZD4oV1RGTW92ZShuZXR3b3JrTG9hZCksIFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpLCBkb3dubG9hZElELCByZXF1ZXN0LCByZXNwb25zZSkpOworICAgIG1f cGVuZGluZ0Rvd25sb2Fkcy5hZGQoZG93bmxvYWRJRCwgc3RkOjptYWtlX3VuaXF1ZTxQZW5kaW5n RG93bmxvYWQ+KG1fY2xpZW50LnBhcmVudFByb2Nlc3NDb25uZWN0aW9uRm9yRG93bmxvYWRzKCks IFdURk1vdmUobmV0d29ya0xvYWQpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgZG93bmxv YWRJRCwgcmVxdWVzdCwgcmVzcG9uc2UpKTsKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFnZXI6OmNv bnRpbnVlRGVjaWRlUGVuZGluZ0Rvd25sb2FkRGVzdGluYXRpb24oRG93bmxvYWRJRCBkb3dubG9h ZElELCBTdHJpbmcgZGVzdGluYXRpb24sIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYmIHNhbmRi b3hFeHRlbnNpb25IYW5kbGUsIGJvb2wgYWxsb3dPdmVyd3JpdGUpCkluZGV4OiBTb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFn ZXIuaAkocmV2aXNpb24gMjM5NjcwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDggKzY5LDEx IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZURvd25sb2FkKCkgPSAw OwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRGVzdHJveURvd25sb2FkKCkgPSAwOwogICAgICAg ICB2aXJ0dWFsIElQQzo6Q29ubmVjdGlvbiogZG93bmxvYWRQcm94eUNvbm5lY3Rpb24oKSA9IDA7 CisgICAgICAgIHZpcnR1YWwgSVBDOjpDb25uZWN0aW9uKiBwYXJlbnRQcm9jZXNzQ29ubmVjdGlv bkZvckRvd25sb2FkcygpID0gMDsKICAgICAgICAgdmlydHVhbCBBdXRoZW50aWNhdGlvbk1hbmFn ZXImIGRvd25sb2Fkc0F1dGhlbnRpY2F0aW9uTWFuYWdlcigpID0gMDsKICAgICAgICAgdmlydHVh bCB2b2lkIHBlbmRpbmdEb3dubG9hZENhbmNlbGVkKERvd25sb2FkSUQpID0gMDsKKyAgICAgICAg dmlydHVhbCB2b2lkIHJlZigpIGNvbnN0ID0gMDsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRlcmVm KCkgY29uc3QgPSAwOwogICAgIH07CiAKICAgICBleHBsaWNpdCBEb3dubG9hZE1hbmFnZXIoQ2xp ZW50Jik7CkBAIC0xMDAsNiArMTAzLDggQEAgcHVibGljOgogCiAgICAgSVBDOjpDb25uZWN0aW9u KiBkb3dubG9hZFByb3h5Q29ubmVjdGlvbigpOwogICAgIEF1dGhlbnRpY2F0aW9uTWFuYWdlciYg ZG93bmxvYWRzQXV0aGVudGljYXRpb25NYW5hZ2VyKCk7CisgICAgCisgICAgQ2xpZW50JiBjbGll bnQoKSB7IHJldHVybiBtX2NsaWVudDsgfQogCiBwcml2YXRlOgogICAgIENsaWVudCYgbV9jbGll bnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9QZW5kaW5n RG93bmxvYWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv RG93bmxvYWRzL1BlbmRpbmdEb3dubG9hZC5jcHAJKHJldmlzaW9uIDIzOTY3MCkKKysrIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL1BlbmRpbmdEb3dubG9hZC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM1LDggKzM1LDkgQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKLVBlbmRpbmdEb3dubG9hZDo6UGVuZGluZ0Rvd25sb2FkKE5l dHdvcmtMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMsIERvd25sb2FkSUQgZG93bmxvYWRJRCwg TmV0d29ya1Nlc3Npb24mIG5ldHdvcmtTZXNzaW9uLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZE5h bWUpCitQZW5kaW5nRG93bmxvYWQ6OlBlbmRpbmdEb3dubG9hZChJUEM6OkNvbm5lY3Rpb24qIHBh cmVudFByb2Nlc3NDb25uZWN0aW9uLCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJz LCBEb3dubG9hZElEIGRvd25sb2FkSUQsIE5ldHdvcmtTZXNzaW9uJiBuZXR3b3JrU2Vzc2lvbiwg Y29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQogICAgIDogbV9uZXR3b3JrTG9hZChzdGQ6Om1h a2VfdW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgV1RGTW92ZShwYXJhbWV0ZXJzKSwgbmV0d29y a1Nlc3Npb24pKQorICAgICwgbV9wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbihwYXJlbnRQcm9jZXNz Q29ubmVjdGlvbikKIHsKICAgICBtX2lzQWxsb3dlZFRvQXNrVXNlckZvckNyZWRlbnRpYWxzID0g cGFyYW1ldGVycy5jbGllbnRDcmVkZW50aWFsUG9saWN5ID09IENsaWVudENyZWRlbnRpYWxQb2xp Y3k6Ok1heUFza0NsaWVudEZvckNyZWRlbnRpYWxzOwogCkBAIC00Nyw4ICs0OCw5IEBAIFBlbmRp bmdEb3dubG9hZDo6UGVuZGluZ0Rvd25sb2FkKE5ldHdvcmsKICAgICBzZW5kKE1lc3NhZ2VzOjpE b3dubG9hZFByb3h5OjpEaWRTdGFydChtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpLCBz dWdnZXN0ZWROYW1lKSk7CiB9CiAKLVBlbmRpbmdEb3dubG9hZDo6UGVuZGluZ0Rvd25sb2FkKHN0 ZDo6dW5pcXVlX3B0cjxOZXR3b3JrTG9hZD4mJiBuZXR3b3JrTG9hZCwgUmVzcG9uc2VDb21wbGV0 aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyLCBEb3dubG9hZElEIGRvd25sb2FkSUQsIGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UpCitQZW5kaW5nRG93bmxvYWQ6OlBlbmRpbmdEb3dubG9hZChJUEM6OkNvbm5lY3Rpb24q IHBhcmVudFByb2Nlc3NDb25uZWN0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0xvYWQ+JiYg bmV0d29ya0xvYWQsIFJlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxl ciwgRG93bmxvYWRJRCBkb3dubG9hZElELCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogICAgIDogbV9uZXR3b3JrTG9hZChX VEZNb3ZlKG5ldHdvcmtMb2FkKSkKKyAgICAsIG1fcGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24ocGFy ZW50UHJvY2Vzc0Nvbm5lY3Rpb24pCiB7CiAgICAgbV9pc0FsbG93ZWRUb0Fza1VzZXJGb3JDcmVk ZW50aWFscyA9IG1fbmV0d29ya0xvYWQtPmlzQWxsb3dlZFRvQXNrVXNlckZvckNyZWRlbnRpYWxz KCk7CiAKQEAgLTk3LDcgKzk5LDcgQEAgdm9pZCBQZW5kaW5nRG93bmxvYWQ6OmRpZEZhaWxMb2Fk aW5nKGNvbgogICAgIAogSVBDOjpDb25uZWN0aW9uKiBQZW5kaW5nRG93bmxvYWQ6Om1lc3NhZ2VT ZW5kZXJDb25uZWN0aW9uKCkKIHsKLSAgICByZXR1cm4gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRv bigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCk7CisgICAgcmV0dXJuIG1fcGFyZW50UHJvY2Vz c0Nvbm5lY3Rpb24uZ2V0KCk7CiB9CiAKIHZvaWQgUGVuZGluZ0Rvd25sb2FkOjpkaWRSZWNlaXZl UmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlc3BvbnNlLCBSZXNwb25zZUNv bXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCkluZGV4OiBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9QZW5kaW5nRG93bmxvYWQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9QZW5kaW5nRG93bmxvYWQu aAkocmV2aXNpb24gMjM5NjcwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvUGVuZGluZ0Rvd25sb2FkLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDEwIEBA CiAjaW5jbHVkZSAiTWVzc2FnZVNlbmRlci5oIgogI2luY2x1ZGUgIk5ldHdvcmtMb2FkQ2xpZW50 LmgiCiAKK25hbWVzcGFjZSBJUEMgeworY2xhc3MgQ29ubmVjdGlvbjsKK30KKwogbmFtZXNwYWNl IFdlYkNvcmUgewogY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKIH0KQEAgLTQzLDggKzQ3LDggQEAg Y2xhc3MgTmV0d29ya1Nlc3Npb247CiBjbGFzcyBQZW5kaW5nRG93bmxvYWQgOiBwdWJsaWMgTmV0 d29ya0xvYWRDbGllbnQsIHB1YmxpYyBJUEM6Ok1lc3NhZ2VTZW5kZXIgewogICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIFBlbmRpbmdEb3dubG9hZChOZXR3b3JrTG9h ZFBhcmFtZXRlcnMmJiwgRG93bmxvYWRJRCwgTmV0d29ya1Nlc3Npb24mLCBjb25zdCBTdHJpbmcm IHN1Z2dlc3RlZE5hbWUpOwotICAgIFBlbmRpbmdEb3dubG9hZChzdGQ6OnVuaXF1ZV9wdHI8TmV0 d29ya0xvYWQ+JiYsIFJlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXImJiwgRG93bmxvYWRJRCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZSYpOworICAgIFBlbmRpbmdEb3dubG9hZChJUEM6OkNvbm5lY3Rpb24qLCBOZXR3b3JrTG9h ZFBhcmFtZXRlcnMmJiwgRG93bmxvYWRJRCwgTmV0d29ya1Nlc3Npb24mLCBjb25zdCBTdHJpbmcm IHN1Z2dlc3RlZE5hbWUpOworICAgIFBlbmRpbmdEb3dubG9hZChJUEM6OkNvbm5lY3Rpb24qLCBz dGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0xvYWQ+JiYsIFJlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIm JiwgRG93bmxvYWRJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwogCiAgICAgdm9pZCBjb250aW51ZVdpbGxTZW5kUmVx dWVzdChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJik7CiAgICAgdm9pZCBjYW5jZWwoKTsKQEAg LTcxLDYgKzc1LDcgQEAgcHJpdmF0ZTogICAgCiAKIHByaXZhdGU6CiAgICAgc3RkOjp1bmlxdWVf cHRyPE5ldHdvcmtMb2FkPiBtX25ldHdvcmtMb2FkOworICAgIFJlZlB0cjxJUEM6OkNvbm5lY3Rp b24+IG1fcGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb247CiAgICAgYm9vbCBtX2lzQWxsb3dlZFRvQXNr VXNlckZvckNyZWRlbnRpYWxzOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCg==