169675 2017-03-15 08:02:46 -0700 [Modern Media Controls] Captions do not default to Auto when language is changed 2017-03-15 10:41:06 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue webkit-bug-importer oldest_to_newest 1288052 0 graouts 2017-03-15 08:02:46 -0700 Steps To Reproduce: 1. Make sure the captions mode is set to “Auto” (open a video in QuickTime Player and select Auto in captions menu) 2. Go to System Preferences -> Language & Region, and change the system language to French 3. Play a video with French captions, and open the captions menu Results: The captions menu shows that the French subtitles are selected. It should show that Auto is selected. 1288053 1 graouts 2017-03-15 08:03:46 -0700 <rdar://problem/30423369> 1288056 2 304501 graouts 2017-03-15 08:08:22 -0700 Created attachment 304501 Patch 1288058 3 304501 eric.carlson 2017-03-15 08:19:44 -0700 Comment on attachment 304501 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304501&action=review as discussed on irc, you should be able to create a test for this with internals.setUserPreferredLanguages(). > Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:115 > + const trackItem = this._textTracks()[trackIndex]; > + const host = this.mediaController.host; > + const usesAutomaticTrack = host ? host.captionDisplayMode === "automatic" : false; > + > + if (host) { > + if (trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual")) > + return true; > + else if (trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack) > + return true; > + } > + > + return !usesAutomaticTrack && trackItem.mode !== "disabled"; I thinks this would be slightly easier to follow if you return immediately if host is null: if (!host) return trackItem.mode !== "disabled"; if (trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual")) return true; if (trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack) return true; return trackItem.mode !== "disabled"; 1288059 4 304501 eric.carlson 2017-03-15 08:21:17 -0700 Comment on attachment 304501 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304501&action=review >> Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:115 >> + return !usesAutomaticTrack && trackItem.mode !== "disabled"; > > I thinks this would be slightly easier to follow if you return immediately if host is null: > > if (!host) > return trackItem.mode !== "disabled"; > > if (trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual")) > return true; > > if (trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack) > return true; > > return trackItem.mode !== "disabled"; or: if (host && trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual")) return true; if (host && trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack) return true; return trackItem.mode !== "disabled"; 1288070 5 304504 graouts 2017-03-15 09:02:36 -0700 Created attachment 304504 Patch 1288099 6 304504 eric.carlson 2017-03-15 10:04:52 -0700 Comment on attachment 304504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304504&action=review > Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:106 > + const usesAutomaticTrack = host ? host.captionDisplayMode === "automatic" : false; Nit: this variable is no longer necessary. 1288103 7 graouts 2017-03-15 10:11:24 -0700 (In reply to comment #6) > Comment on attachment 304504 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=304504&action=review > > > Source/WebCore/Modules/modern-media-controls/media/tracks-support.js:106 > > + const usesAutomaticTrack = host ? host.captionDisplayMode === "automatic" : false; > > Nit: this variable is no longer necessary. It is necessary in case the track that we’re querying the selected state for is neither Off or Auto but we should be selecting auto. 1288120 8 304504 commit-queue 2017-03-15 10:41:03 -0700 Comment on attachment 304504 Patch Clearing flags on attachment: 304504 Committed r213987: <http://trac.webkit.org/changeset/213987> 1288121 9 commit-queue 2017-03-15 10:41:06 -0700 All reviewed patches have been landed. Closing bug. 304501 2017-03-15 08:08:22 -0700 2017-03-15 09:02:32 -0700 Patch bug-169675-20170315160821.patch text/plain 2930 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzOTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM1ZjA5NGI4Y2Y4NzNh NDc5N2NmNzYwOWZmMTAxMzZkMDgzYmMzMC4uOTY3YWU1MjdlMjNjMjQ1ZWE0NWEyY2E0NzE2ZjE3 ZjM5Njk3MjU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAzLTE1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ2FwdGlvbnMgZG8gbm90IGRlZmF1bHQgdG8gQXV0byB3aGVuIGxhbmd1YWdlIGlz IGNoYW5nZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2OTY3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA0MjMzNjk+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHdlIGNvcnJlY3RseSBt YXJrIHRoZSBPZmYgYW5kIEF1dG8gaXRlbXMgYXMgc2VsZWN0ZWQgd2hlbiB3ZSBhcmUgdXNpbmcg dGhlCisgICAgICAgIE9mZiBhbmQgQXV0byB0cmFja3MuIE5vIHRlc3Qgd2FzIGFkZGVkIGFzIEkg ZG9uJ3Qga25vdyBob3cgdG8gc2V0IHRoZSBzeXN0ZW0gbGFuZ3VhZ2UKKyAgICAgICAgdG8gYmUg YWJsZSB0byBjaGVjayB3aGF0IHRyYWNrIGlzIHVzZWQgaW4gdGhhdCBjYXNlLgorCisgICAgICAg ICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvdHJhY2tzLXN1cHBvcnQuanM6 CisgICAgICAgIChUcmFja3NTdXBwb3J0LnByb3RvdHlwZS50cmFja3NQYW5lbElzVHJhY2tJblNl Y3Rpb25TZWxlY3RlZCk6CisgICAgICAgIChUcmFja3NTdXBwb3J0LnByb3RvdHlwZS50cmFja3NQ YW5lbFNlbGVjdGlvbkRpZENoYW5nZSk6CisKIDIwMTctMDMtMTQgIEFkcmlhbiBQZXJleiBkZSBD YXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVkdW5kYW50IGNo ZWNrIGZvciAiZmlyc3RMaW5lIiBpbiBSZW5kZXJCbG9jazo6bGluZUhlaWdodCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90 cmFja3Mtc3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL21lZGlhL3RyYWNrcy1zdXBwb3J0LmpzCmluZGV4IGQwYmRmNGI5OWUwOTk5MTNhMmVh ZGUzNGZhM2RiNTRmYmQ2ZDA5OGIuLjdkNGQxNzU2YjE1MDBiMDZlZTMyNjE4ZDVlNjFjMmZlYjk3 ZTg3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL21lZGlhL3RyYWNrcy1zdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3RyYWNrcy1zdXBwb3J0LmpzCkBAIC0xMDAs MTMgKzEwMCwyNyBAQCBjbGFzcyBUcmFja3NTdXBwb3J0IGV4dGVuZHMgTWVkaWFDb250cm9sbGVy U3VwcG9ydAogICAgIHsKICAgICAgICAgaWYgKHNlY3Rpb25JbmRleCA9PSAwICYmIHRoaXMuX2Nh blBpY2tBdWRpb1RyYWNrcygpKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2F1ZGlvVHJhY2tz KClbdHJhY2tJbmRleF0uZW5hYmxlZDsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRUcmFja3Mo KVt0cmFja0luZGV4XS5tb2RlICE9PSAiZGlzYWJsZWQiOworCisgICAgICAgIGNvbnN0IHRyYWNr SXRlbSA9IHRoaXMuX3RleHRUcmFja3MoKVt0cmFja0luZGV4XTsKKyAgICAgICAgY29uc3QgaG9z dCA9IHRoaXMubWVkaWFDb250cm9sbGVyLmhvc3Q7CisgICAgICAgIGNvbnN0IHVzZXNBdXRvbWF0 aWNUcmFjayA9IGhvc3QgPyBob3N0LmNhcHRpb25EaXNwbGF5TW9kZSA9PT0gImF1dG9tYXRpYyIg OiBmYWxzZTsKKworICAgICAgICBpZiAoaG9zdCkgeworICAgICAgICAgICAgaWYgKHRyYWNrSXRl bSA9PT0gaG9zdC5jYXB0aW9uTWVudU9mZkl0ZW0gJiYgKGhvc3QuY2FwdGlvbkRpc3BsYXlNb2Rl ID09PSAiZm9yY2VkLW9ubHkiIHx8IGhvc3QuY2FwdGlvbkRpc3BsYXlNb2RlID09PSAibWFudWFs IikpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBlbHNlIGlmICh0 cmFja0l0ZW0gPT09IGhvc3QuY2FwdGlvbk1lbnVBdXRvbWF0aWNJdGVtICYmIHVzZXNBdXRvbWF0 aWNUcmFjaykKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAg ICAgIHJldHVybiAhdXNlc0F1dG9tYXRpY1RyYWNrICYmIHRyYWNrSXRlbS5tb2RlICE9PSAiZGlz YWJsZWQiOwogICAgIH0KIAogICAgIHRyYWNrc1BhbmVsU2VsZWN0aW9uRGlkQ2hhbmdlKHRyYWNr SW5kZXgsIHNlY3Rpb25JbmRleCkKICAgICB7CiAgICAgICAgIGlmIChzZWN0aW9uSW5kZXggPT0g MCAmJiB0aGlzLl9jYW5QaWNrQXVkaW9UcmFja3MoKSkKICAgICAgICAgICAgIHRoaXMuX2F1ZGlv VHJhY2tzKCkuZm9yRWFjaCgoYXVkaW9UcmFjaywgaW5kZXgpID0+IGF1ZGlvVHJhY2suZW5hYmxl ZCA9IGluZGV4ID09PSB0cmFja0luZGV4KTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5tZWRpYUNv bnRyb2xsZXIuaG9zdCkKKyAgICAgICAgICAgIHRoaXMubWVkaWFDb250cm9sbGVyLmhvc3Quc2V0 U2VsZWN0ZWRUZXh0VHJhY2sodGhpcy5fdGV4dFRyYWNrcygpW3RyYWNrSW5kZXhdKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fdGV4dFRyYWNrcygpLmZvckVhY2goKHRleHRUcmFj aywgaW5kZXgpID0+IHRleHRUcmFjay5tb2RlID0gaW5kZXggPT09IHRyYWNrSW5kZXggPyAic2hv d2luZyIgOiAiZGlzYWJsZWQiKTsKIAo= 304504 2017-03-15 09:02:36 -0700 2017-03-15 10:41:03 -0700 Patch bug-169675-20170315170235.patch text/plain 9771 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzOTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM1ZjA5NGI4Y2Y4NzNh NDc5N2NmNzYwOWZmMTAxMzZkMDgzYmMzMC4uZjQ3Njg1ODYzNWRhZjhmY2Y5OTI5OTg1NWUyNzJi ZGFkYjdkNDVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTAzLTE1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ2FwdGlvbnMgZG8gbm90IGRlZmF1bHQgdG8gQXV0byB3aGVuIGxhbmd1YWdlIGlz IGNoYW5nZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2OTY3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA0MjMzNjk+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHdlIGNvcnJlY3RseSBt YXJrIHRoZSBPZmYgYW5kIEF1dG8gaXRlbXMgYXMgc2VsZWN0ZWQgd2hlbiB3ZSBhcmUgdXNpbmcg dGhlCisgICAgICAgIE9mZiBhbmQgQXV0byB0cmFja3MuCisKKyAgICAgICAgVGVzdHM6IG1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1hdXRv LXRleHQtdHJhY2suaHRtbAorICAgICAgICAgICAgICAgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LW9mZi10ZXh0LXRyYWNrLmh0bWwKKwor ICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3RyYWNrcy1zdXBw b3J0LmpzOgorICAgICAgICAoVHJhY2tzU3VwcG9ydC5wcm90b3R5cGUudHJhY2tzUGFuZWxJc1Ry YWNrSW5TZWN0aW9uU2VsZWN0ZWQpOgorICAgICAgICAoVHJhY2tzU3VwcG9ydC5wcm90b3R5cGUu dHJhY2tzUGFuZWxTZWxlY3Rpb25EaWRDaGFuZ2UpOgorCiAyMDE3LTAzLTE0ICBBZHJpYW4gUGVy ZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJlZHVu ZGFudCBjaGVjayBmb3IgImZpcnN0TGluZSIgaW4gUmVuZGVyQmxvY2s6OmxpbmVIZWlnaHQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWVkaWEvdHJhY2tzLXN1cHBvcnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcwppbmRleCBkMGJkZjRiOTllMDk5 OTEzYTJlYWRlMzRmYTNkYjU0ZmJkNmQwOThiLi5hYjU3ZDkyYjAxNzMyYjYzMjRhMzA2ZGU5Yzdl YjRhOWVlMTlhZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcwpA QCAtMTAwLDEzICsxMDAsMjQgQEAgY2xhc3MgVHJhY2tzU3VwcG9ydCBleHRlbmRzIE1lZGlhQ29u dHJvbGxlclN1cHBvcnQKICAgICB7CiAgICAgICAgIGlmIChzZWN0aW9uSW5kZXggPT0gMCAmJiB0 aGlzLl9jYW5QaWNrQXVkaW9UcmFja3MoKSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9hdWRp b1RyYWNrcygpW3RyYWNrSW5kZXhdLmVuYWJsZWQ7Ci0gICAgICAgIHJldHVybiB0aGlzLl90ZXh0 VHJhY2tzKClbdHJhY2tJbmRleF0ubW9kZSAhPT0gImRpc2FibGVkIjsKKworICAgICAgICBjb25z dCB0cmFja0l0ZW0gPSB0aGlzLl90ZXh0VHJhY2tzKClbdHJhY2tJbmRleF07CisgICAgICAgIGNv bnN0IGhvc3QgPSB0aGlzLm1lZGlhQ29udHJvbGxlci5ob3N0OworICAgICAgICBjb25zdCB1c2Vz QXV0b21hdGljVHJhY2sgPSBob3N0ID8gaG9zdC5jYXB0aW9uRGlzcGxheU1vZGUgPT09ICJhdXRv bWF0aWMiIDogZmFsc2U7CisKKyAgICAgICAgaWYgKGhvc3QgJiYgdHJhY2tJdGVtID09PSBob3N0 LmNhcHRpb25NZW51T2ZmSXRlbSAmJiAoaG9zdC5jYXB0aW9uRGlzcGxheU1vZGUgPT09ICJmb3Jj ZWQtb25seSIgfHwgaG9zdC5jYXB0aW9uRGlzcGxheU1vZGUgPT09ICJtYW51YWwiKSkKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAoaG9zdCAmJiB0cmFja0l0ZW0gPT09IGhv c3QuY2FwdGlvbk1lbnVBdXRvbWF0aWNJdGVtICYmIHVzZXNBdXRvbWF0aWNUcmFjaykKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4gIXVzZXNBdXRvbWF0aWNUcmFjayAm JiB0cmFja0l0ZW0ubW9kZSAhPT0gImRpc2FibGVkIjsKICAgICB9CiAKICAgICB0cmFja3NQYW5l bFNlbGVjdGlvbkRpZENoYW5nZSh0cmFja0luZGV4LCBzZWN0aW9uSW5kZXgpCiAgICAgewogICAg ICAgICBpZiAoc2VjdGlvbkluZGV4ID09IDAgJiYgdGhpcy5fY2FuUGlja0F1ZGlvVHJhY2tzKCkp CiAgICAgICAgICAgICB0aGlzLl9hdWRpb1RyYWNrcygpLmZvckVhY2goKGF1ZGlvVHJhY2ssIGlu ZGV4KSA9PiBhdWRpb1RyYWNrLmVuYWJsZWQgPSBpbmRleCA9PT0gdHJhY2tJbmRleCk7CisgICAg ICAgIGVsc2UgaWYgKHRoaXMubWVkaWFDb250cm9sbGVyLmhvc3QpCisgICAgICAgICAgICB0aGlz Lm1lZGlhQ29udHJvbGxlci5ob3N0LnNldFNlbGVjdGVkVGV4dFRyYWNrKHRoaXMuX3RleHRUcmFj a3MoKVt0cmFja0luZGV4XSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX3RleHRU cmFja3MoKS5mb3JFYWNoKCh0ZXh0VHJhY2ssIGluZGV4KSA9PiB0ZXh0VHJhY2subW9kZSA9IGlu ZGV4ID09PSB0cmFja0luZGV4ID8gInNob3dpbmciIDogImRpc2FibGVkIik7CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1 MzdlYWM0ODdmYjAxOGMwMDYyZjg3MDcxN2E0YzViMzQwNWEzYTYzLi4yODE3NTM3NmZhYjMwMzU5 ZTQ3MjhiZjliNzI4MmYxMzlhZjBjNzdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMDMt MTUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KKworICAgICAgICBbTW9kZXJu IE1lZGlhIENvbnRyb2xzXSBDYXB0aW9ucyBkbyBub3QgZGVmYXVsdCB0byBBdXRvIHdoZW4gbGFu Z3VhZ2UgaXMgY2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY5Njc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDQyMzM2OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbmV3IHRlc3Rz IHRoYXQgY2hlY2sgdGhlIGNhc2VzIHdoZXJlIHRoZSBleHBlY3RlZCBzZWxlY3RlZCB0cmFjayBz aG91bGQgYmUgIk9mZiIgb3IgIkF1dG8iLgorCisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LWF1dG8tdGV4dC10cmFjay1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1hdXRvLXRleHQtdHJhY2suaHRtbDogQWRk ZWQuCisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0 L3RyYWNrcy1zdXBwb3J0LW9mZi10ZXh0LXRyYWNrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1z dXBwb3J0LW9mZi10ZXh0LXRyYWNrLmh0bWw6IEFkZGVkLgorCiAyMDE3LTAzLTE0ICBBbnRvaW5l IFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW01vZGVybiBNZWRpYSBDb250 cm9sc10gRnVsbHNjcmVlbiBjb250cm9scyBkdXJpbmcgTGl2ZSBCcm9hZGNhc3QgaXMgY29tcGxl dGVseSBicm9rZW4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1hdXRvLXRleHQtdHJhY2stZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LWF1dG8tdGV4dC10cmFjay1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uYWRhYzBiNzU1Y2NiYTk4MDY5ODk0MzVlNGZiYjc4NTM1MDZhZDk3ZQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFj a3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1hdXRvLXRleHQtdHJhY2stZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTQgQEAKK0Vuc3VyZSB3ZSBoYXZlIHRoZSBBdXRvIHRleHQgdHJhY2sgc2VsZWN0 ZWQgYnkgZGVmYXVsdC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc2hh ZG93Um9vdC5xdWVyeVNlbGVjdG9yKCdidXR0b24udHJhY2tzJykgYmVjYW1lIGRpZmZlcmVudCBm cm9tIG51bGwKK1BBU1Mgc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCdidXR0b24udHJhY2tzJyku Z2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGggYmVjYW1lIGRpZmZlcmVudCBmcm9tIDAKK1BB U1Mgc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCcudHJhY2tzLXBhbmVsJykgYmVjYW1lIGRpZmZl cmVudCBmcm9tIG51bGwKK1BBU1Mgc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yQWxsKCdsaS5zZWxl Y3RlZCcpWzFdLnRleHRDb250ZW50IGlzICJBdXRvIChSZWNvbW1lbmRlZCkiCisKK1BBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJh Y2tzLXN1cHBvcnQtYXV0by10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtYXV0by10ZXh0 LXRyYWNrLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWIzYzNlNjJjMDVlOThiMjA4OTUzZDA4YjA1ODZiYzIz NjE5NjhlOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1hdXRvLXRleHQtdHJhY2su aHRtbApAQCAtMCwwICsxLDM1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgc3JjPSIuLi8u Li8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4u L3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0 Ij48L3NjcmlwdD4KKzxib2R5PgorPHZpZGVvIHNyYz0iLi4vLi4vY29udGVudC9DQytTdWJ0aXRs ZXMubW92IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyBsZWZ0OiAwOyB0b3A6IDA7IHdpZHRo OiA2NDBweDsgaGVpZ2h0OiAzNjBweDsiIGNvbnRyb2xzIGF1dG9wbGF5PjwvdmlkZW8+Cis8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1 ZTsKKworZGVzY3JpcHRpb24oIkVuc3VyZSB3ZSBoYXZlIHRoZSBBdXRvIHRleHQgdHJhY2sgc2Vs ZWN0ZWQgYnkgZGVmYXVsdC4iKTsKKworY29uc3QgbWVkaWEgPSBkb2N1bWVudC5xdWVyeVNlbGVj dG9yKCJ2aWRlbyIpOworY29uc3Qgc2hhZG93Um9vdCA9IHdpbmRvdy5pbnRlcm5hbHMuc2hhZG93 Um9vdChtZWRpYSk7CisKK21lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7Cisg ICAgbWVkaWEucGF1c2UoKTsKKworICAgIHNob3VsZEJlY29tZURpZmZlcmVudCgic2hhZG93Um9v dC5xdWVyeVNlbGVjdG9yKCdidXR0b24udHJhY2tzJykiLCAibnVsbCIsICgpID0+IHsKKyAgICAg ICAgc2hvdWxkQmVjb21lRGlmZmVyZW50KCJzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoJ2J1dHRv bi50cmFja3MnKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCIsICIwIiwgKCkgPT4gewor ICAgICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRDYXB0aW9uRGlzcGxheU1vZGUoImF1dG9t YXRpYyIpOworICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVj dG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgc2hvdWxkQmVjb21lRGlmZmVyZW50 KCJzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoJy50cmFja3MtcGFuZWwnKSIsICJudWxsIiwgKCkg PT4geworICAgICAgICAgICAgICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygic2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yQWxsKCdsaS5zZWxlY3RlZCcpWzFdLnRleHRDb250ZW50IiwgIkF1dG8gKFJl Y29tbWVuZGVkKSIpOworICAgICAgICAgICAgICAgIGRlYnVnKCIiKTsKKyAgICAgICAgICAgICAg ICB3aW5kb3cuaW50ZXJuYWxzLnNldENhcHRpb25EaXNwbGF5TW9kZSgiZm9yY2Vkb25seSIpOwor ICAgICAgICAgICAgICAgIG1lZGlhLnJlbW92ZSgpOworICAgICAgICAgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOworICAgIH0pOworfSk7CisKKzwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LW9mZi10ZXh0LXRy YWNrLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1vZmYtdGV4dC10cmFjay1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZmIzZTMxODA1ZGVlODI3ZjhiN2U4YWYxMWEwZmJiOTY1MDVlODE3ZAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1vZmYtdGV4dC10cmFjay1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSwxNCBAQAorRW5zdXJlIHdlIGhhdmUgdGhlIE9mZiB0ZXh0IHRyYWNrIHNl bGVjdGVkIGJ5IGRlZmF1bHQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNT IHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignYnV0dG9uLnRyYWNrcycpIGJlY2FtZSBkaWZmZXJl bnQgZnJvbSBudWxsCitQQVNTIHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignYnV0dG9uLnRyYWNr cycpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIGJlY2FtZSBkaWZmZXJlbnQgZnJvbSAw CitQQVNTIHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignLnRyYWNrcy1wYW5lbCcpIGJlY2FtZSBk aWZmZXJlbnQgZnJvbSBudWxsCitQQVNTIHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvckFsbCgnbGku c2VsZWN0ZWQnKVsxXS50ZXh0Q29udGVudCBpcyAiT2ZmIgorCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv bWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0 LW9mZi10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtb2ZmLXRleHQtdHJhY2suaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5lY2I5ZDZlNGUyOGFiZThkOGI4ZjM1Mzk3YjRlZDgyODliODgyZWQ2Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L3RyYWNrcy1zdXBwb3J0LW9mZi10ZXh0LXRyYWNrLmh0bWwKQEAgLTAsMCAr MSwzMyBAQAorPCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVk aWEtY29udHJvbHMtdXRpbHMuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCI+PC9zY3JpcHQ+Cis8 Ym9keT4KKzx2aWRlbyBzcmM9Ii4uLy4uL2NvbnRlbnQvQ0MrU3VidGl0bGVzLm1vdiIgc3R5bGU9 InBvc2l0aW9uOiBhYnNvbHV0ZTsgbGVmdDogMDsgdG9wOiAwOyB3aWR0aDogNjQwcHg7IGhlaWdo dDogMzYwcHg7IiBjb250cm9scyBhdXRvcGxheT48L3ZpZGVvPgorPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiPgorCit3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKK2Rlc2NyaXB0 aW9uKCJFbnN1cmUgd2UgaGF2ZSB0aGUgT2ZmIHRleHQgdHJhY2sgc2VsZWN0ZWQgYnkgZGVmYXVs dC4iKTsKKworY29uc3QgbWVkaWEgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJ2aWRlbyIpOwor Y29uc3Qgc2hhZG93Um9vdCA9IHdpbmRvdy5pbnRlcm5hbHMuc2hhZG93Um9vdChtZWRpYSk7CisK K21lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CisgICAgbWVkaWEucGF1c2Uo KTsKKworICAgIHNob3VsZEJlY29tZURpZmZlcmVudCgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9y KCdidXR0b24udHJhY2tzJykiLCAibnVsbCIsICgpID0+IHsKKyAgICAgICAgc2hvdWxkQmVjb21l RGlmZmVyZW50KCJzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoJ2J1dHRvbi50cmFja3MnKS5nZXRC b3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCIsICIwIiwgKCkgPT4geworICAgICAgICAgICAgcHJl c3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOwor ICAgICAgICAgICAgc2hvdWxkQmVjb21lRGlmZmVyZW50KCJzaGFkb3dSb290LnF1ZXJ5U2VsZWN0 b3IoJy50cmFja3MtcGFuZWwnKSIsICJudWxsIiwgKCkgPT4geworICAgICAgICAgICAgICAgIHNo b3VsZEJlRXF1YWxUb1N0cmluZygic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yQWxsKCdsaS5zZWxl Y3RlZCcpWzFdLnRleHRDb250ZW50IiwgIk9mZiIpOworICAgICAgICAgICAgICAgIGRlYnVnKCIi KTsKKyAgICAgICAgICAgICAgICBtZWRpYS5yZW1vdmUoKTsKKyAgICAgICAgICAgICAgICBmaW5p c2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9KTsKK30pOwor Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K