133590 2014-06-06 16:39:18 -0700 Automatic text track selection can select more than one track 2014-06-09 15:57:16 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson bfulgham bunhere calvaris cdumez commit-queue esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1013881 0 eric.carlson 2014-06-06 16:39:18 -0700 If the automatic text track selection logic chooses a track that is not in the user's preferred language, adding a new track in the user's selected language should disable the first track. 1013890 1 232637 eric.carlson 2014-06-06 17:06:15 -0700 Created attachment 232637 Proposed patch. 1013892 2 232637 bfulgham 2014-06-06 17:21:00 -0700 Comment on attachment 232637 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=232637&action=review r=me > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:774 > + if (kind != TextTrack::captionsKeyword() && kind != TextTrack::descriptionsKeyword() && kind != TextTrack::subtitlesKeyword()) This pattern gets used in a few places. Someday we should make some kind of "TextTrack::shouldDisplayKind(kind)" or something. 1014251 3 webkit-bug-importer 2014-06-09 15:27:36 -0700 <rdar://problem/17240466> 1014262 4 232637 commit-queue 2014-06-09 15:57:11 -0700 Comment on attachment 232637 Proposed patch. Clearing flags on attachment: 232637 Committed r169725: <http://trac.webkit.org/changeset/169725> 1014263 5 commit-queue 2014-06-09 15:57:16 -0700 All reviewed patches have been landed. Closing bug. 232637 2014-06-06 17:06:15 -0700 2014-06-09 15:57:11 -0700 Proposed patch. patch_7.txt text/plain 10833 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA2LTA2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEF1dG9tYXRpYyB0ZXh0 IHRyYWNrIHNlbGVjdGlvbiBjYW4gc2VsZWN0IG1vcmUgdGhhbiBvbmUgdHJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzU5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LXRyYWNrbWVudS1zZWxlY3Rpb24uaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNvbmZpZ3VyZVRl eHRUcmFjayk6IENvbnNpZGVyIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQKKyAgICAgICAgICAgIHRy YWNrLCBpZiBhbnkuCisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRp YUFGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFG Ojpzb3J0ZWRUcmFja0xpc3RGb3JNZW51KTogRHJpdmUtYnkgY2hhbmdlCisgICAgICAgICAgICB0 byBtYWtlIHN1cmUgbm8gbm9uLXZpc2libGUgdGV4dCB0cmFja3MgYXJlIGluY2x1ZGVkIGluIHRo ZSB0cmFjayBtZW51LgorCiAyMDE0LTA2LTA2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxl LmNvbT4KIAogICAgICAgICBJbmRleGVkIGdldHRlcnMgc2hvdWxkIHJldHVybiB2YWx1ZXMgZGly ZWN0bHkgb24gdGhlIFByb3BlcnR5U2xvdC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTY5NjQ5KQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU1MSw2ICszNTUxLDE1 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Y29uZmlndXJlVGV4dFRyYWMKICAgICBSZWZQdHI8 VGV4dFRyYWNrPiBmb3JjZWRTdWJpdGxlVHJhY2s7CiAgICAgaW50IGhpZ2hlc3RUcmFja1Njb3Jl ID0gMDsKICAgICBpbnQgaGlnaGVzdEZvcmNlZFNjb3JlID0gMDsKKworICAgIC8vIElmIHRoZXJl IGlzIGEgdmlzaWJsZSB0cmFjaywgaXQgaGFzIGFscmVhZHkgYmVlbiBjb25maWd1cmVkIHNvIGl0 IHdvbid0IGJlIGNvbnNpZGVyZWQgaW4gdGhlIGxvb3AgYmVsb3cuIFdlIGRvbid0IHdhbnQgdG8g Y2hvb3NlIGFub3RoZXIKKyAgICAvLyB0cmFjayBpZiBpdCBpcyBsZXNzIHN1aXRhYmxlLCBhbmQg d2UgZG8gd2FudCB0byBkaXNhYmxlIGl0IGlmIGFub3RoZXIgdHJhY2sgaXMgbW9yZSBzdWl0YWJs ZS4KKyAgICBpbnQgYWxyZWFkeVZpc2libGVUcmFja1Njb3JlID0gMDsKKyAgICBpZiAoZ3JvdXAu dmlzaWJsZVRyYWNrICYmIGNhcHRpb25QcmVmZXJlbmNlcykgeworICAgICAgICBhbHJlYWR5Vmlz aWJsZVRyYWNrU2NvcmUgPSBjYXB0aW9uUHJlZmVyZW5jZXMtPnRleHRUcmFja1NlbGVjdGlvblNj b3JlKGdyb3VwLnZpc2libGVUcmFjay5nZXQoKSwgdGhpcyk7CisgICAgICAgIGN1cnJlbnRseUVu YWJsZWRUcmFja3MuYXBwZW5kKGdyb3VwLnZpc2libGVUcmFjayk7CisgICAgfQorCiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBncm91cC50cmFja3Muc2l6ZSgpOyArK2kpIHsKICAgICAgICAg UmVmUHRyPFRleHRUcmFjaz4gdGV4dFRyYWNrID0gZ3JvdXAudHJhY2tzW2ldOwogCkBAIC0zNTcx LDcgKzM1ODAsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNvbmZpZ3VyZVRleHRUcmFjCiAg ICAgICAgICAgICAvLyB0byBiZWxpZXZlIGlzIGFwcHJvcHJpYXRlIGZvciB0aGUgdXNlciwgYW5k IHRoZXJlIGlzIG5vIG90aGVyIHRleHQgdHJhY2sgaW4gdGhlIG1lZGlhIGVsZW1lbnQncyBsaXN0 IG9mCiAgICAgICAgICAgICAvLyB0ZXh0IHRyYWNrcyB3aXRoIGEgdGV4dCB0cmFjayBraW5kIG9m IGNoYXB0ZXJzIHdob3NlIHRleHQgdHJhY2sgbW9kZSBpcyBzaG93aW5nCiAgICAgICAgICAgICAv LyAgICBMZXQgdGhlIHRleHQgdHJhY2sgbW9kZSBiZSBzaG93aW5nLgotICAgICAgICAgICAgaWYg KHRyYWNrU2NvcmUgPiBoaWdoZXN0VHJhY2tTY29yZSkgeworICAgICAgICAgICAgaWYgKHRyYWNr U2NvcmUgPiBoaWdoZXN0VHJhY2tTY29yZSAmJiB0cmFja1Njb3JlID4gYWxyZWFkeVZpc2libGVU cmFja1Njb3JlKSB7CiAgICAgICAgICAgICAgICAgaGlnaGVzdFRyYWNrU2NvcmUgPSB0cmFja1Nj b3JlOwogICAgICAgICAgICAgICAgIHRyYWNrVG9FbmFibGUgPSB0ZXh0VHJhY2s7CiAgICAgICAg ICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNN ZWRpYUFGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2Vy UHJlZmVyZW5jZXNNZWRpYUFGLmNwcAkocmV2aXNpb24gMTY5NjQ5KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc3MCw2ICs3NzAsMTAgQEAgVmVjdG9yPFJlZlB0cjxUZXh0VHJhY2s+PiBDYXB0aW9uVXNl clByZQogICAgICAgICBUZXh0VHJhY2sqIHRyYWNrID0gdHJhY2tMaXN0LT5pdGVtKGkpOwogICAg ICAgICBTdHJpbmcgbGFuZ3VhZ2UgPSBkaXNwbGF5TmFtZUZvckxhbmd1YWdlTG9jYWxlKHRyYWNr LT5sYW5ndWFnZSgpKTsKIAorICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGtpbmQgPSB0cmFj ay0+a2luZCgpOworICAgICAgICBpZiAoa2luZCAhPSBUZXh0VHJhY2s6OmNhcHRpb25zS2V5d29y ZCgpICYmIGtpbmQgIT0gVGV4dFRyYWNrOjpkZXNjcmlwdGlvbnNLZXl3b3JkKCkgJiYga2luZCAh PSBUZXh0VHJhY2s6OnN1YnRpdGxlc0tleXdvcmQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwor CiAgICAgICAgIGlmICh0cmFjay0+Y29udGFpbnNPbmx5Rm9yY2VkU3VidGl0bGVzKCkpIHsKICAg ICAgICAgICAgIExPRyhNZWRpYSwgIkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNYWM6OnNvcnRlZFRy YWNrTGlzdEZvck1lbnUgLSBza2lwcGluZyAnJXMnIHRyYWNrIHdpdGggbGFuZ3VhZ2UgJyVzJyBi ZWNhdXNlIGl0IGNvbnRhaW5zIG9ubHkgZm9yY2VkIHN1YnRpdGxlcyIsIHRyYWNrLT5raW5kKCku c3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgbGFuZ3VhZ2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAg ICAgICBjb250aW51ZTsKQEAgLTgyNCw2ICs4MjgsMTAgQEAgVmVjdG9yPFJlZlB0cjxUZXh0VHJh Y2s+PiBDYXB0aW9uVXNlclByZQogICAgICAgICBUZXh0VHJhY2sqIHRyYWNrID0gdHJhY2tMaXN0 LT5pdGVtKGkpOwogICAgICAgICBTdHJpbmcgbGFuZ3VhZ2UgPSBkaXNwbGF5TmFtZUZvckxhbmd1 YWdlTG9jYWxlKHRyYWNrLT5sYW5ndWFnZSgpKTsKIAorICAgICAgICBjb25zdCBBdG9taWNTdHJp bmcmIGtpbmQgPSB0cmFjay0+a2luZCgpOworICAgICAgICBpZiAoa2luZCAhPSBUZXh0VHJhY2s6 OmNhcHRpb25zS2V5d29yZCgpICYmIGtpbmQgIT0gVGV4dFRyYWNrOjpkZXNjcmlwdGlvbnNLZXl3 b3JkKCkgJiYga2luZCAhPSBUZXh0VHJhY2s6OnN1YnRpdGxlc0tleXdvcmQoKSkKKyAgICAgICAg ICAgIGNvbnRpbnVlOworCiAgICAgICAgIC8vIEFsbCBjYW5kaWRhdGVzIHdpdGggbm8gbGFuZ3Vn ZSB3ZXJlIGFkZGVkIHRoZSBmaXJzdCB0aW1lIHRocm91Z2guCiAgICAgICAgIGlmIChsYW5ndWFn ZS5pc0VtcHR5KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKSW5kZXg6IExheW91dFRlc3RzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2 OTY2OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE1IEBACisyMDE0LTA2LTA2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29t PgorCisgICAgICAgIEF1dG9tYXRpYyB0ZXh0IHRyYWNrIHNlbGVjdGlvbiBjYW4gc2VsZWN0IG1v cmUgdGhhbiBvbmUgdHJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMzU5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogbWVkaWEvdmlkZW8tdHJhY2ttZW51LXNlbGVjdGlvbi1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3ZpZGVvLXRyYWNrbWVudS1zZWxlY3Rpb24uaHRtbDog QWRkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9uczogTmV3IHRl c3Qgc2tpcHBlZC4KKwogMjAxNC0wNi0wNiAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTjogSGl0IHRlc3Rpbmcgb2YgY29tcG9zaXRlZCBlbGVtZW50 cyBpcyBicm9rZW4gaW4gbmV3IG11bHRpY29sdW1uIGxheW91dC4KSW5kZXg6IExheW91dFRlc3Rz L21lZGlhL3ZpZGVvLXRyYWNrbWVudS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXRyYWNrbWVudS1zZWxlY3Rpb24tZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tdHJhY2ttZW51LXNl bGVjdGlvbi1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzOSBAQAorVGVz dCB0aGF0IHdlIHVwZGF0ZSB0aGUgbWVudSB3aGVuIHRoZSBzZWxlY3RlZCB0cmFjayBjaGFuZ2Vz LgorCisKK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorCisqKiogU2V0IHRoZSB1c2VyJ3MgcHJlZmVy cmVkIGxhbmd1YWdlIHRvIEVuZ2xpc2gsIGVuYWJsZSBhdXRvbWF0aWMgY2FwdGlvbiBzZWxlY3Rp b24uCitSVU4oaW50ZXJuYWxzLnNldFVzZXJQcmVmZXJyZWRMYW5ndWFnZXMoWydlbiddKSkKK1JV TihpbnRlcm5hbHMuc2V0Q2FwdGlvbkRpc3BsYXlNb2RlKCdBbHdheXNPbicpKQorCisqKiBUaGUg cHJlZmVycmVkIGxhbmd1YWdlIGlzIHNldCB0byBFbmdsaXNoLCBidXQgdGhlIFNwYW5pc2ggdHJh Y2sgc2hvdWxkIGJlIGVuYWJsZWQgYmVjYXVzZSBpdCBpcyBhdmFpbGFibGUKK1RyYWNrIG1lbnU6 CiswOiAiT2ZmIgorMTogIkF1dG8gKFJlY29tbWVuZGVkKSIKKzI6ICJTcGFuaXNoIiwgY2hlY2tl ZAorRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMF0ubW9kZSA9PSAnc2hvd2luZycpIE9LCisK KyoqKiBBZGQgYSB0ZXh0IHRyYWNrIGluIHRoZSBwcmVmZXJyZWQgbGFuZ3VhZ2UuCitSVU4odHJh Y2sgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCd0cmFjaycpKQorUlVOKHRyYWNrLnNldEF0dHJp YnV0ZSgna2luZCcsICdjYXB0aW9ucycpKQorUlVOKHRyYWNrLnNyYyA9ICdkYXRhOnRleHQvdnR0 LFdFQlZUVCUwQSUwQTAwJTNBMDAlM0EwMC4wMDAlMjAtLSUzRSUyMDAwJTNBMDAlM0EwMS4wMDAl MEFDYXB0aW9uJTIwMSUwQScpCitSVU4odHJhY2suc2V0QXR0cmlidXRlKCdzcmNsYW5nJywgJ2Vu JykpCitSVU4odHJhY2suc2V0QXR0cmlidXRlKCdvbmxvYWQnLCAndHJhY2tMb2FkZWQoKScpKQor UlVOKHZpZGVvLmFwcGVuZENoaWxkKHRyYWNrKSkKKworRVZFTlQobG9hZCkKKworKioqIFRoZSBu ZXcgdHJhY2sgc2hvdWxkIGJlIHNlbGVjdGVkIGJlY2F1c2UgaXQgaXMgaW4gdGhlIHByZWZlcnJl ZCBsYW5ndWFnZS4KK0VYUEVDVEVEIChldmVudC50YXJnZXQuc3JjbGFuZyA9PSAnZW4nKSBPSwor RVhQRUNURUQgKGV2ZW50LnRhcmdldC5yZWFkeVN0YXRlID09ICcyJykgT0sKK0VYUEVDVEVEICh2 aWRlby50ZXh0VHJhY2tzWzBdLm1vZGUgPT0gJ2Rpc2FibGVkJykgT0sKK0VYUEVDVEVEICh2aWRl by50ZXh0VHJhY2tzWzFdLm1vZGUgPT0gJ3Nob3dpbmcnKSBPSworVHJhY2sgbWVudToKKzA6ICJP ZmYiCisxOiAiQXV0byAoUmVjb21tZW5kZWQpIgorMjogIkVuZ2xpc2giLCBjaGVja2VkCiszOiAi U3BhbmlzaCIKKworRU5EIE9GIFRFU1QKKwpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8t dHJhY2ttZW51LXNlbGVjdGlvbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlh L3ZpZGVvLXRyYWNrbWVudS1zZWxlY3Rpb24uaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL21lZGlhL3ZpZGVvLXRyYWNrbWVudS1zZWxlY3Rpb24uaHRtbAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDg1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAg ICAgICA8dGl0bGU+U2VsZWN0aW5nIGZyb20gYSBsaXN0IG9mIHRyYWNrczwvdGl0bGU+CisgICAg ICAgIDxzY3JpcHQgc3JjPSJtZWRpYS1jb250cm9scy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxz Y3JpcHQgc3JjPSJtZWRpYS1maWxlLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9 InZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0idHJhY2ttZW51 LXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorCisgICAgICAgICAgICBmdW5j dGlvbiBmaW5pc2hUZXN0KCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB0ZXN0RXhw ZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbMF0ubW9kZSIsICJkaXNhYmxlZCIpOworICAgICAgICAg ICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1sxXS5tb2RlIiwgInNob3dpbmci KTsKKyAgICAgICAgICAgICAgICBsaXN0VHJhY2tNZW51KCk7CisKKyAgICAgICAgICAgICAgICBj b25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdHJhY2tMb2FkZWQoKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPkVWRU5UKGxvYWQpIik7CisKKyAgICAg ICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiogVGhlIG5ldyB0cmFjayBzaG91bGQgYmUg c2VsZWN0ZWQgYmVjYXVzZSBpdCBpcyBpbiB0aGUgcHJlZmVycmVkIGxhbmd1YWdlLiIpOworICAg ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZXZlbnQudGFyZ2V0LnNyY2xhbmciLCAiZW4iKTsK KyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImV2ZW50LnRhcmdldC5yZWFkeVN0YXRlIiwg SFRNTFRyYWNrRWxlbWVudC5MT0FERUQpOworCisgICAgICAgICAgICAgICAgc2hvd01lbnUoZmlu aXNoVGVzdCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0VGVz dCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHJhY2tMaXN0RWxlbWVudCA9IGdl dFRyYWNrTGlzdEVsZW1lbnQoKTsKKyAgICAgICAgICAgICAgICBpZiAoIXRyYWNrTGlzdEVsZW1l bnQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiPGJyPioqIFRoZSBwcmVmZXJyZWQgbGFuZ3VhZ2UgaXMgc2V0IHRvIEVuZ2xpc2gs IGJ1dCB0aGUgU3BhbmlzaCB0cmFjayBzaG91bGQgYmUgZW5hYmxlZCBiZWNhdXNlIGl0IGlzIGF2 YWlsYWJsZSIpOworICAgICAgICAgICAgICAgIGxpc3RUcmFja01lbnUoKTsKKyAgICAgICAgICAg ICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbMF0ubW9kZSIsICJzaG93aW5nIik7 CisgICAgICAgICAgICAgICAgY2xpY2tDQ0J1dHRvbigpOworCisgICAgICAgICAgICAgICAgY29u c29sZVdyaXRlKCI8YnI+KioqIEFkZCBhIHRleHQgdHJhY2sgaW4gdGhlIHByZWZlcnJlZCBsYW5n dWFnZS4iKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgndHJhY2snKSIpOworICAgICAgICAgICAgICAgIHJ1bigidHJhY2suc2V0QXR0cmlidXRl KCdraW5kJywgJ2NhcHRpb25zJykiKTsKKyAgICAgICAgICAgICAgICB1cmkgPSAnZGF0YTp0ZXh0 L3Z0dCwnICsgZW5jb2RlVVJJQ29tcG9uZW50KCdXRUJWVFRcblxuMDA6MDA6MDAuMDAwIC0tPiAw MDowMDowMS4wMDBcbkNhcHRpb24gMVxuJyk7CisgICAgICAgICAgICAgICAgcnVuKCJ0cmFjay5z cmMgPSAnIiArIHVyaSArICInIik7CisgICAgICAgICAgICAgICAgcnVuKCJ0cmFjay5zZXRBdHRy aWJ1dGUoJ3NyY2xhbmcnLCAnZW4nKSIpOworICAgICAgICAgICAgICAgIHJ1bigidHJhY2suc2V0 QXR0cmlidXRlKCdvbmxvYWQnLCAndHJhY2tMb2FkZWQoKScpIik7CisgICAgICAgICAgICAgICAg cnVuKCJ2aWRlby5hcHBlbmRDaGlsZCh0cmFjaykiKTsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgZnVuY3Rpb24gc2hvd01lbnUobmV4dEZ1bmN0aW9uKQorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIGNsaWNrQ0NCdXR0b24oKTsKKyAgICAgICAgICAgICAgICB3aW5kb3cuc2V0 VGltZW91dChuZXh0RnVuY3Rpb24sIDEwMCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IGZ1bmN0aW9uIGNhbnBsYXl0aHJvdWdoKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBjb25zb2xlV3JpdGUoIjxicj4qKiogU2V0IHRoZSB1c2VyJ3MgcHJlZmVycmVkIGxhbmd1YWdl IHRvIEVuZ2xpc2gsIGVuYWJsZSBhdXRvbWF0aWMgY2FwdGlvbiBzZWxlY3Rpb24uIik7CisgICAg ICAgICAgICAgICAgcnVuKCJpbnRlcm5hbHMuc2V0VXNlclByZWZlcnJlZExhbmd1YWdlcyhbJ2Vu J10pIik7CisgICAgICAgICAgICAgICAgcnVuKCJpbnRlcm5hbHMuc2V0Q2FwdGlvbkRpc3BsYXlN b2RlKCdBbHdheXNPbicpIik7CisgICAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQoZnVu Y3Rpb24oKSB7IHNob3dNZW51KHN0YXJ0VGVzdCkgfSwgMTAwKTsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgZnVuY3Rpb24gc3RhcnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5k TWVkaWFGaWxlKCd2aWRlbycsICdjb250ZW50L3Rlc3QnKTsKKyAgICAgICAgICAgICAgICBzZXRD YXB0aW9uRGlzcGxheU1vZGUoJ0F1dG9tYXRpYycpOworCisgICAgICAgICAgICAgICAgd2FpdEZv ckV2ZW50KCdjYW5wbGF5dGhyb3VnaCcsIGNhbnBsYXl0aHJvdWdoKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorCisgICAgPGJvZHkgb25sb2FkPSJzdGFy dCgpIj4KKyAgICAgICAgPHA+VGVzdCB0aGF0IHdlIHVwZGF0ZSB0aGUgbWVudSB3aGVuIHRoZSBz ZWxlY3RlZCB0cmFjayBjaGFuZ2VzLjwvcD4KKyAgICAgICAgPHZpZGVvIHdpZHRoPSI1MDAiIGhl aWdodD0iMzAwIiBjb250cm9scz4KKyAgICAgICAgICAgIDx0cmFjayBraW5kPSJjYXB0aW9ucyIg dGl0bGU9IkNvbW1lbnRhcnkiIHNyYz0idHJhY2svY2FwdGlvbnMtd2VidnR0L2NhcHRpb25zLWZh c3QudnR0IiBzcmNsYW5nPSJlcyI+CisgICAgICAgIDwvdmlkZW8+CisgICAgPC9ib2R5PgorPC9o dG1sPgorCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwko cmV2aXNpb24gMTY5NjQ5KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3Rh dGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTExNzgsNiArMTE3OCw3IEBAIHdlYmtpdC5vcmcvYi8x MDE2NzAgbWVkaWEvdmlkZW8tY29udHJvbHMKIHdlYmtpdC5vcmcvYi8xMDE2NzAgbWVkaWEvdHJh Y2svdHJhY2stdXNlci1wcmVmZXJlbmNlcy5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMTAx NjcwIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1pbmNsdWRlcy1lbmFi bGVkLXRyYWNrLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8xMDE2NzAgbWVkaWEvdmlkZW8t Y29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LW9ubHktY2FwdGlvbnMtZGVzY3JpcHRpb25zLWFu ZC1zdWJ0aXRsZXMuaHRtbCBbIFNraXAgXQord2Via2l0Lm9yZy9iLzEwMTY3MCBtZWRpYS92aWRl by10cmFja21lbnUtc2VsZWN0aW9uLmh0bWwgWyBTa2lwIF0KIAogIyBGYWlscyB1bnRpbCB3ZSBl bmFibGUgdGhlIFJlc291cmNlIFRpbWluZyBBUEkuCiB3ZWJraXQub3JnL2IvNjExMzggaHR0cC90 ZXN0cy93M2Mvd2VicGVyZi9zdWJtaXNzaW9uL0dvb2dsZS9yZXNvdXJjZS10aW1pbmcgWyBTa2lw IF0K