220046 2020-12-20 14:00:17 -0800 media-source-webm.html: Handle frame size in HAVE_METADATA 2021-01-05 16:33:44 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aboya aboya calvaris eric.carlson ews-watchlist glenn jer.noble peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1715957 0 aboya 2020-12-20 14:00:17 -0800 The current version of media-source-webm.html assumes that a `resize` event happens after the first media segment is appended. This is not necessarily true. In fact, an initialization segment should cause a transition to HAVE_METADATA, and that per spec implies the size of the video is known. In practice, some implementations don't report this until a media segment has arrived. Because of the way the current code is written, an implementation emitting `resize` on HAVE_METADATA would timeout the test. This patch fixes that, accomodating both cases. 1715960 1 416588 aboya 2020-12-20 14:20:11 -0800 Created attachment 416588 Patch 1715993 2 ews-feeder 2020-12-21 04:15:45 -0800 Committed r271020: <https://trac.webkit.org/changeset/271020> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416588. 1715994 3 webkit-bug-importer 2020-12-21 04:16:25 -0800 <rdar://problem/72547169> 1716429 4 peng.liu6 2020-12-22 20:57:11 -0800 With this patch, the test starts to fail on Big Sur. :-( 1716447 5 aboya 2020-12-23 04:31:43 -0800 (In reply to Peng Liu from comment #4) > With this patch, the test starts to fail on Big Sur. :-( How does it fail? If it's a change in the order of the lines in the output similar to the one included in the attached patch for the GStreamer ports, that is perfectly fine, just needs a rebaseline. Otherwise, it may have exposed some other bug. I remember seeing before accomodations in tests for a slight bug where a resize event with 0x0 dimensions was emitted, before another one with the actual dimensions was emitted. 1716459 6 peng.liu6 2020-12-23 09:22:33 -0800 Yes, it's a change in the order of lines. I have to revert the change in media-source-webm-expected.txt to fix the failure. Sounds like both orders are correct? I think it is a good idea to revise the test to support both of them. 1716481 7 416719 peng.liu6 2020-12-23 11:13:04 -0800 Created attachment 416719 Follow-up patch to fix a failure on Big Sur 1716491 8 aboya 2020-12-23 11:47:27 -0800 (In reply to Peng Liu from comment #6) > Sounds like both orders are correct? I think it is a good idea to revise the > test to support both of them. Both orders are in practice acceptable, although the resize happening after the initialization segment without having to wait for the media segment is more correct in accordance with the spec. I personally favor a rebaseline over changing the test to keep the output the same in both cases since if your browser handles resize events at the right moment, that's a behavior that ideally you want to protect against regressions. 1716492 9 peng.liu6 2020-12-23 11:56:12 -0800 (In reply to Alicia Boya García from comment #8) > > Both orders are in practice acceptable, although the resize happening after > the initialization segment without having to wait for the media segment is > more correct in accordance with the spec. > > I personally favor a rebaseline over changing the test to keep the output > the same in both cases since if your browser handles resize events at the > right moment, that's a behavior that ideally you want to protect against > regressions. Hmm, you mean using a different media-source-webm-expected.txt for Big Sur? 1716597 10 aboya 2020-12-25 14:32:01 -0800 (In reply to Peng Liu from comment #9) > Hmm, you mean using a different media-source-webm-expected.txt for Big Sur? Yes. 1717490 11 peng.liu6 2021-01-05 14:40:08 -0800 (In reply to Alicia Boya García from comment #10) > (In reply to Peng Liu from comment #9) > > Hmm, you mean using a different media-source-webm-expected.txt for Big Sur? > > Yes. I had a discussion with Jer about that. While it makes sense to fire the "resize" event before the "update" event for the *first* initialization segment, the order is not important for Apple's ports. To avoid the possible test flakiness due to the WebM parser implementation, we would suggest ignoring the event order in this test. Is the order important for GTK and WPE ports? If yes, maybe we need to add one test for it? 1717497 12 aboya 2021-01-05 14:46:47 -0800 (In reply to Peng Liu from comment #11) > (In reply to Alicia Boya García from comment #10) > > (In reply to Peng Liu from comment #9) > > > Hmm, you mean using a different media-source-webm-expected.txt for Big Sur? > > > > Yes. > > I had a discussion with Jer about that. While it makes sense to fire the > "resize" event before the "update" event for the *first* initialization > segment, the order is not important for Apple's ports. To avoid the possible > test flakiness due to the WebM parser implementation, we would suggest > ignoring the event order in this test. > > Is the order important for GTK and WPE ports? If yes, maybe we need to add > one test for it? If it's necessary to avoid flakiness in a particular implementation, doing it in a "order doesn't matter" way it's okay. Certainly a separate test could be made for checking the availability of dimensions on HAVE_METADATA and mark that one as flaky or skip in the implementations that don't support that. 1717535 13 ews-feeder 2021-01-05 16:33:42 -0800 Committed r271181: <https://trac.webkit.org/changeset/271181> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416719. 416588 2020-12-20 14:20:11 -0800 2020-12-21 04:15:45 -0800 Patch bug-220046-20201220232010.patch text/plain 4887 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDE0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmY3NThkZjA1ZDI2MzAxNTBlYjA1 YmQwMGE1MDRkYTc1NjFhMTNlNi4uYTYyNmY0YTQ0ZDU3NmY5NGUyMTI2NDU0ZjkxMWY1NjRkN2U1 NmUxMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTEyLTIwICBBbGljaWEgQm95YSBHYXJj w61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBtZWRpYS1zb3VyY2Utd2VibS5odG1s OiBIYW5kbGUgZnJhbWUgc2l6ZSBpbiBIQVZFX01FVEFEQVRBCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAwNDYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCB2ZXJzaW9uIG9mIG1lZGlh LXNvdXJjZS13ZWJtLmh0bWwgYXNzdW1lcyB0aGF0IGEgYHJlc2l6ZWAKKyAgICAgICAgZXZlbnQg aGFwcGVucyBhZnRlciB0aGUgZmlyc3QgbWVkaWEgc2VnbWVudCBpcyBhcHBlbmRlZC4KKworICAg ICAgICBUaGlzIGlzIG5vdCBuZWNlc3NhcmlseSB0cnVlLiBJbiBmYWN0LCBhbiBpbml0aWFsaXph dGlvbiBzZWdtZW50CisgICAgICAgIHNob3VsZCBjYXVzZSBhIHRyYW5zaXRpb24gdG8gSEFWRV9N RVRBREFUQSwgYW5kIHRoYXQgcGVyIHNwZWMgaW1wbGllcworICAgICAgICB0aGUgc2l6ZSBvZiB0 aGUgdmlkZW8gaXMga25vd24uCisKKyAgICAgICAgSW4gcHJhY3RpY2UsIHNvbWUgaW1wbGVtZW50 YXRpb25zIGRvbid0IHJlcG9ydCB0aGlzIHVudGlsIGEgbWVkaWEKKyAgICAgICAgc2VnbWVudCBo YXMgYXJyaXZlZC4KKworICAgICAgICBCZWNhdXNlIG9mIHRoZSB3YXkgdGhlIGN1cnJlbnQgY29k ZSBpcyB3cml0dGVuLCBhbiBpbXBsZW1lbnRhdGlvbgorICAgICAgICBlbWl0dGluZyBgcmVzaXpl YCBvbiBIQVZFX01FVEFEQVRBIHdvdWxkIHRpbWVvdXQgdGhlIHRlc3QuIFRoaXMgcGF0Y2gKKyAg ICAgICAgZml4ZXMgdGhhdCwgYWNjb21vZGF0aW5nIGJvdGggY2FzZXMuCisKKyAgICAgICAgKiBt ZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXdlYm0uaHRtbDoKKyAgICAgICAgKiBtZWRp YS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXdlYm0tZXhwZWN0ZWQudHh0OgorICAgICAgICAq IHBsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiBwbGF0Zm9ybS93cGUv VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0xMi0xOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIHdpZHRoOiBtYXgtY29udGVudCB3aXRoIGJveC1zaXppbmc6IGJv cmRlci1ib3ggc2hvdWxkIGxlYXZlIHNwYWNlIGZvciBwYWRkaW5nIChUd2l0dGVyIGRhdGUgaG92 ZXIgb3ZlcmZsb3cpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLXdlYm0tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEt c291cmNlL21lZGlhLXNvdXJjZS13ZWJtLWV4cGVjdGVkLnR4dAppbmRleCA2OWFjY2ZhYmU2NjJj ZTRkNzgxYjJmZmY5MjgyOTQ3MTdiZWI1NjBjLi5jY2YwZjEyM2MwMjI3MmUzYTA4MTI4ZjAxNTk3 M2MzODUyYzMzMTk3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLXdlYm0tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL21l ZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utd2VibS1leHBlY3RlZC50eHQKQEAgLTUsMTEgKzUsMTEg QEAgRVZFTlQoc291cmNlb3BlbikKIFJVTihzb3VyY2UuZHVyYXRpb24gPSBsb2FkZXIuZHVyYXRp b24oKSkKIFJVTihzb3VyY2VCdWZmZXIgPSBzb3VyY2UuYWRkU291cmNlQnVmZmVyKGxvYWRlci50 eXBlKCkpKQogUlVOKHNvdXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobG9hZGVyLmluaXRTZWdtZW50 KCkpKQotRVZFTlQodXBkYXRlKQotQXBwZW5kIGEgbWVkaWEgc2VnbWVudC4KLVJVTihzb3VyY2VC dWZmZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5tZWRpYVNlZ21lbnQoMCkpKQogRVZFTlQocmVzaXpl KQogRVhQRUNURUQgKHZpZGVvLnZpZGVvV2lkdGggPT0gJzMyMCcpIE9LCiBFWFBFQ1RFRCAodmlk ZW8udmlkZW9IZWlnaHQgPT0gJzI0MCcpIE9LCitFVkVOVCh1cGRhdGUpCitBcHBlbmQgYSBtZWRp YSBzZWdtZW50LgorUlVOKHNvdXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobG9hZGVyLm1lZGlhU2Vn bWVudCgwKSkpCiBFTkQgT0YgVEVTVAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9t ZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXdlYm0uaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21l ZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utd2VibS5odG1sCmluZGV4IGJkNWIyNzE3ZGY0N2ZlODYz ZmI1M2MyZjMwOGJmYjc1ZDQ0ZGIxNWQuLmU5YjU0ODBlMmJmYmUyMmQ2MTc4OWNmYTM0MmQ5ZGI3 ZmVlNGM3ODEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRp YS1zb3VyY2Utd2VibS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2Utd2VibS5odG1sCkBAIC00Myw2ICs0Myw3IEBACiAKICAgICAgICAgICAgIHJ1 bignc291cmNlLmR1cmF0aW9uID0gbG9hZGVyLmR1cmF0aW9uKCknKTsKICAgICAgICAgICAgIHJ1 bignc291cmNlQnVmZmVyID0gc291cmNlLmFkZFNvdXJjZUJ1ZmZlcihsb2FkZXIudHlwZSgpKScp OworICAgICAgICAgICAgY29uc3QgcmVzaXplZCA9IHJlc2l6ZVByb21pc2UodmlkZW8sIDMyMCwg MjQwKTsKICAgICAgICAgICAgIHJ1bignc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihsb2FkZXIu aW5pdFNlZ21lbnQoKSknKTsKIAogICAgICAgICAgICAgYXdhaXQgd2FpdEZvcihzb3VyY2VCdWZm ZXIsICd1cGRhdGUnKTsKQEAgLTUwLDcgKzUxLDcgQEAKICAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgnQXBwZW5kIGEgbWVkaWEgc2VnbWVudC4nKQogICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZm ZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5tZWRpYVNlZ21lbnQoMCkpJyk7CiAKLSAgICAgICAgICAg IGF3YWl0IHJlc2l6ZVByb21pc2UodmlkZW8sIDMyMCwgMjQwKTsKKyAgICAgICAgICAgIGF3YWl0 IHJlc2l6ZWQ7CiAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0gY2F0Y2ggKGUpIHsK ICAgICAgICAgICAgIGZhaWxUZXN0KGBDYXVnaHQgZXhjZXB0aW9uOiAiJHtlfSJgKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA2ZDhmODlkN2YxY2Ix YTMwODQzNWQwNDhjYTE5YmUyZTNmOGE4Mzk5Li5kM2MzNTIwNmQ3NWRiNjM1NmRmODJjOTdhYjc3 MGViYTAxYmRhYjBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRp b25zCkBAIC00MzQsNyArNDM0LDYgQEAgd2Via2l0Lm9yZy9iLzIxMDQ5OCB3ZWJraXQub3JnL2Iv MjEwODQwIGZhc3QvbWVkaWFzdHJlYW0vcGxheS1uZXdseS1hZGRlZC1hdWRpby0KIAogd2Via2l0 Lm9yZy9iLzIwMzA3OCBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXJlbW92ZS11bmxv YWQtY3Jhc2guaHRtbCBbIENyYXNoIFRpbWVvdXQgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjEwNTI4 IG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utc2Vlay1iYWNrLmh0bWwgWyBDcmFzaCBQ YXNzIF0KLXdlYmtpdC5vcmcvYi8yMTQ2MzYgbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJj ZS13ZWJtLmh0bWwgWyBUaW1lb3V0IENyYXNoIF0KIHdlYmtpdC5vcmcvYi8yMTgzMTcgbWVkaWEv bWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS10cmFja2lkLWNoYW5nZS5odG1sIFsgRmFpbHVyZSBd CiAKIHdlYmtpdC5vcmcvYi8yMTA1MjggbWVkaWEvdmlkZW8tc3JjLWJsb2ItcmVwbGF5Lmh0bWwg WyBDcmFzaCBQYXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dwZS9UZXN0 RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggYWM4MDU2NmJiN2IzZWFlNzFjMTZlYWVjZGI4YzZkMDkzMjAxZjQ1YS4uZTNjYzFjMTU2 ZjEwMjU1ZDc3M2Q3OGI4YTMxNzE5MWYyYmY3ZjZlNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd3BlL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d3BlL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTExNzMsNyArMTE3Myw2IEBAIEJ1ZyhXUEUpIGNzczMv em9vbS1jb29yZHMueGh0bWwgWyBGYWlsdXJlIF0KIHRyYW5zaXRpb25zL3N2Zy10ZXh0LXNoYWRv dy10cmFuc2l0aW9uLmh0bWwgWyBEdW1wSlNDb25zb2xlTG9nSW5TdGRFcnIgXQogCiB3ZWJraXQu b3JnL2IvMTY4MzczIG1lZGlhL21lZGlhLXNvdXJjZS9vbmx5LWJjcDQ3LWxhbmd1YWdlLXRhZ3Mt YWNjZXB0ZWQtYXMtdmFsaWQuaHRtbCBbIFRpbWVvdXQgXQotd2Via2l0Lm9yZy9iLzIxNDYzNiBt ZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXdlYm0uaHRtbCBbIFRpbWVvdXQgQ3Jhc2gg XQogCiB3ZWJraXQub3JnL2IvMTc3ODcxIGh0dHAvd3B0L3Jlc291cmNlLXRpbWluZy9ydC1zaGFy ZWQtcmVzb3VyY2UtaW4td29ya2Vycy5odG1sIFsgRmFpbHVyZSBdCiAK 416719 2020-12-23 11:13:04 -0800 2021-01-05 16:33:43 -0800 Follow-up patch to fix a failure on Big Sur bug-220046-20201223111259.patch text/plain 3656 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDYwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTM0NTQxODYzZDIzNGRkM2NjOTVh ZmQ4ODZjYmM4ZmE0OGY0NDUyOS4uY2JhN2U0YzA0MWY4NGI3OGZjOTE0OWNmYTNiOWY0MDNmNjhm NmRjMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTIzICBQZW5nIExpdSAgPHBlbmcu bGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgbWVkaWEtc291cmNlLXdlYm0uaHRtbDogSGFuZGxl IGZyYW1lIHNpemUgaW4gSEFWRV9NRVRBREFUQQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMDQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQSBmb2xsb3ctdXAgcGF0Y2ggdG8gZml4IGEgZmFpbHVyZSBv biBCaWcgU3VyLiBBICdyZXNpemUnIGV2ZW50IGNhbiBiZSBmaXJlZCBiZWZvcmUgb3IKKyAgICAg ICAgYWZ0ZXIgdGhlICd1cGRhdGUnIGV2ZW50LiBUaGUgdGVzdCBuZWVkcyB0byBzdXBwb3J0IGJv dGggY2FzZXMuCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXdl Ym0tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3Vy Y2Utd2VibS5odG1sOgorCiAyMDIwLTEyLTIyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBNZWRpYVN0cmVhbVRyYWNrLm11dGVkIHZhbHVlIHNob3VsZCBub3Qg Y2hhbmdlIGJlZm9yZSB0aGUgY29ycmVzcG9uZGluZyBldmVudCBpcyBmaXJlZApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS13ZWJtLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utd2Vi bS1leHBlY3RlZC50eHQKaW5kZXggY2NmMGYxMjNjMDIyNzJlM2EwODEyOGYwMTU5NzNjMzg1MmMz MzE5Ny4uYjg5NzNmMjVmYTcxYWUwNzM0Mjc2YjQ1YjA5OWRmMGYyZjQ5ZmE0OCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS13ZWJtLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNl LXdlYm0tZXhwZWN0ZWQudHh0CkBAIC01LDExICs1LDExIEBAIEVWRU5UKHNvdXJjZW9wZW4pCiBS VU4oc291cmNlLmR1cmF0aW9uID0gbG9hZGVyLmR1cmF0aW9uKCkpCiBSVU4oc291cmNlQnVmZmVy ID0gc291cmNlLmFkZFNvdXJjZUJ1ZmZlcihsb2FkZXIudHlwZSgpKSkKIFJVTihzb3VyY2VCdWZm ZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5pbml0U2VnbWVudCgpKSkKLUVWRU5UKHJlc2l6ZSkKLUVY UEVDVEVEICh2aWRlby52aWRlb1dpZHRoID09ICczMjAnKSBPSwotRVhQRUNURUQgKHZpZGVvLnZp ZGVvSGVpZ2h0ID09ICcyNDAnKSBPSwogRVZFTlQodXBkYXRlKQogQXBwZW5kIGEgbWVkaWEgc2Vn bWVudC4KIFJVTihzb3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5tZWRpYVNlZ21lbnQo MCkpKQorRVhQRUNURUQgKHJlc2l6ZUV2ZW50RmlyZWQgPT0gJ3RydWUnKSBPSworRVhQRUNURUQg KHZpZGVvV2lkdGggPT0gJzMyMCcpIE9LCitFWFBFQ1RFRCAodmlkZW9IZWlnaHQgPT0gJzI0MCcp IE9LCiBFTkQgT0YgVEVTVAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1z b3VyY2UvbWVkaWEtc291cmNlLXdlYm0uaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNv dXJjZS9tZWRpYS1zb3VyY2Utd2VibS5odG1sCmluZGV4IGU5YjU0ODBlMmJmYmUyMmQ2MTc4OWNm YTM0MmQ5ZGI3ZmVlNGM3ODEuLjA0ZDYxM2E2MjkzNjc1OWJiMmMxZTg1YTM2NWI2NTY2MTg4OThk ZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3Vy Y2Utd2VibS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1z b3VyY2Utd2VibS5odG1sCkBAIC04LDYgKzgsOSBAQAogICAgIHZhciBsb2FkZXI7CiAgICAgdmFy IHNvdXJjZTsKICAgICB2YXIgc291cmNlQnVmZmVyOworICAgIHZhciByZXNpemVFdmVudEZpcmVk ID0gZmFsc2U7CisgICAgdmFyIHZpZGVvV2lkdGggPSAwOworICAgIHZhciB2aWRlb0hlaWdodCA9 IDA7CiAKICAgICBmdW5jdGlvbiBsb2FkZXJQcm9taXNlKGxvYWRlcikgewogICAgICAgICByZXR1 cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4gewpAQCAtMjIsOSArMjUsOSBAQAog ICAgICAgICAgICAgICAgIC8vIEZpcnN0IHJlc2l6ZSBjYW4gYmUgMHgwCiAgICAgICAgICAgICAg ICAgaWYgKHZpZGVvLnZpZGVvV2lkdGggPT0gMCAmJiB2aWRlby52aWRlb0hlaWdodCA9PSAwKQog ICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KGBFVkVOVCgke2V2ZW50LnR5cGV9KWApOwotICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgn dmlkZW8udmlkZW9XaWR0aCcsIHdpZHRoKTsKLSAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo J3ZpZGVvLnZpZGVvSGVpZ2h0JywgaGVpZ2h0KTsKKyAgICAgICAgICAgICAgICByZXNpemVFdmVu dEZpcmVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB2aWRlb1dpZHRoID0gdmlkZW8udmlkZW9X aWR0aDsKKyAgICAgICAgICAgICAgICB2aWRlb0hlaWdodCA9IHZpZGVvLnZpZGVvSGVpZ2h0Owog ICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsK QEAgLTQzLDcgKzQ2LDcgQEAKIAogICAgICAgICAgICAgcnVuKCdzb3VyY2UuZHVyYXRpb24gPSBs b2FkZXIuZHVyYXRpb24oKScpOwogICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIgPSBzb3Vy Y2UuYWRkU291cmNlQnVmZmVyKGxvYWRlci50eXBlKCkpJyk7Ci0gICAgICAgICAgICBjb25zdCBy ZXNpemVkID0gcmVzaXplUHJvbWlzZSh2aWRlbywgMzIwLCAyNDApOworICAgICAgICAgICAgY29u c3QgcmVzaXplZCA9IHJlc2l6ZVByb21pc2UodmlkZW8pOwogICAgICAgICAgICAgcnVuKCdzb3Vy Y2VCdWZmZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5pbml0U2VnbWVudCgpKScpOwogCiAgICAgICAg ICAgICBhd2FpdCB3YWl0Rm9yKHNvdXJjZUJ1ZmZlciwgJ3VwZGF0ZScpOwpAQCAtNTIsNiArNTUs OSBAQAogICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5t ZWRpYVNlZ21lbnQoMCkpJyk7CiAKICAgICAgICAgICAgIGF3YWl0IHJlc2l6ZWQ7CisgICAgICAg ICAgICB0ZXN0RXhwZWN0ZWQoJ3Jlc2l6ZUV2ZW50RmlyZWQnLCB0cnVlKTsKKyAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgndmlkZW9XaWR0aCcsIDMyMCk7CisgICAgICAgICAgICB0ZXN0RXhwZWN0 ZWQoJ3ZpZGVvSGVpZ2h0JywgMjQwKTsKICAgICAgICAgICAgIGVuZFRlc3QoKTsKICAgICAgICAg fSBjYXRjaCAoZSkgewogICAgICAgICAgICAgZmFpbFRlc3QoYENhdWdodCBleGNlcHRpb246ICIk e2V9ImApOwo=