196808 2019-04-10 22:26:20 -0700 RTCTrackEvent should be delayed until the whole remote description is set 2019-04-29 09:24:38 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1526310 0 youennf 2019-04-10 22:26:20 -0700 We are currently firing RTCTrackEvent as soon as a new track is found. We should actually delay this until the remote description is fully applied. This will for instance ensure that the streams passed through RTCTrackEvent have the right number of tracks as soon as exposed to JS 1526311 1 webkit-bug-importer 2019-04-10 22:26:34 -0700 <rdar://problem/49802649> 1530944 2 368392 youennf 2019-04-27 00:30:19 -0700 Created attachment 368392 Patch 1531146 3 youennf 2019-04-29 08:08:37 -0700 win error is unrelated 1531168 4 368392 commit-queue 2019-04-29 09:24:36 -0700 Comment on attachment 368392 Patch Clearing flags on attachment: 368392 Committed r244736: <https://trac.webkit.org/changeset/244736> 1531169 5 commit-queue 2019-04-29 09:24:38 -0700 All reviewed patches have been landed. Closing bug. 368392 2019-04-27 00:30:19 -0700 2019-04-29 09:24:36 -0700 Patch bug-196808-20190427003019.patch text/plain 12339 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0Njk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE5NWQxNjY4YzRhZWE2 YTBiM2ZjOTNkNDFiYTE4NTBjODE5MTdiZS4uZDM1ZTg3YjM3NzdiNzAwZjA2MzY3M2I1ZTNkZThh YTk3MDJmZGU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTA0LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSVENUcmFja0V2ZW50IHNo b3VsZCBiZSBkZWxheWVkIHVudGlsIHRoZSB3aG9sZSByZW1vdGUgZGVzY3JpcHRpb24gaXMgc2V0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY4MDgK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5ODAyNjQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHBlciBodHRwczovL3czYy5naXRodWIuaW8v d2VicnRjLXBjLyNzZXQtZGVzY3JpcHRpb24sCisgICAgICAgIGZpcmUgZXZlbnRzIGp1c3QgYmVm b3JlIHJlc29sdmluZyB0aGUgc2V0UmVtb3RlRGVzY3JpcHRpb24gcHJvbWlzZS4KKyAgICAgICAg VGhpcyBlbnN1cmVzIHRoYXQgdGhlIGV4cG9zZWQgc3RyZWFtIGhhcyBhbGwgbmVjZXNzYXJ5IHRy YWNrcyBmcm9tIHRoZSBiZWdpbm5pbmcuCisgICAgICAgIFBlbmRpbmcgdHJhY2sgZXZlbnRzIGFy ZSBjcmVhdGVkIGluIExpYldlYlJUQ01lZGlhRW5kcG9pbnQgYW5kIHN0b3JlZCBpbiBQZWVyQ29u bmVjdGlvbkJhY2tlbmQuCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldFJlbW90ZURlc2NyaXB0 aW9uU3VjY2VlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6 c2V0UmVtb3RlRGVzY3JpcHRpb25GYWlsZWQpOgorICAgICAgICAoV2ViQ29yZTo6UGVlckNvbm5l Y3Rpb25CYWNrZW5kOjphZGRQZW5kaW5nVHJhY2tFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnN0b3ApOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJl YW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM aWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRSZW1vdGVUcmFjayk6CisgICAgICAgIChXZWJDb3Jl OjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRQZW5kaW5nVHJhY2tFdmVudCk6CisgICAgICAg IChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpuZXdUcmFuc2NlaXZlcik6CisgICAg ICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2lu dC5oOgorCiAyMDE5LTA0LTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBVc2Ugbm9ybWFsIGxvYWRpbmcgcGF0aCBmb3IgcGluZyBsb2FkcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tl bmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlv bkJhY2tlbmQuY3BwCmluZGV4IDA0ZWM1MzUwNjRhN2M4OTU5MWFmYmJhMjYyMDU3NzE2NTgxNGZj NGQuLjIxYWRlZmU1OTdhYzkyMDA3MGQ3ZjEzYTkyOTBjNDJiYmRjNDY4N2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0 aW9uQmFja2VuZC5jcHAKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRlICJSVENQZWVyQ29ubmVj dGlvbi5oIgogI2luY2x1ZGUgIlJUQ1BlZXJDb25uZWN0aW9uSWNlRXZlbnQuaCIKICNpbmNsdWRl ICJSVENSdHBDYXBhYmlsaXRpZXMuaCIKKyNpbmNsdWRlICJSVENUcmFja0V2ZW50LmgiCiAjaW5j bHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmlu Z0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZU51bWJlcnMu aD4KQEAgLTI0OCw2ICsyNDksMjEgQEAgdm9pZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnNldFJl bW90ZURlc2NyaXB0aW9uU3VjY2VlZGVkKCkKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog ICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIlNldCByZW1vdGUgZGVzY3JpcHRpb24gc3Vj Y2VlZGVkIik7CiAKKyAgICBBU1NFUlQoIW1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSk7CisK KyAgICBhdXRvIGV2ZW50cyA9IFdURk1vdmUobV9wZW5kaW5nVHJhY2tFdmVudHMpOworICAgIGZv ciAoYXV0byYgZXZlbnQgOiBldmVudHMpIHsKKyAgICAgICAgYXV0byYgdHJhY2sgPSBldmVudC50 cmFjay5nZXQoKTsKKworICAgICAgICBtX3BlZXJDb25uZWN0aW9uLmZpcmVFdmVudChSVENUcmFj a0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnRyYWNrRXZlbnQsIEV2ZW50OjpDYW5CdWJibGU6 Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObywgV1RGTW92ZShldmVudC5yZWNlaXZlciksIFdU Rk1vdmUoZXZlbnQudHJhY2spLCBXVEZNb3ZlKGV2ZW50LnN0cmVhbXMpLCBXVEZNb3ZlKGV2ZW50 LnRyYW5zY2VpdmVyKSkpOworCisgICAgICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2Vk KCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgLy8gRklYTUU6IEFzIHBlciBzcGVj LCB3ZSBzaG91bGQgc2V0IG11dGVkIHRvICdmYWxzZScgd2hlbiBzdGFydGluZyB0byByZWNlaXZl IHRoZSBjb250ZW50IGZyb20gbmV0d29yay4KKyAgICAgICAgdHJhY2suc291cmNlKCkuc2V0TXV0 ZWQoZmFsc2UpOworICAgIH0KKwogICAgIGlmIChtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2VkKCkp CiAgICAgICAgIHJldHVybjsKIApAQCAtMjYyLDE1ICsyNzgsMjIgQEAgdm9pZCBQZWVyQ29ubmVj dGlvbkJhY2tlbmQ6OnNldFJlbW90ZURlc2NyaXB0aW9uRmFpbGVkKEV4Y2VwdGlvbiYmIGV4Y2Vw dGlvbikKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFMV0FZU19MT0coTE9HSURF TlRJRklFUiwgIlNldCByZW1vdGUgZGVzY3JpcHRpb24gZmFpbGVkOiIsIGV4Y2VwdGlvbi5tZXNz YWdlKCkpOwogCi0gICAgaWYgKG1fcGVlckNvbm5lY3Rpb24uaXNDbG9zZWQoKSkKLSAgICAgICAg cmV0dXJuOworICAgIEFTU0VSVChtX3BlbmRpbmdUcmFja0V2ZW50cy5pc0VtcHR5KCkpOworICAg IG1fcGVuZGluZ1RyYWNrRXZlbnRzLmNsZWFyKCk7CiAKKyAgICBBU1NFUlQoIW1fcGVlckNvbm5l Y3Rpb24uaXNDbG9zZWQoKSk7CiAgICAgQVNTRVJUKG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlKTsK IAogICAgIG1fc2V0RGVzY3JpcHRpb25Qcm9taXNlLT5yZWplY3QoV1RGTW92ZShleGNlcHRpb24p KTsKICAgICBtX3NldERlc2NyaXB0aW9uUHJvbWlzZSA9IFdURjo6bnVsbG9wdDsKIH0KIAordm9p ZCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFkZFBlbmRpbmdUcmFja0V2ZW50KFBlbmRpbmdUcmFj a0V2ZW50JiYgZXZlbnQpCit7CisgICAgQVNTRVJUKCFtX3BlZXJDb25uZWN0aW9uLmlzQ2xvc2Vk KCkpOworICAgIG1fcGVuZGluZ1RyYWNrRXZlbnRzLmFwcGVuZChXVEZNb3ZlKGV2ZW50KSk7Cit9 CisKIHN0YXRpYyBTdHJpbmcgZXh0cmFjdElQQWRkcmVzKGNvbnN0IFN0cmluZyYgc2RwKQogewog ICAgIEFTU0VSVChzZHAuY29udGFpbnMoIiBob3N0ICIpKTsKQEAgLTQ5MSw2ICs1MTQsOCBAQCB2 b2lkIFBlZXJDb25uZWN0aW9uQmFja2VuZDo6c3RvcCgpCiAgICAgbV9zZXREZXNjcmlwdGlvblBy b21pc2UgPSBXVEY6Om51bGxvcHQ7CiAgICAgbV9hZGRJY2VDYW5kaWRhdGVQcm9taXNlID0gV1RG OjpudWxsb3B0OwogCisgICAgbV9wZW5kaW5nVHJhY2tFdmVudHMuY2xlYXIoKTsKKwogICAgIGRv U3RvcCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuaAppbmRleCBkYmJlZDRkZjY1YzFhNzQyNmQ0 MDVmNmFmOTQ4ZjM0ZmZiMmNmOWE3Li5lMWJkYWJjNTM3YWU3NTEwOTU5NGFmNjUzZWI5NmZiOGU5 MGE3ZTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1Bl ZXJDb25uZWN0aW9uQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmgKQEAgLTE5Miw2ICsxOTIsMTQgQEAgcHJvdGVj dGVkOgogCiAgICAgU3RyaW5nIGZpbHRlclNEUChTdHJpbmcmJikgY29uc3Q7CiAKKyAgICBzdHJ1 Y3QgUGVuZGluZ1RyYWNrRXZlbnQgeworICAgICAgICBSZWY8UlRDUnRwUmVjZWl2ZXI+IHJlY2Vp dmVyOworICAgICAgICBSZWY8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2s7CisgICAgICAgIFZlY3Rv cjxSZWZQdHI8TWVkaWFTdHJlYW0+PiBzdHJlYW1zOworICAgICAgICBSZWZQdHI8UlRDUnRwVHJh bnNjZWl2ZXI+IHRyYW5zY2VpdmVyOworICAgIH07CisgICAgdm9pZCBhZGRQZW5kaW5nVHJhY2tF dmVudChQZW5kaW5nVHJhY2tFdmVudCYmKTsKKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg ZG9DcmVhdGVPZmZlcihSVENPZmZlck9wdGlvbnMmJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBk b0NyZWF0ZUFuc3dlcihSVENBbnN3ZXJPcHRpb25zJiYpID0gMDsKQEAgLTIyMSw2ICsyMjksOCBA QCBwcml2YXRlOgogICAgIH07CiAgICAgVmVjdG9yPFBlbmRpbmdJQ0VDYW5kaWRhdGU+IG1fcGVu ZGluZ0lDRUNhbmRpZGF0ZXM7CiAKKyAgICBWZWN0b3I8UGVuZGluZ1RyYWNrRXZlbnQ+IG1fcGVu ZGluZ1RyYWNrRXZlbnRzOworCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgUmVmPGNv bnN0IExvZ2dlcj4gbV9sb2dnZXI7CiAgICAgY29uc3Qgdm9pZCogbV9sb2dJZGVudGlmaWVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29u bmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJD b25uZWN0aW9uLmNwcAppbmRleCBhZjJiN2M3ZGNiOWM1MjEyNWIyNTdjZjEwODMzMjQxM2FlYzll MmJlLi44NzEzZmRkZWQxNzExY2I4MGI4YjIyZmU3OGNkNGZlYzEwZGRlN2E2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0 aW9uLmNwcApAQCAtNTIsNyArNTIsNiBAQAogI2luY2x1ZGUgIlJUQ0ljZUNhbmRpZGF0ZS5oIgog I2luY2x1ZGUgIlJUQ1BlZXJDb25uZWN0aW9uSWNlRXZlbnQuaCIKICNpbmNsdWRlICJSVENTZXNz aW9uRGVzY3JpcHRpb24uaCIKLSNpbmNsdWRlICJSVENUcmFja0V2ZW50LmgiCiAjaW5jbHVkZSA8 d3RmL0NyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVtYmVyLmg+CiAjaW5jbHVkZSA8d3RmL0lzb01h bGxvY0lubGluZXMuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVk aWFFbmRwb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndl YnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAppbmRleCBkNTBmYjA5MzA3MjFlMjU3ZDM1 YWY1MzczMTE4MDExMjUzNjFmZWRmLi5jNzc0OWRiNTRmYTgxNDIzMzJlOTBlZjM3MmZkYzBhZWRj MzNmOGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcApA QCAtNDcsNyArNDcsNiBAQAogI2luY2x1ZGUgIlJUQ1BlZXJDb25uZWN0aW9uLmgiCiAjaW5jbHVk ZSAiUlRDU2Vzc2lvbkRlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiUlRDU3RhdHNSZXBvcnQuaCIK LSNpbmNsdWRlICJSVENUcmFja0V2ZW50LmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVJbmNvbWluZ0F1 ZGlvU291cmNlLmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlLmgiCiAj aW5jbHVkZSAiUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlLmgiCkBAIC0zOTUsMTAgKzM5NCwx MCBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmFkZFJlbW90ZVRyYWNrKHJ0Yzo6c2Nv cGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFJlY2VpdgogCiAgICAgcmVjZWl2ZXItPnNldEJhY2tlbmQo c3RkOjptYWtlX3VuaXF1ZTxMaWJXZWJSVENSdHBSZWNlaXZlckJhY2tlbmQ+KFdURk1vdmUocnRj UmVjZWl2ZXIpKSk7CiAgICAgYXV0byYgdHJhY2sgPSByZWNlaXZlci0+dHJhY2soKTsKLSAgICBm aXJlVHJhY2tFdmVudChyZWNlaXZlci5yZWxlYXNlTm9uTnVsbCgpLCB0cmFjaywgcnRjU3RyZWFt cywgbnVsbHB0cik7CisgICAgYWRkUGVuZGluZ1RyYWNrRXZlbnQocmVjZWl2ZXIucmVsZWFzZU5v bk51bGwoKSwgdHJhY2ssIHJ0Y1N0cmVhbXMsIG51bGxwdHIpOwogfQogCi12b2lkIExpYldlYlJU Q01lZGlhRW5kcG9pbnQ6OmZpcmVUcmFja0V2ZW50KFJlZjxSVENSdHBSZWNlaXZlcj4mJiByZWNl aXZlciwgTWVkaWFTdHJlYW1UcmFjayYgdHJhY2ssIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6c2Nv cGVkX3JlZnB0cjx3ZWJydGM6Ok1lZGlhU3RyZWFtSW50ZXJmYWNlPj4mIHJ0Y1N0cmVhbXMsIFJl ZlB0cjxSVENSdHBUcmFuc2NlaXZlcj4mJiB0cmFuc2NlaXZlcikKK3ZvaWQgTGliV2ViUlRDTWVk aWFFbmRwb2ludDo6YWRkUGVuZGluZ1RyYWNrRXZlbnQoUmVmPFJUQ1J0cFJlY2VpdmVyPiYmIHJl Y2VpdmVyLCBNZWRpYVN0cmVhbVRyYWNrJiB0cmFjaywgY29uc3Qgc3RkOjp2ZWN0b3I8cnRjOjpz Y29wZWRfcmVmcHRyPHdlYnJ0Yzo6TWVkaWFTdHJlYW1JbnRlcmZhY2U+PiYgcnRjU3RyZWFtcywg UmVmUHRyPFJUQ1J0cFRyYW5zY2VpdmVyPiYmIHRyYW5zY2VpdmVyKQogewogICAgIFZlY3RvcjxS ZWZQdHI8TWVkaWFTdHJlYW0+PiBzdHJlYW1zOwogICAgIGZvciAoYXV0byYgcnRjU3RyZWFtIDog cnRjU3RyZWFtcykgewpAQCAtNDExLDExICs0MTAsNyBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5k cG9pbnQ6OmZpcmVUcmFja0V2ZW50KFJlZjxSVENSdHBSZWNlaXZlcj4mJiByZWNlaXZlciwgTWVk aQogICAgIH0pOwogICAgIG1fcmVtb3RlU3RyZWFtc0Zyb21SZW1vdGVUcmFjay5hZGQoJnRyYWNr LCBXVEZNb3ZlKHN0cmVhbUlkcykpOwogCi0gICAgbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuY29u bmVjdGlvbigpLmZpcmVFdmVudChSVENUcmFja0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnRy YWNrRXZlbnQsCi0gICAgICAgIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxh YmxlOjpObywgV1RGTW92ZShyZWNlaXZlciksICZ0cmFjaywgV1RGTW92ZShzdHJlYW1zKSwgV1RG TW92ZSh0cmFuc2NlaXZlcikpKTsKLQotICAgIC8vIEZJWE1FOiBBcyBwZXIgc3BlYywgd2Ugc2hv dWxkIHNldCBtdXRlZCB0byAnZmFsc2UnIHdoZW4gc3RhcnRpbmcgdG8gcmVjZWl2ZSB0aGUgY29u dGVudCBmcm9tIG5ldHdvcmsuCi0gICAgdHJhY2suc291cmNlKCkuc2V0TXV0ZWQoZmFsc2UpOwor ICAgIG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLmFkZFBlbmRpbmdUcmFja0V2ZW50KHsgV1RGTW92 ZShyZWNlaXZlciksIG1ha2VSZWYodHJhY2spLCBXVEZNb3ZlKHN0cmVhbXMpLCBXVEZNb3ZlKHRy YW5zY2VpdmVyKSB9KTsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkIHNldEV4aXN0aW5nUmVjZWl2 ZXJTb3VyY2VUcmFjayhSZWFsdGltZU1lZGlhU291cmNlJiBleGlzdGluZ1NvdXJjZSwgd2VicnRj OjpSdHBSZWNlaXZlckludGVyZmFjZSYgcnRjUmVjZWl2ZXIpCkBAIC00OTAsNyArNDg1LDcgQEAg dm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpuZXdUcmFuc2NlaXZlcihydGM6OnNjb3BlZF9y ZWZwdHI8d2VicnRjOjpSdHBUcmFuc2MKICAgICBpZiAodHJhbnNjZWl2ZXIpIHsKICAgICAgICAg YXV0byBydGNSZWNlaXZlciA9IHJ0Y1RyYW5zY2VpdmVyLT5yZWNlaXZlcigpOwogICAgICAgICBz ZXRFeGlzdGluZ1JlY2VpdmVyU291cmNlVHJhY2sodHJhbnNjZWl2ZXItPnJlY2VpdmVyKCkudHJh Y2soKS5zb3VyY2UoKSwgKnJ0Y1JlY2VpdmVyKTsKLSAgICAgICAgZmlyZVRyYWNrRXZlbnQobWFr ZVJlZih0cmFuc2NlaXZlci0+cmVjZWl2ZXIoKSksIHRyYW5zY2VpdmVyLT5yZWNlaXZlcigpLnRy YWNrKCksIHJ0Y1JlY2VpdmVyLT5zdHJlYW1zKCksIG1ha2VSZWYoKnRyYW5zY2VpdmVyKSk7Cisg ICAgICAgIGFkZFBlbmRpbmdUcmFja0V2ZW50KG1ha2VSZWYodHJhbnNjZWl2ZXItPnJlY2VpdmVy KCkpLCB0cmFuc2NlaXZlci0+cmVjZWl2ZXIoKS50cmFjaygpLCBydGNSZWNlaXZlci0+c3RyZWFt cygpLCBtYWtlUmVmKCp0cmFuc2NlaXZlcikpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBA IC01MDEsNyArNDk2LDcgQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpuZXdUcmFuc2Nl aXZlcihydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBUcmFuc2MKIAogICAgIGF1dG8mIG5l d1RyYW5zY2VpdmVyID0gbV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQubmV3UmVtb3RlVHJhbnNjZWl2 ZXIoc3RkOjptYWtlX3VuaXF1ZTxMaWJXZWJSVENSdHBUcmFuc2NlaXZlckJhY2tlbmQ+KFdURk1v dmUocnRjVHJhbnNjZWl2ZXIpKSwgc291cmNlLnJlbGVhc2VOb25OdWxsKCkpOwogCi0gICAgZmly ZVRyYWNrRXZlbnQobWFrZVJlZihuZXdUcmFuc2NlaXZlci5yZWNlaXZlcigpKSwgbmV3VHJhbnNj ZWl2ZXIucmVjZWl2ZXIoKS50cmFjaygpLCBydGNSZWNlaXZlci0+c3RyZWFtcygpLCBtYWtlUmVm KG5ld1RyYW5zY2VpdmVyKSk7CisgICAgYWRkUGVuZGluZ1RyYWNrRXZlbnQobWFrZVJlZihuZXdU cmFuc2NlaXZlci5yZWNlaXZlcigpKSwgbmV3VHJhbnNjZWl2ZXIucmVjZWl2ZXIoKS50cmFjaygp LCBydGNSZWNlaXZlci0+c3RyZWFtcygpLCBtYWtlUmVmKG5ld1RyYW5zY2VpdmVyKSk7CiB9CiAK IHZvaWQgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6cmVtb3ZlUmVtb3RlVHJhY2socnRjOjpzY29w ZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbnRlcmZhY2U+JiYgcmVjZWl2ZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJX ZWJSVENNZWRpYUVuZHBvaW50LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKaW5kZXggNmVjOTRjZDAzYjZmNDky MWI2OTJhZWUyNTJlNmYxZGE4ZWFiYmVmNS4uNjJiYjQ3NmEwZTNiMjFmNmIzOWUyZGFmMmIyNmJi ZTFmY2ZlZGY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaApA QCAtMTQzLDcgKzE0Myw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBuZXdUcmFuc2NlaXZlcihydGM6 OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBUcmFuc2NlaXZlckludGVyZmFjZT4mJik7CiAgICAg dm9pZCByZW1vdmVSZW1vdGVUcmFjayhydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBSZWNl aXZlckludGVyZmFjZT4mJik7CiAKLSAgICB2b2lkIGZpcmVUcmFja0V2ZW50KFJlZjxSVENSdHBS ZWNlaXZlcj4mJiwgTWVkaWFTdHJlYW1UcmFjayYsIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6c2Nv cGVkX3JlZnB0cjx3ZWJydGM6Ok1lZGlhU3RyZWFtSW50ZXJmYWNlPj4mLCBSZWZQdHI8UlRDUnRw VHJhbnNjZWl2ZXI+JiYpOworICAgIHZvaWQgYWRkUGVuZGluZ1RyYWNrRXZlbnQoUmVmPFJUQ1J0 cFJlY2VpdmVyPiYmLCBNZWRpYVN0cmVhbVRyYWNrJiwgY29uc3Qgc3RkOjp2ZWN0b3I8cnRjOjpz Y29wZWRfcmVmcHRyPHdlYnJ0Yzo6TWVkaWFTdHJlYW1JbnRlcmZhY2U+PiYsIFJlZlB0cjxSVENS dHBUcmFuc2NlaXZlcj4mJik7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogICAgIE9wdGlv bmFsPEJhY2tlbmRzPiBjcmVhdGVUcmFuc2NlaXZlckJhY2tlbmRzKFQmJiwgY29uc3QgUlRDUnRw VHJhbnNjZWl2ZXJJbml0JiwgTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6U291cmNlJiYpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDJjNjQ0OTY3ZDUzMGJhOGI1NDI4NjcxYTBlOTk2N2Y0ZGViNjMzYWQuLjFlMTI0ZTI4 NmI2Nzg2ZGJiZDZmZjYyZDZiZGQyZWY1NDM3ZTk3NjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOS0wNC0yNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAg UlRDVHJhY2tFdmVudCBzaG91bGQgYmUgZGVsYXllZCB1bnRpbCB0aGUgd2hvbGUgcmVtb3RlIGRl c2NyaXB0aW9uIGlzIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk2ODA4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTgwMjY0OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy92aWRl by1hZGRUcmFjay5odG1sOgorCiAyMDE5LTA0LTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgRmV0Y2ggS2VlcCBBbGl2ZSBieSBkZWZhdWx0CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhY2suaHRtbCBiL0xheW91 dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFjay5odG1sCmluZGV4IDQ1YTFiYWEwMDg3MDI1OWMz YjYyY2NiM2Q4MGM2ZTZhOWU0MzI2ZWYuLjg4YzUyM2Y3YzM4ODU5OGIxZDJjYzIzMzFlYzg3N2Y0 Yjg0NTcxOTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFjay5o dG1sCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hZGRUcmFjay5odG1sCkBAIC02MCw2 ICs2MCw4IEBAIGZ1bmN0aW9uIHRlc3RCYXNpY1ZpZGVvRXhjaGFuZ2VXaXRoQWRkVHJhY2sod2Fp dEZvclNlY29uZFRyYWNrKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFzc2VydF9lcXVh bHModHJhY2tFdmVudC50cmFjay5pZCwgc3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF0uaWQpOwog ICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgICAg IGFzc2VydF9lcXVhbHModHJhY2tFdmVudC50cmFjay5pZCwgc3RyZWFtLmdldEF1ZGlvVHJhY2tz KClbMF0uaWQpOworICAgICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyh0cmFja0V2 ZW50LnN0cmVhbXMubGVuZ3RoLCAxKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFzc2VydF9l cXVhbHModHJhY2tFdmVudC5zdHJlYW1zWzBdLmdldFRyYWNrcygpLmxlbmd0aCwgMik7CiAgICAg ICAgICAgICAgICAgICAgIH0sICIgdHJhY2sgIiArIGNvdW50ICsgIiwgd2FpdCA9ICIgKyB3YWl0 Rm9yU2Vjb25kVHJhY2spOwogICAgICAgICAgICAgICAgICAgICBpZiAoY291bnQrKyA9PT0gKHdh aXRGb3JTZWNvbmRUcmFjayA/IDEgOiAwKSkKICAgICAgICAgICAgICAgICAgICAgICAgIHJlc29s dmUodHJhY2tFdmVudC5zdHJlYW1zWzBdKTsK