168168 2017-02-11 08:06:36 -0800 REGRESSION: Subtitles menu in media controls allows multiple items to be selected 2017-02-17 13:33:59 -0800 1 1 1 Unclassified WebKit Media Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar, Regression P1 Normal --- 1 mitz graouts graouts simon.fraser webkit-bug-importer oldest_to_newest 1275797 0 mitz 2017-02-11 08:06:36 -0800 To reproduce this bug, navigate to a video URL. Click the Subtitles button in the controls to bring up the menu. Click an item that isn’t selected, then click the Subtitles button again, and notice how the item is now selected, but the previously-selected item is selected too. Notice that you can toggle the selected state of each item independently of the others. 1276143 1 graouts 2017-02-13 01:59:10 -0800 Indeed, this isn't as expected. I was mistakenly thinking we should support this since the media API supports it, but this is not what we want to do from a UI perspective. 1276144 2 webkit-bug-importer 2017-02-13 01:59:25 -0800 <rdar://problem/30488605> 1278233 3 301924 graouts 2017-02-17 06:49:07 -0800 Created attachment 301924 Patch 1278353 4 301924 dino 2017-02-17 11:48:23 -0800 Comment on attachment 301924 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301924&action=review > Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:109 > + this._audioTracks().forEach((audioTrack, index) => audioTrack.enabled = index === trackIndex); I'm not sure if this is allowed in WebKit style, but I'd appreciate () around the equality test. Err... maybe not. "Whatever, dude. Whatever." > LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:4 > +<video src="../../content/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video> Why did you have to do this? > LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:62 > + const newSelectedTrack = Array.from(media.audioTracks).findIndex(track => track.enabled); Wow. I'd either forgotten or never heard of findIndex. 1278407 5 graouts 2017-02-17 13:31:40 -0800 (In reply to comment #4) > Comment on attachment 301924 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301924&action=review > > > Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:109 > > + this._audioTracks().forEach((audioTrack, index) => audioTrack.enabled = index === trackIndex); > > I'm not sure if this is allowed in WebKit style, but I'd appreciate () > around the equality test. Err... maybe not. "Whatever, dude. Whatever." I guess I'll just leave it as-is then. > > LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:4 > > +<video src="../../content/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video> > > Why did you have to do this? I think this made obtaining metrics more predictable as logs were added to the document. > > LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:62 > > + const newSelectedTrack = Array.from(media.audioTracks).findIndex(track => track.enabled); > > Wow. I'd either forgotten or never heard of findIndex. I implemented it 3 years ago, my only call to fame in the JSC world :) 1278410 6 graouts 2017-02-17 13:33:59 -0800 Committed r212571: <http://trac.webkit.org/changeset/212571> 301924 2017-02-17 06:49:07 -0800 2017-02-17 11:48:23 -0800 Patch bug-168168-20170217154627.patch text/plain 8999 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIwMjMzYjYwNDExNThh YWQyYzg2MDA3MzhmOWFiYzBkODk3ZWYzOC4uNGZlNDQ1NWM0MWEzZWRkMzM3YmM1ZTg1MTRkMTdh YjcwODI0ZTMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAyLTE3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogU3Vi dGl0bGVzIG1lbnUgaW4gbWVkaWEgY29udHJvbHMgYWxsb3dzIG11bHRpcGxlIGl0ZW1zIHRvIGJl IHNlbGVjdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjgxNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBvbmx5IGEgc2luZ2xlIGF1ZGlvIHRyYWNrIGFuZCBhIHNpbmdsZSB0ZXh0 IHRyYWNrIGNhbiBiZSBzZWxlY3RlZAorICAgICAgICBpbiB0aGUgdHJhY2tzIHBhbmVsIGF0IGFu eSBnaXZlbiBwb2ludC4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21lZGlhL3RyYWNrcy1zdXBwb3J0LmpzOgorICAgICAgICAoVHJhY2tzU3VwcG9ydC5wcm90b3R5 cGUudHJhY2tzUGFuZWxTZWxlY3Rpb25EaWRDaGFuZ2UpOgorICAgICAgICAoVHJhY2tzU3VwcG9y dC5wcm90b3R5cGUuX3NvcnRlZFRyYWNrTGlzdCk6CisgICAgICAgIChUcmFja3NTdXBwb3J0KToK KwogMjAxNy0wMi0xNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIFNldCB0aGUgREhUTUwgZHJhZyBpbWFnZSBpbiB0aGUgREhUTUwgdHlwZSBjaGVjawpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWVkaWEvdHJhY2tzLXN1cHBvcnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcwppbmRleCAyNDU1ZDhiMjIyOTNi NGQxNDI4N2Y4ODhkYmMwNmRhM2E3MTkxOWVjLi5kMGJkZjRiOTllMDk5OTEzYTJlYWRlMzRmYTNk YjU0ZmJkNmQwOThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcwpA QCAtMTA1LDEzICsxMDUsMTAgQEAgY2xhc3MgVHJhY2tzU3VwcG9ydCBleHRlbmRzIE1lZGlhQ29u dHJvbGxlclN1cHBvcnQKIAogICAgIHRyYWNrc1BhbmVsU2VsZWN0aW9uRGlkQ2hhbmdlKHRyYWNr SW5kZXgsIHNlY3Rpb25JbmRleCkKICAgICB7Ci0gICAgICAgIGlmIChzZWN0aW9uSW5kZXggPT0g MCAmJiB0aGlzLl9jYW5QaWNrQXVkaW9UcmFja3MoKSkgewotICAgICAgICAgICAgbGV0IHRyYWNr ID0gdGhpcy5fYXVkaW9UcmFja3MoKVt0cmFja0luZGV4XTsKLSAgICAgICAgICAgIHRyYWNrLmVu YWJsZWQgPSAhdHJhY2suZW5hYmxlZDsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGxl dCB0cmFjayA9IHRoaXMuX3RleHRUcmFja3MoKVt0cmFja0luZGV4XTsKLSAgICAgICAgICAgIHRy YWNrLm1vZGUgPSB0cmFjay5tb2RlID09PSAiZGlzYWJsZWQiID8gInNob3dpbmciIDogImRpc2Fi bGVkIjsKLSAgICAgICAgfQorICAgICAgICBpZiAoc2VjdGlvbkluZGV4ID09IDAgJiYgdGhpcy5f Y2FuUGlja0F1ZGlvVHJhY2tzKCkpCisgICAgICAgICAgICB0aGlzLl9hdWRpb1RyYWNrcygpLmZv ckVhY2goKGF1ZGlvVHJhY2ssIGluZGV4KSA9PiBhdWRpb1RyYWNrLmVuYWJsZWQgPSBpbmRleCA9 PT0gdHJhY2tJbmRleCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3RleHRUcmFj a3MoKS5mb3JFYWNoKCh0ZXh0VHJhY2ssIGluZGV4KSA9PiB0ZXh0VHJhY2subW9kZSA9IGluZGV4 ID09PSB0cmFja0luZGV4ID8gInNob3dpbmciIDogImRpc2FibGVkIik7CiAKICAgICAgICAgdGhp cy5tZWRpYUNvbnRyb2xsZXIuY29udHJvbHMuaGlkZVRyYWNrc1BhbmVsKCk7CiAgICAgfQpAQCAt MTQ3LDkgKzE0NCw3IEBAIGNsYXNzIFRyYWNrc1N1cHBvcnQgZXh0ZW5kcyBNZWRpYUNvbnRyb2xs ZXJTdXBwb3J0CiAKICAgICBfc29ydGVkVHJhY2tMaXN0KHRyYWNrcykKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLm1lZGlhQ29udHJvbGxlci5ob3N0KQotICAgICAgICAgICAgcmV0dXJuIHRoaXMu bWVkaWFDb250cm9sbGVyLmhvc3Quc29ydGVkVHJhY2tMaXN0Rm9yTWVudSh0cmFja3MpOwotICAg ICAgICByZXR1cm4gdHJhY2tzOworICAgICAgICByZXR1cm4gQXJyYXkuZnJvbSh0aGlzLm1lZGlh Q29udHJvbGxlci5ob3N0ID8gdGhpcy5tZWRpYUNvbnRyb2xsZXIuaG9zdC5zb3J0ZWRUcmFja0xp c3RGb3JNZW51KHRyYWNrcykgOiB0cmFja3MpOwogICAgIH0KIAogfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDllMDY0Yjg2 ZWE3NGJhYzMyNmUzNzJiMzcxZDU3OTg0NTY4MDg4ZGQuLjIyMTM5Y2Y0NGRjZGNhNGNiM2FlZDI3 ZTA3ZDUyMzJiMTg1ZDJjMjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wMi0xNyAgQW50 b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFN1 YnRpdGxlcyBtZW51IGluIG1lZGlhIGNvbnRyb2xzIGFsbG93cyBtdWx0aXBsZSBpdGVtcyB0byBi ZSBzZWxlY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY4MTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRW5oYW5jZSB0aGUgaW50ZXJhY3RpdmUgdHJhY2sgc2VsZWN0aW9uIHRlc3QgdG8gc2VsZWN0 IGEgc2Vjb25kIHRyYWNrIGFuZCBjaGVjaworICAgICAgICB0aGF0IG9ubHkgYSBzaW5nbGUgdHJh Y2sgaXMgc2VsZWN0ZWQgYXQgb25jZS4KKworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5l bC1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLXBhbmVsLmh0bWw6CisK IDIwMTctMDItMTYgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAg ICAgU2tpcCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9y dC1yZXNvdXJjZS1lcnJvcnMuaHRtbC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10 cmFjay1pbi1wYW5lbC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtY2xpY2stdHJhY2staW4t cGFuZWwtZXhwZWN0ZWQudHh0CmluZGV4IDNmMTM5NTJhYmUwOWNlNWYxNDZhMzIxMzQxMDI1NjIy Y2IxZTFhMWQuLjk4ZDEzNWM4M2RhYWFiNTU5MmNmNjFmNDg2OTJiNTkyZGFjOGRjYWEgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3Vw cG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5lbC1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0 L3RyYWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLXBhbmVsLWV4cGVjdGVkLnR4dApAQCAtMywx MiArMywyNSBAQCBDbGlja2luZyBvbiBhIHRyYWNrIGluIHRoZSB0cmFja3MgcGFuZWwuCiBPbiBz dWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dl ZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotUEFTUyBtZWRpYS5hdWRpb1RyYWNrc1sxXS5lbmFi bGVkIGlzIGZhbHNlCittZWRpYS5hdWRpb1RyYWNrc1swXS5lbmFibGVkID0gdHJ1ZQorbWVkaWEu YXVkaW9UcmFja3NbMV0uZW5hYmxlZCA9IGZhbHNlCittZWRpYS5hdWRpb1RyYWNrc1syXS5lbmFi bGVkID0gZmFsc2UKIAogQ2xpY2tpbmcgb24gdGhlIHRyYWNrcyBidXR0b24KIENsaWNraW5nIG9u IHNlY29uZCBhdWRpbyB0cmFjayBpbiB0cmFja3MgcGFuZWwKKworT2J0YWluZWQgY2hhbmdlIGV2 ZW50IG9uIG1lZGlhIGF1ZGlvIHRyYWNrcworbWVkaWEuYXVkaW9UcmFja3NbMF0uZW5hYmxlZCA9 IGZhbHNlCittZWRpYS5hdWRpb1RyYWNrc1sxXS5lbmFibGVkID0gdHJ1ZQorbWVkaWEuYXVkaW9U cmFja3NbMl0uZW5hYmxlZCA9IGZhbHNlCisKK0NsaWNraW5nIG9uIHRoZSB0cmFja3MgYnV0dG9u CitDbGlja2luZyBvbiB0aGlyZCBhdWRpbyB0cmFjayBpbiB0cmFja3MgcGFuZWwKKwogT2J0YWlu ZWQgY2hhbmdlIGV2ZW50IG9uIG1lZGlhIGF1ZGlvIHRyYWNrcwotUEFTUyBtZWRpYS5hdWRpb1Ry YWNrc1sxXS5lbmFibGVkIGlzIHRydWUKK21lZGlhLmF1ZGlvVHJhY2tzWzBdLmVuYWJsZWQgPSBm YWxzZQorbWVkaWEuYXVkaW9UcmFja3NbMV0uZW5hYmxlZCA9IGZhbHNlCittZWRpYS5hdWRpb1Ry YWNrc1syXS5lbmFibGVkID0gdHJ1ZQogCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5lbC5odG1sIGIv TGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3Ry YWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLXBhbmVsLmh0bWwKaW5kZXggYjgzYzJhZTljMzhh NDhiM2Q2Y2JkN2Q2MjEzYTVlOWZiNDE1NjY5ZS4uYWQwNzc4YjUxMDE2YzAzNTdhN2VlZjYyNzcz OTAzMDVjZjY5Y2YxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLXBh bmVsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LWNsaWNrLXRyYWNrLWluLXBhbmVsLmh0bWwKQEAg LTEsNyArMSw3IEBACiA8IURPQ1RZUEUgaHRtbD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgogPGJvZHk+Ci08dmlkZW8gc3JjPSIuLi8u Li9jb250ZW50L0NDK1N1YnRpdGxlcy5tb3YiIHN0eWxlPSJ3aWR0aDogNjQwcHg7IGhlaWdodDog MzYwcHg7IiBjb250cm9scyBhdXRvcGxheT48L3ZpZGVvPgorPHZpZGVvIHNyYz0iLi4vLi4vY29u dGVudC9DQytTdWJ0aXRsZXMubW92IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyBsZWZ0OiAw OyB0b3A6IDA7IHdpZHRoOiA2NDBweDsgaGVpZ2h0OiAzNjBweDsiIGNvbnRyb2xzIGF1dG9wbGF5 PjwvdmlkZW8+CiA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CiAKIHdpbmRvdy5qc1Rl c3RJc0FzeW5jID0gdHJ1ZTsKQEAgLTExLDMzICsxMSw0NyBAQCBkZXNjcmlwdGlvbigiQ2xpY2tp bmcgb24gYSB0cmFjayBpbiB0aGUgdHJhY2tzIHBhbmVsLiIpOwogY29uc3QgbWVkaWEgPSBkb2N1 bWVudC5xdWVyeVNlbGVjdG9yKCJ2aWRlbyIpOwogY29uc3Qgc2hhZG93Um9vdCA9IHdpbmRvdy5p bnRlcm5hbHMuc2hhZG93Um9vdChtZWRpYSk7CiAKK2xldCBwcmV2aW91c2x5U2VsZWN0ZWRUcmFj ayA9IDA7CisKIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CiAgICAgbWVk aWEucGF1c2UoKTsKIAotICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhLmF1ZGlvVHJhY2tzWzFdLmVu YWJsZWQiKTsKLSAgICBkZWJ1ZygiIik7CisgICAgZHVtcEF1ZGlvVHJhY2tzRW5hYmxlZFN0YXRl KCk7CiAKICAgICBtZWRpYS5hdWRpb1RyYWNrcy5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBh dWRpb1RyYWNrc0RpZENoYW5nZSk7Ci0gICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFtZSgo KSA9PiB7Ci0gICAgICAgIGNsaWNrT25UcmFja3NCdXR0b24oKTsKLSAgICAgICAgd2luZG93LnJl cXVlc3RBbmltYXRpb25GcmFtZShjbGlja09uU2Vjb25kQXVkaW9UcmFjayk7Ci0gICAgfSk7Cisg ICAgY2xpY2tPblRyYWNrc0J1dHRvbihjbGlja09uU2Vjb25kQXVkaW9UcmFjayk7CiB9KTsKIAot ZnVuY3Rpb24gY2xpY2tPblRyYWNrc0J1dHRvbigpCitmdW5jdGlvbiBjbGlja09uVHJhY2tzQnV0 dG9uKGNvbnRpbnVhdGlvbikKIHsKLSAgICBkZWJ1ZygiQ2xpY2tpbmcgb24gdGhlIHRyYWNrcyBi dXR0b24iKTsKLSAgICBjb25zdCBib3VuZHMgPSBzaGFkb3dSb290Lmxhc3RDaGlsZC5xdWVyeVNl bGVjdG9yKCJidXR0b24udHJhY2tzIikuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7Ci0gICAgZXZl bnRTZW5kZXIubW91c2VNb3ZlVG8oYm91bmRzLmxlZnQgKyAxLCBib3VuZHMudG9wICsgMSk7Ci0g ICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7Ci0gICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwor ICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4geworICAgICAgICBkZWJ1Zygi Iik7CisgICAgICAgIGRlYnVnKCJDbGlja2luZyBvbiB0aGUgdHJhY2tzIGJ1dHRvbiIpOworICAg ICAgICBjbGlja09uRWxlbWVudChzaGFkb3dSb290Lmxhc3RDaGlsZC5xdWVyeVNlbGVjdG9yKCJi dXR0b24udHJhY2tzIikpOworICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKGNv bnRpbnVhdGlvbik7CisgICAgfSk7CiB9CiAKIGZ1bmN0aW9uIGNsaWNrT25TZWNvbmRBdWRpb1Ry YWNrKCkKIHsKICAgICBkZWJ1ZygiQ2xpY2tpbmcgb24gc2Vjb25kIGF1ZGlvIHRyYWNrIGluIHRy YWNrcyBwYW5lbCIpOwotICAgIGNvbnN0IHNlY29uZEF1ZGlvVHJhY2sgPSBzaGFkb3dSb290Lmxh c3RDaGlsZC5xdWVyeVNlbGVjdG9yQWxsKCJsaSIpWzFdOwotICAgIGNvbnN0IGJvdW5kcyA9IHNl Y29uZEF1ZGlvVHJhY2suZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgY2xpY2tPbkF1ZGlv VHJhY2tBdEluZGV4KDEpOworfQorCitmdW5jdGlvbiBjbGlja09uVGhpcmRBdWRpb1RyYWNrKCkK K3sKKyAgICBkZWJ1ZygiQ2xpY2tpbmcgb24gdGhpcmQgYXVkaW8gdHJhY2sgaW4gdHJhY2tzIHBh bmVsIik7CisgICAgY2xpY2tPbkF1ZGlvVHJhY2tBdEluZGV4KDIpOworfQorCitmdW5jdGlvbiBj bGlja09uQXVkaW9UcmFja0F0SW5kZXgoaW5kZXgpCit7CisgICAgY2xpY2tPbkVsZW1lbnQoc2hh ZG93Um9vdC5sYXN0Q2hpbGQucXVlcnlTZWxlY3RvckFsbCgibGkiKVtpbmRleF0pOworfQorCitm dW5jdGlvbiBjbGlja09uRWxlbWVudChlbGVtZW50KQoreworICAgIGNvbnN0IGJvdW5kcyA9IGVs ZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8oYm91bmRzLmxlZnQgKyAxLCBib3VuZHMudG9wICsgMSk7CiAgICAgZXZlbnRTZW5kZXIubW91 c2VEb3duKCk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwpAQCAtNDUsMTIgKzU5LDMxIEBA IGZ1bmN0aW9uIGNsaWNrT25TZWNvbmRBdWRpb1RyYWNrKCkKIAogZnVuY3Rpb24gYXVkaW9UcmFj a3NEaWRDaGFuZ2UoKQogewotICAgIGRlYnVnKCJPYnRhaW5lZCBjaGFuZ2UgZXZlbnQgb24gbWVk aWEgYXVkaW8gdHJhY2tzIik7Ci0gICAgc2hvdWxkQmVUcnVlKCJtZWRpYS5hdWRpb1RyYWNrc1sx XS5lbmFibGVkIik7CisgICAgY29uc3QgbmV3U2VsZWN0ZWRUcmFjayA9IEFycmF5LmZyb20obWVk aWEuYXVkaW9UcmFja3MpLmZpbmRJbmRleCh0cmFjayA9PiB0cmFjay5lbmFibGVkKTsKKyAgICBp ZiAocHJldmlvdXNseVNlbGVjdGVkVHJhY2sgPT09IG5ld1NlbGVjdGVkVHJhY2spCisgICAgICAg IHJldHVybjsKKworICAgIHByZXZpb3VzbHlTZWxlY3RlZFRyYWNrID0gbmV3U2VsZWN0ZWRUcmFj azsKIAogICAgIGRlYnVnKCIiKTsKLSAgICBtZWRpYS5yZW1vdmUoKTsKLSAgICBmaW5pc2hKU1Rl c3QoKTsKKyAgICBkZWJ1ZygiT2J0YWluZWQgY2hhbmdlIGV2ZW50IG9uIG1lZGlhIGF1ZGlvIHRy YWNrcyIpOworCisgICAgZHVtcEF1ZGlvVHJhY2tzRW5hYmxlZFN0YXRlKCk7CisKKyAgICBpZiAo bWVkaWEuYXVkaW9UcmFja3NbMV0uZW5hYmxlZCkKKyAgICAgICAgc2hhZG93Um9vdC5sYXN0Q2hp bGQuYWRkRXZlbnRMaXN0ZW5lcigidHJhbnNpdGlvbmVuZCIsIGV2ZW50ID0+IGNsaWNrT25UcmFj a3NCdXR0b24oY2xpY2tPblRoaXJkQXVkaW9UcmFjaykpOworICAgIGVsc2UgaWYgKG1lZGlhLmF1 ZGlvVHJhY2tzWzJdLmVuYWJsZWQpIHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBtZWRp YS5yZW1vdmUoKTsKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorfQorCitmdW5jdGlv biBkdW1wQXVkaW9UcmFja3NFbmFibGVkU3RhdGUoKQoreworICAgIEFycmF5LmZyb20obWVkaWEu YXVkaW9UcmFja3MpLmZvckVhY2goKGF1ZGlvVHJhY2ssIGluZGV4KSA9PiB7CisgICAgICAgIGRl YnVnKGBtZWRpYS5hdWRpb1RyYWNrc1ske2luZGV4fV0uZW5hYmxlZCA9ICR7bWVkaWEuYXVkaW9U cmFja3NbaW5kZXhdLmVuYWJsZWR9YCk7CisgICAgfSk7CiB9CiAKIDwvc2NyaXB0Pgo=