219928 2020-12-15 16:45:51 -0800 [Mac] Numerous webgl tests continue to time out with the WebM format reader enabled 2020-12-15 18:03:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes eric.carlson ews-watchlist glenn jbedard jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1714969 0 aestes 2020-12-15 16:45:51 -0800 `[Mac] Numerous webgl tests continue to time out with the WebM format reader enabled 1714973 1 416304 aestes 2020-12-15 16:55:47 -0800 Created attachment 416304 Patch 1714976 2 416304 eric.carlson 2020-12-15 17:10:11 -0800 Comment on attachment 416304 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416304&action=review > Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.cpp:115 > + ASSERT(!isMainThread()); Is this necessary? 1714977 3 aestes 2020-12-15 17:10:50 -0800 (In reply to Eric Carlson from comment #2) > Comment on attachment 416304 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=416304&action=review > > > Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.cpp:115 > > + ASSERT(!isMainThread()); > > Is this necessary? Good call; it's not. I'll remove it. 1714978 4 416305 aestes 2020-12-15 17:13:39 -0800 Created attachment 416305 Patch 1714982 5 ews-feeder 2020-12-15 18:02:29 -0800 Committed r270876: <https://trac.webkit.org/changeset/270876> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416305. 1714983 6 webkit-bug-importer 2020-12-15 18:03:21 -0800 <rdar://problem/72366134> 416304 2020-12-15 16:55:47 -0800 2020-12-15 17:13:29 -0800 Patch bug-219928-20201215165543.patch text/plain 6745 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkMTM2N2U5NjVlNDM1NDBi YjI1YTk4NTA5ZmQ1ZTBiYzhjYTgxMmIuLjc0MGJhYTI2Y2MwYTY4OTIxZWQwMWU0OGI0OGNlY2Rh YzhkZGUyZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMTItMTUgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIGBbTWFjXSBOdW1lcm91cyB3ZWJnbCB0 ZXN0cyBjb250aW51ZSB0byB0aW1lIG91dCB3aXRoIHRoZSBXZWJNIGZvcm1hdCByZWFkZXIgZW5h YmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5 OTI4CisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFNo YXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvVHJhY2tSZWFkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpNZWRpYVNhbXBsZUJ5dGVSYW5nZTo6TWVkaWFTYW1wbGVCeXRlUmFuZ2UpOgorICAgICAg ICAoV2ViS2l0OjpNZWRpYVNhbXBsZUJ5dGVSYW5nZTo6dHJhY2tJRCBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6OlRyYWNrUmVhZGVyOjphZGRTYW1wbGUpOiBTdG9yZSBNZWRpYVNhbXBsZUJ5dGVS YW5nZSdzIHRyYWNrIElEIGFzIGEgdWludDY0X3QKKyAgICAgICAgaW5zdGVhZCBvZiBhbiBBdG9t U3RyaW5nIHRoYXQgbWlnaHQndmUgYmVlbiBjcmVhdGVkIG9uIGFub3RoZXIgdGhyZWFkLgorCisg ICAgICAgIChXZWJLaXQ6OlRyYWNrUmVhZGVyOjpmaW5hbGl6ZSk6IEVuc3VyZSB0aGF0IG1fc2Ft cGxlU3RvcmFnZSByZWFsbHkgaXMgZGVzdHJveWVkIG9uIHRoZQorICAgICAgICBzdG9yYWdlIHF1 ZXVlIGJ5IGV4cGxpY2l0bHkgc2V0dGluZ3MgaXRzIHVuaXF1ZV9wdHIgdG8gbnVsbHB0ciBpbiB0 aGUgbGFtYmRhLiBXaXRob3V0CisgICAgICAgIGRvaW5nIHRoaXMsIGl0J3MgcG9zc2libGUgdGhh dCB0aGUgbGFtYmRhIHdpbGwgZXhlY3V0ZSBvbiB0aGUgc3RvcmFnZSBxdWV1ZSAqYmVmb3JlKgor ICAgICAgICBXb3JrUXVldWU6OmRpc3BhdGNoIHJldHVybnMsIGFuZCBzaW5jZSBXb3JrUXVldWUn cyBCbG9ja1B0ciBpcyBzdGlsbCBob2xkaW5nIGEgcmVmZXJlbmNlCisgICAgICAgIHRvIHRoZSBi bG9jayBjb250YWluaW5nIHRoZSBsYW1iZGEsIGl0IHdvdWxkIG5vdCBoYXZlIGJlZW4gZGVzdHJv eWVkIG9uIHRoZSBzdG9yYWdlIHF1ZXVlLgorCiAyMDIwLTEyLTE1ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYWxlcnRNZXNzYWdlVGV4dCByZWdyZXNz aW9uIGZyb20gaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI2OTkxOApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL1RyYWNrUmVh ZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9UcmFj a1JlYWRlci5jcHAKaW5kZXggYzUwMDQxNDE4N2U2YTI4NjZmYTI2OGJmMjE1NmNlNzMyMGJjNzNm ZS4uNzU2NDEwOTcyZmIwZjgyMzBlYWI3OTYxMDRmNWM5NzMzYzg3NzhiZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL1RyYWNrUmVhZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvVHJhY2tS ZWFkZXIuY3BwCkBAIC01MCw5ICs1MCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBj bGFzcyBNZWRpYVNhbXBsZUJ5dGVSYW5nZSBmaW5hbCA6IHB1YmxpYyBNZWRpYVNhbXBsZUFWRk9i akMgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8TWVkaWFTYW1wbGVCeXRlUmFuZ2U+IGNyZWF0 ZShNZWRpYVNhbXBsZSYgc2FtcGxlLCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYgYnl0ZVNvdXJjZSkK KyAgICBzdGF0aWMgUmVmPE1lZGlhU2FtcGxlQnl0ZVJhbmdlPiBjcmVhdGUoTWVkaWFTYW1wbGUm IHNhbXBsZSwgTVRQbHVnaW5CeXRlU291cmNlUmVmIGJ5dGVTb3VyY2UsIHVpbnQ2NF90IHRyYWNr SUQpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBNZWRpYVNhbXBsZUJ5dGVS YW5nZShzYW1wbGUsIGJ5dGVTb3VyY2UpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg TWVkaWFTYW1wbGVCeXRlUmFuZ2Uoc2FtcGxlLCBieXRlU291cmNlLCB0cmFja0lEKSk7CiAgICAg fQogCiAgICAgTWVkaWFUaW1lIHByZXNlbnRhdGlvblRpbWUoKSBjb25zdCBmaW5hbCB7IHJldHVy biBtX3ByZXNlbnRhdGlvblRpbWU7IH0KQEAgLTYzLDEyICs2MywxMyBAQCBwdWJsaWM6CiAgICAg U2FtcGxlRmxhZ3MgZmxhZ3MoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2ZsYWdzOyB9CiAgICAg T3B0aW9uYWw8Qnl0ZVJhbmdlPiBieXRlUmFuZ2UoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2J5 dGVSYW5nZTsgfQogCisgICAgQXRvbVN0cmluZyB0cmFja0lEKCkgY29uc3QgZmluYWw7CiAgICAg UGxhdGZvcm1TYW1wbGUgcGxhdGZvcm1TYW1wbGUoKSBmaW5hbDsKICAgICB2b2lkIG9mZnNldFRp bWVzdGFtcHNCeShjb25zdCBNZWRpYVRpbWUmKSBmaW5hbDsKICAgICB2b2lkIHNldFRpbWVzdGFt cHMoY29uc3QgTWVkaWFUaW1lJiwgY29uc3QgTWVkaWFUaW1lJikgZmluYWw7CiAKIHByaXZhdGU6 Ci0gICAgTWVkaWFTYW1wbGVCeXRlUmFuZ2UoTWVkaWFTYW1wbGUmLCBNVFBsdWdpbkJ5dGVTb3Vy Y2VSZWYpOworICAgIE1lZGlhU2FtcGxlQnl0ZVJhbmdlKE1lZGlhU2FtcGxlJiwgTVRQbHVnaW5C eXRlU291cmNlUmVmLCB1aW50NjRfdCB0cmFja0lEKTsKIAogICAgIE1lZGlhVGltZSBtX3ByZXNl bnRhdGlvblRpbWU7CiAgICAgTWVkaWFUaW1lIG1fZGVjb2RlVGltZTsKQEAgLTc2LDE5ICs3Nywy MSBAQCBwcml2YXRlOgogICAgIHNpemVfdCBtX3NpemVJbkJ5dGVzOwogICAgIEZsb2F0U2l6ZSBt X3ByZXNlbnRhdGlvblNpemU7CiAgICAgU2FtcGxlRmxhZ3MgbV9mbGFnczsKKyAgICB1aW50NjRf dCBtX3RyYWNrSUQ7CiAgICAgT3B0aW9uYWw8Qnl0ZVJhbmdlPiBtX2J5dGVSYW5nZTsKICAgICBS ZXRhaW5QdHI8TVRQbHVnaW5CeXRlU291cmNlUmVmPiBtX2J5dGVTb3VyY2U7CiAgICAgUmV0YWlu UHRyPENNRm9ybWF0RGVzY3JpcHRpb25SZWY+IG1fZm9ybWF0RGVzY3JpcHRpb247CiB9OwogCi1N ZWRpYVNhbXBsZUJ5dGVSYW5nZTo6TWVkaWFTYW1wbGVCeXRlUmFuZ2UoTWVkaWFTYW1wbGUmIHNh bXBsZSwgTVRQbHVnaW5CeXRlU291cmNlUmVmIGJ5dGVTb3VyY2UpCi0gICAgOiBNZWRpYVNhbXBs ZUFWRk9iakMobnVsbHB0ciwgc2FtcGxlLnRyYWNrSUQoKSkKK01lZGlhU2FtcGxlQnl0ZVJhbmdl OjpNZWRpYVNhbXBsZUJ5dGVSYW5nZShNZWRpYVNhbXBsZSYgc2FtcGxlLCBNVFBsdWdpbkJ5dGVT b3VyY2VSZWYgYnl0ZVNvdXJjZSwgdWludDY0X3QgdHJhY2tJRCkKKyAgICA6IE1lZGlhU2FtcGxl QVZGT2JqQyhudWxscHRyKQogICAgICwgbV9wcmVzZW50YXRpb25UaW1lKHNhbXBsZS5wcmVzZW50 YXRpb25UaW1lKCkpCiAgICAgLCBtX2RlY29kZVRpbWUoc2FtcGxlLmRlY29kZVRpbWUoKSkKICAg ICAsIG1fZHVyYXRpb24oc2FtcGxlLmR1cmF0aW9uKCkpCiAgICAgLCBtX3NpemVJbkJ5dGVzKHNh bXBsZS5zaXplSW5CeXRlcygpKQogICAgICwgbV9wcmVzZW50YXRpb25TaXplKHNhbXBsZS5wcmVz ZW50YXRpb25TaXplKCkpCiAgICAgLCBtX2ZsYWdzKHNhbXBsZS5mbGFncygpKQorICAgICwgbV90 cmFja0lEKHRyYWNrSUQpCiAgICAgLCBtX2J5dGVSYW5nZShzYW1wbGUuYnl0ZVJhbmdlKCkpCiAg ICAgLCBtX2J5dGVTb3VyY2UoYnl0ZVNvdXJjZSkKIHsKQEAgLTEwNyw2ICsxMTAsMTIgQEAgTWVk aWFTYW1wbGVCeXRlUmFuZ2U6Ok1lZGlhU2FtcGxlQnl0ZVJhbmdlKE1lZGlhU2FtcGxlJiBzYW1w bGUsIE1UUGx1Z2luQnl0ZVNvdXIKICAgICB9CiB9CiAKK0F0b21TdHJpbmcgTWVkaWFTYW1wbGVC eXRlUmFuZ2U6OnRyYWNrSUQoKSBjb25zdAoreworICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkp OworICAgIHJldHVybiBBdG9tU3RyaW5nOjpudW1iZXIobV90cmFja0lEKTsKK30KKwogUGxhdGZv cm1TYW1wbGUgTWVkaWFTYW1wbGVCeXRlUmFuZ2U6OnBsYXRmb3JtU2FtcGxlKCkKIHsKICAgICBy ZXR1cm4gewpAQCAtMTgwLDcgKzE4OSw3IEBAIHZvaWQgVHJhY2tSZWFkZXI6OmFkZFNhbXBsZShS ZWY8TWVkaWFTYW1wbGU+JiYgc2FtcGxlLCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYgYnl0CiAgICAg ICAgIG1fc2FtcGxlU3RvcmFnZSA9IG1ha2VVbmlxdWU8U2FtcGxlU3RvcmFnZT4oKTsKIAogICAg IEFTU0VSVCghc2FtcGxlLT5pc0RpdmlzYWJsZSgpICYmIHNhbXBsZS0+Ynl0ZVJhbmdlKCkpOwot ICAgIGF1dG8gc2FtcGxlVG9BZGQgPSBNZWRpYVNhbXBsZUJ5dGVSYW5nZTo6Y3JlYXRlKHNhbXBs ZS5nZXQoKSwgYnl0ZVNvdXJjZSk7CisgICAgYXV0byBzYW1wbGVUb0FkZCA9IE1lZGlhU2FtcGxl Qnl0ZVJhbmdlOjpjcmVhdGUoc2FtcGxlLmdldCgpLCBieXRlU291cmNlLCBtX3RyYWNrSUQpOwog CiAgICAgLy8gRklYTUU6IEV2ZW4gdGhvdWdoIFdlYk0gbXV4ZXIgZ3VpZGVsaW5lcyBzYXkgdGhp cyBtdXN0IG5vdCBoYXBwZW4sIHNvbWUgdmlkZW8gdHJhY2tzIGhhdmUgdHdvCiAgICAgLy8gY29u c2VjdXRpdmUgZnJhbWVzIHdpdGggdGhlIHNhbWUgcHJlc2VudGF0aW9uIHRpbWUuIFNhbXBsZU1h cCB3aWxsIG5vdCBzdG9yZSB0aGUgc2Vjb25kIGZyYW1lCkBAIC0yNDgsNyArMjU3LDkgQEAgT1NT dGF0dXMgVHJhY2tSZWFkZXI6OmNvcHlQcm9wZXJ0eShDRlN0cmluZ1JlZiBrZXksIENGQWxsb2Nh dG9yUmVmIGFsbG9jYXRvciwgdm8KIHZvaWQgVHJhY2tSZWFkZXI6OmZpbmFsaXplKCkKIHsKICAg ICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fc2FtcGxlU3RvcmFnZUxvY2spOwotICAgIHN0b3Jh Z2VRdWV1ZSgpLmRpc3BhdGNoKFtzYW1wbGVTdG9yYWdlID0gc3RkOjpleGNoYW5nZShtX3NhbXBs ZVN0b3JhZ2UsIG51bGxwdHIpXSB7IH0pOworICAgIHN0b3JhZ2VRdWV1ZSgpLmRpc3BhdGNoKFtz YW1wbGVTdG9yYWdlID0gc3RkOjpleGNoYW5nZShtX3NhbXBsZVN0b3JhZ2UsIG51bGxwdHIpXSgp IG11dGFibGUgeworICAgICAgICBzYW1wbGVTdG9yYWdlID0gbnVsbHB0cjsKKyAgICB9KTsKICAg ICBDb3JlTWVkaWFXcmFwcGVkPFRyYWNrUmVhZGVyPjo6ZmluYWxpemUoKTsKIH0KIApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZkZjU5ZWUwYjc3 NjNlZGFmMGM1NmZlNTAxMzRlNmEwNmVjZmFhYjkuLmZmYTQyYmU5MjE0MGY4OWU5MDFjZTAxMTg1 OTRkYTZjMTU3NWU1ZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0xMi0xNSAgQW5keSBFc3RlcyAgPGFlc3Rl c0BhcHBsZS5jb20+CisKKyAgICAgICAgYFtNYWNdIE51bWVyb3VzIHdlYmdsIHRlc3RzIGNvbnRp bnVlIHRvIHRpbWUgb3V0IHdpdGggdGhlIFdlYk0gZm9ybWF0IHJlYWRlciBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk5MjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAgIChNYWNQb3J0LmxvZ2dpbmdfcGF0dGVybnNfdG9f c3RyaXApOiBTdHJpcHBlZCB1bm5lY2Vzc2FyeSBsb2dnaW5nIGZyb20gVmlkZW9Ub29sYm94Lgor CiAyMDIwLTEyLTE1ICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEuY29t PgogCiAgICAgICAgIGdlbmVyYXRlLWJ1bmRsZTogZG9uJ3QgaWdub3JlIC0tbm8tc3RyaXAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CmluZGV4IGM3ODAyZGU2Mjc5YzE1Yjk5YmFkNTg0YTBl MzlmMDkzZGRiMGE2ZWMuLmI3OGJjMTIwNzEzYzQ2YjkyZjQ1MzFjMWU2ZjMwMjcwNmU0NzExOTkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQpAQCAtMjk1LDYgKzI5NSw5IEBAIGNsYXNz IE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgICMgRklYTUU6IFJlbW92ZSB0aGlzIGFmdGVy IDxyZGFyOi8vcHJvYmxlbS81Mjg5NzQwNj4gaXMgZml4ZWQuCiAgICAgICAgIGxvZ2dpbmdfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdWUEEgaW5mbzouKlxuJyksICcnKSkKIAorICAgICAg ICAjIEZJWE1FOiBGaW5kIHdoZXJlIHRoaXMgaXMgY29taW5nIGZyb20gYW5kIGZpbGUgYSBidWcg dG8gaGF2ZSBpdCByZW1vdmVkICh0aGVuIHJlbW92ZSB0aGlzIGxpbmUpLgorICAgICAgICBsb2dn aW5nX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnVlA5IEluZm86LipcbicpLCAnJykpCisK ICAgICAgICAgcmV0dXJuIGxvZ2dpbmdfcGF0dGVybnMKIAogICAgIGRlZiBzdGRlcnJfcGF0dGVy bnNfdG9fc3RyaXAoc2VsZik6Cg== 416305 2020-12-15 17:13:39 -0800 2020-12-15 18:02:30 -0800 Patch bug-219928-20201215171335.patch text/plain 6750 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkMTM2N2U5NjVlNDM1NDBi YjI1YTk4NTA5ZmQ1ZTBiYzhjYTgxMmIuLmJlZGQ5NDUxMzI3YjRhZjUyMWIwODhjMjI0YzZkZjIy MmI0MmM2ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMTItMTUgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIE51bWVyb3VzIHdlYmdsIHRl c3RzIGNvbnRpbnVlIHRvIHRpbWUgb3V0IHdpdGggdGhlIFdlYk0gZm9ybWF0IHJlYWRlciBlbmFi bGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk5 MjgKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgQ292ZXJl ZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFNoYXJlZC9tYWMvTWVkaWFGb3JtYXRS ZWFkZXIvVHJhY2tSZWFkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVNhbXBsZUJ5dGVS YW5nZTo6TWVkaWFTYW1wbGVCeXRlUmFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVNhbXBs ZUJ5dGVSYW5nZTo6dHJhY2tJRCBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlRyYWNrUmVhZGVy OjphZGRTYW1wbGUpOiBTdG9yZSBNZWRpYVNhbXBsZUJ5dGVSYW5nZSdzIHRyYWNrIElEIGFzIGEg dWludDY0X3QKKyAgICAgICAgaW5zdGVhZCBvZiBhbiBBdG9tU3RyaW5nIHRoYXQgbWlnaHQndmUg YmVlbiBjcmVhdGVkIG9uIGFub3RoZXIgdGhyZWFkLgorCisgICAgICAgIChXZWJLaXQ6OlRyYWNr UmVhZGVyOjpmaW5hbGl6ZSk6IEVuc3VyZSB0aGF0IG1fc2FtcGxlU3RvcmFnZSByZWFsbHkgaXMg ZGVzdHJveWVkIG9uIHRoZQorICAgICAgICBzdG9yYWdlIHF1ZXVlIGJ5IGV4cGxpY2l0bHkgc2V0 dGluZ3MgaXRzIHVuaXF1ZV9wdHIgdG8gbnVsbHB0ciBpbiB0aGUgbGFtYmRhLiBXaXRob3V0Cisg ICAgICAgIGRvaW5nIHRoaXMsIGl0J3MgcG9zc2libGUgdGhhdCB0aGUgbGFtYmRhIHdpbGwgZXhl Y3V0ZSBvbiB0aGUgc3RvcmFnZSBxdWV1ZSAqYmVmb3JlKgorICAgICAgICBXb3JrUXVldWU6OmRp c3BhdGNoIHJldHVybnMsIGFuZCBzaW5jZSBXb3JrUXVldWUncyBCbG9ja1B0ciBpcyBzdGlsbCBo b2xkaW5nIGEgcmVmZXJlbmNlCisgICAgICAgIHRvIHRoZSBibG9jayBjb250YWluaW5nIHRoZSBs YW1iZGEsIGl0IHdvdWxkIG5vdCBoYXZlIGJlZW4gZGVzdHJveWVkIG9uIHRoZSBzdG9yYWdlIHF1 ZXVlLgorCiAyMDIwLTEyLTE1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBGaXggYWxlcnRNZXNzYWdlVGV4dCByZWdyZXNzaW9uIGZyb20gaHR0cHM6Ly90cmFj LndlYmtpdC5vcmcvY2hhbmdlc2V0LzI2OTkxOApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T aGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL1RyYWNrUmVhZGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9UcmFja1JlYWRlci5jcHAKaW5kZXggYzUw MDQxNDE4N2U2YTI4NjZmYTI2OGJmMjE1NmNlNzMyMGJjNzNmZS4uNDg2NWE4MDg5NTNkYmYyNTcw OGJlNDFhNDBiOGNmMjQyZTdiZmQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv bWFjL01lZGlhRm9ybWF0UmVhZGVyL1RyYWNrUmVhZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvVHJhY2tSZWFkZXIuY3BwCkBAIC01MCw5ICs1 MCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBjbGFzcyBNZWRpYVNhbXBsZUJ5dGVS YW5nZSBmaW5hbCA6IHB1YmxpYyBNZWRpYVNhbXBsZUFWRk9iakMgewogcHVibGljOgotICAgIHN0 YXRpYyBSZWY8TWVkaWFTYW1wbGVCeXRlUmFuZ2U+IGNyZWF0ZShNZWRpYVNhbXBsZSYgc2FtcGxl LCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYgYnl0ZVNvdXJjZSkKKyAgICBzdGF0aWMgUmVmPE1lZGlh U2FtcGxlQnl0ZVJhbmdlPiBjcmVhdGUoTWVkaWFTYW1wbGUmIHNhbXBsZSwgTVRQbHVnaW5CeXRl U291cmNlUmVmIGJ5dGVTb3VyY2UsIHVpbnQ2NF90IHRyYWNrSUQpCiAgICAgewotICAgICAgICBy ZXR1cm4gYWRvcHRSZWYoKm5ldyBNZWRpYVNhbXBsZUJ5dGVSYW5nZShzYW1wbGUsIGJ5dGVTb3Vy Y2UpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTWVkaWFTYW1wbGVCeXRlUmFuZ2Uo c2FtcGxlLCBieXRlU291cmNlLCB0cmFja0lEKSk7CiAgICAgfQogCiAgICAgTWVkaWFUaW1lIHBy ZXNlbnRhdGlvblRpbWUoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3ByZXNlbnRhdGlvblRpbWU7 IH0KQEAgLTYzLDEyICs2MywxMyBAQCBwdWJsaWM6CiAgICAgU2FtcGxlRmxhZ3MgZmxhZ3MoKSBj b25zdCBmaW5hbCB7IHJldHVybiBtX2ZsYWdzOyB9CiAgICAgT3B0aW9uYWw8Qnl0ZVJhbmdlPiBi eXRlUmFuZ2UoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2J5dGVSYW5nZTsgfQogCisgICAgQXRv bVN0cmluZyB0cmFja0lEKCkgY29uc3QgZmluYWw7CiAgICAgUGxhdGZvcm1TYW1wbGUgcGxhdGZv cm1TYW1wbGUoKSBmaW5hbDsKICAgICB2b2lkIG9mZnNldFRpbWVzdGFtcHNCeShjb25zdCBNZWRp YVRpbWUmKSBmaW5hbDsKICAgICB2b2lkIHNldFRpbWVzdGFtcHMoY29uc3QgTWVkaWFUaW1lJiwg Y29uc3QgTWVkaWFUaW1lJikgZmluYWw7CiAKIHByaXZhdGU6Ci0gICAgTWVkaWFTYW1wbGVCeXRl UmFuZ2UoTWVkaWFTYW1wbGUmLCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYpOworICAgIE1lZGlhU2Ft cGxlQnl0ZVJhbmdlKE1lZGlhU2FtcGxlJiwgTVRQbHVnaW5CeXRlU291cmNlUmVmLCB1aW50NjRf dCB0cmFja0lEKTsKIAogICAgIE1lZGlhVGltZSBtX3ByZXNlbnRhdGlvblRpbWU7CiAgICAgTWVk aWFUaW1lIG1fZGVjb2RlVGltZTsKQEAgLTc2LDE5ICs3NywyMSBAQCBwcml2YXRlOgogICAgIHNp emVfdCBtX3NpemVJbkJ5dGVzOwogICAgIEZsb2F0U2l6ZSBtX3ByZXNlbnRhdGlvblNpemU7CiAg ICAgU2FtcGxlRmxhZ3MgbV9mbGFnczsKKyAgICB1aW50NjRfdCBtX3RyYWNrSUQ7CiAgICAgT3B0 aW9uYWw8Qnl0ZVJhbmdlPiBtX2J5dGVSYW5nZTsKICAgICBSZXRhaW5QdHI8TVRQbHVnaW5CeXRl U291cmNlUmVmPiBtX2J5dGVTb3VyY2U7CiAgICAgUmV0YWluUHRyPENNRm9ybWF0RGVzY3JpcHRp b25SZWY+IG1fZm9ybWF0RGVzY3JpcHRpb247CiB9OwogCi1NZWRpYVNhbXBsZUJ5dGVSYW5nZTo6 TWVkaWFTYW1wbGVCeXRlUmFuZ2UoTWVkaWFTYW1wbGUmIHNhbXBsZSwgTVRQbHVnaW5CeXRlU291 cmNlUmVmIGJ5dGVTb3VyY2UpCi0gICAgOiBNZWRpYVNhbXBsZUFWRk9iakMobnVsbHB0ciwgc2Ft cGxlLnRyYWNrSUQoKSkKK01lZGlhU2FtcGxlQnl0ZVJhbmdlOjpNZWRpYVNhbXBsZUJ5dGVSYW5n ZShNZWRpYVNhbXBsZSYgc2FtcGxlLCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYgYnl0ZVNvdXJjZSwg dWludDY0X3QgdHJhY2tJRCkKKyAgICA6IE1lZGlhU2FtcGxlQVZGT2JqQyhudWxscHRyKQogICAg ICwgbV9wcmVzZW50YXRpb25UaW1lKHNhbXBsZS5wcmVzZW50YXRpb25UaW1lKCkpCiAgICAgLCBt X2RlY29kZVRpbWUoc2FtcGxlLmRlY29kZVRpbWUoKSkKICAgICAsIG1fZHVyYXRpb24oc2FtcGxl LmR1cmF0aW9uKCkpCiAgICAgLCBtX3NpemVJbkJ5dGVzKHNhbXBsZS5zaXplSW5CeXRlcygpKQog ICAgICwgbV9wcmVzZW50YXRpb25TaXplKHNhbXBsZS5wcmVzZW50YXRpb25TaXplKCkpCiAgICAg LCBtX2ZsYWdzKHNhbXBsZS5mbGFncygpKQorICAgICwgbV90cmFja0lEKHRyYWNrSUQpCiAgICAg LCBtX2J5dGVSYW5nZShzYW1wbGUuYnl0ZVJhbmdlKCkpCiAgICAgLCBtX2J5dGVTb3VyY2UoYnl0 ZVNvdXJjZSkKIHsKQEAgLTEwNyw2ICsxMTAsMTEgQEAgTWVkaWFTYW1wbGVCeXRlUmFuZ2U6Ok1l ZGlhU2FtcGxlQnl0ZVJhbmdlKE1lZGlhU2FtcGxlJiBzYW1wbGUsIE1UUGx1Z2luQnl0ZVNvdXIK ICAgICB9CiB9CiAKK0F0b21TdHJpbmcgTWVkaWFTYW1wbGVCeXRlUmFuZ2U6OnRyYWNrSUQoKSBj b25zdAoreworICAgIHJldHVybiBBdG9tU3RyaW5nOjpudW1iZXIobV90cmFja0lEKTsKK30KKwog UGxhdGZvcm1TYW1wbGUgTWVkaWFTYW1wbGVCeXRlUmFuZ2U6OnBsYXRmb3JtU2FtcGxlKCkKIHsK ICAgICByZXR1cm4gewpAQCAtMTgwLDcgKzE4OCw3IEBAIHZvaWQgVHJhY2tSZWFkZXI6OmFkZFNh bXBsZShSZWY8TWVkaWFTYW1wbGU+JiYgc2FtcGxlLCBNVFBsdWdpbkJ5dGVTb3VyY2VSZWYgYnl0 CiAgICAgICAgIG1fc2FtcGxlU3RvcmFnZSA9IG1ha2VVbmlxdWU8U2FtcGxlU3RvcmFnZT4oKTsK IAogICAgIEFTU0VSVCghc2FtcGxlLT5pc0RpdmlzYWJsZSgpICYmIHNhbXBsZS0+Ynl0ZVJhbmdl KCkpOwotICAgIGF1dG8gc2FtcGxlVG9BZGQgPSBNZWRpYVNhbXBsZUJ5dGVSYW5nZTo6Y3JlYXRl KHNhbXBsZS5nZXQoKSwgYnl0ZVNvdXJjZSk7CisgICAgYXV0byBzYW1wbGVUb0FkZCA9IE1lZGlh U2FtcGxlQnl0ZVJhbmdlOjpjcmVhdGUoc2FtcGxlLmdldCgpLCBieXRlU291cmNlLCBtX3RyYWNr SUQpOwogCiAgICAgLy8gRklYTUU6IEV2ZW4gdGhvdWdoIFdlYk0gbXV4ZXIgZ3VpZGVsaW5lcyBz YXkgdGhpcyBtdXN0IG5vdCBoYXBwZW4sIHNvbWUgdmlkZW8gdHJhY2tzIGhhdmUgdHdvCiAgICAg Ly8gY29uc2VjdXRpdmUgZnJhbWVzIHdpdGggdGhlIHNhbWUgcHJlc2VudGF0aW9uIHRpbWUuIFNh bXBsZU1hcCB3aWxsIG5vdCBzdG9yZSB0aGUgc2Vjb25kIGZyYW1lCkBAIC0yNDgsNyArMjU2LDkg QEAgT1NTdGF0dXMgVHJhY2tSZWFkZXI6OmNvcHlQcm9wZXJ0eShDRlN0cmluZ1JlZiBrZXksIENG QWxsb2NhdG9yUmVmIGFsbG9jYXRvciwgdm8KIHZvaWQgVHJhY2tSZWFkZXI6OmZpbmFsaXplKCkK IHsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fc2FtcGxlU3RvcmFnZUxvY2spOwotICAg IHN0b3JhZ2VRdWV1ZSgpLmRpc3BhdGNoKFtzYW1wbGVTdG9yYWdlID0gc3RkOjpleGNoYW5nZSht X3NhbXBsZVN0b3JhZ2UsIG51bGxwdHIpXSB7IH0pOworICAgIHN0b3JhZ2VRdWV1ZSgpLmRpc3Bh dGNoKFtzYW1wbGVTdG9yYWdlID0gc3RkOjpleGNoYW5nZShtX3NhbXBsZVN0b3JhZ2UsIG51bGxw dHIpXSgpIG11dGFibGUgeworICAgICAgICBzYW1wbGVTdG9yYWdlID0gbnVsbHB0cjsKKyAgICB9 KTsKICAgICBDb3JlTWVkaWFXcmFwcGVkPFRyYWNrUmVhZGVyPjo6ZmluYWxpemUoKTsKIH0KIApk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZkZjU5 ZWUwYjc3NjNlZGFmMGM1NmZlNTAxMzRlNmEwNmVjZmFhYjkuLjlmYjFlYWM5NjkwNDA1NjA1OTVl ZjE0M2ZiYzE3YmFlOTI2NzUxZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0xMi0xNSAgQW5keSBFc3RlcyAg PGFlc3Rlc0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gTnVtZXJvdXMgd2ViZ2wgdGVzdHMg Y29udGludWUgdG8gdGltZSBvdXQgd2l0aCB0aGUgV2ViTSBmb3JtYXQgcmVhZGVyIGVuYWJsZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTkyOAor CisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAgICAgIChNYWNQb3J0LmxvZ2dpbmdfcGF0dGVybnNf dG9fc3RyaXApOiBTdHJpcHBlZCB1bm5lY2Vzc2FyeSBsb2dnaW5nIGR1cmluZyBWUDkgZGVjb2Rp bmcuCisKIDIwMjAtMTItMTUgIEFuZ2Vsb3MgT2lrb25vbW9wb3Vsb3MgIDxhbmdlbG9zQGlnYWxp YS5jb20+CiAKICAgICAgICAgZ2VuZXJhdGUtYnVuZGxlOiBkb24ndCBpZ25vcmUgLS1uby1zdHJp cApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKaW5kZXggYzc4MDJkZTYyNzljMTViOTliYWQ1 ODRhMGUzOWYwOTNkZGIwYTZlYy4uYjc4YmMxMjA3MTNjNDZiOTJmNDUzMWMxZTZmMzAyNzA2ZTQ3 MTE5OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CkBAIC0yOTUsNiArMjk1LDkgQEAg Y2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMg YWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzUyODk3NDA2PiBpcyBmaXhlZC4KICAgICAgICAgbG9nZ2lu Z19wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1ZQQSBpbmZvOi4qXG4nKSwgJycpKQogCisg ICAgICAgICMgRklYTUU6IEZpbmQgd2hlcmUgdGhpcyBpcyBjb21pbmcgZnJvbSBhbmQgZmlsZSBh IGJ1ZyB0byBoYXZlIGl0IHJlbW92ZWQgKHRoZW4gcmVtb3ZlIHRoaXMgbGluZSkuCisgICAgICAg IGxvZ2dpbmdfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdWUDkgSW5mbzouKlxuJyksICcn KSkKKwogICAgICAgICByZXR1cm4gbG9nZ2luZ19wYXR0ZXJucwogCiAgICAgZGVmIHN0ZGVycl9w YXR0ZXJuc190b19zdHJpcChzZWxmKToK