146293 2015-06-24 15:44:37 -0700 MediaSession: fall back to "content" kind when an unsupported media session kind is passed in 2015-06-25 15:03:57 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 145411 1 mrajca webkit-unassigned conrad_shultz eric.carlson jer.noble mrajca webkit-bug-importer oldest_to_newest 1104516 0 mrajca 2015-06-24 15:44:37 -0700 Per the Media Session spec, if an unrecognized media session kind is passed in, we should default to "content". 1104521 1 webkit-bug-importer 2015-06-24 15:46:22 -0700 <rdar://problem/21534784> 1104527 2 255523 mrajca 2015-06-24 15:54:25 -0700 Created attachment 255523 Patch 1104735 3 mrajca 2015-06-25 15:03:57 -0700 Changesset: http://trac.webkit.org/changeset/185963 255523 2015-06-24 15:54:25 -0700 2015-06-24 18:16:23 -0700 Patch bug-146293-20150624155341.patch text/plain 4784 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQzZDY3Y2Q1ZGRjZmE4 MmM1ZTY5NGQwOWU3Njc3Yjg4ZGE5ZjlmYi4uNTRkNDVmMGFhMjgxOGE3ZDEyODg5NTcwMjQxMjJi ODgwMjM5NmY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTA2LTI0ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAorICAgICAgICBNZWRpYVNlc3Npb246IGZhbGwg YmFjayB0byAiY29udGVudCIga2luZCB3aGVuIGFuIHVuc3VwcG9ydGVkIG1lZGlhIHNlc3Npb24g a2luZCBpcyBwYXNzZWQgaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NjI5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbjo6cGFyc2VLaW5kKTogUGFyc2UgdGhlIG1lZGlhIHNl c3Npb24ga2luZCB0byBvbmUgb2YgdGhlIGZvdXIgc3VwcG9ydGVkIHR5cGVzLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFTZXNzaW9uOjpNZWRpYVNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFTZXNzaW9uOjpraW5kKTogRm9ybWF0IHRoZSB2YWx1ZSBhcyBhIHN0cmluZyAod2hpY2gg dGhlIEpTIGJpbmRpbmdzIGV4cGVjdCkuCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNlc3Npb24v TWVkaWFTZXNzaW9uLmg6IFRoZSBtZWRpYSBzZXNzaW9uIGtpbmQgaXMgbm93IHN0b3JlZCBhcyBh biBlbnVtIHJhdGhlciB0aGFuIGEgc3RyaW5nCisgICAgICAgICAgc2luY2Ugd2Ugb25seSBzdXBw b3J0IGEgc21hbGwsIGZpeGVkIG51bWJlciBvZiB2YWx1ZXMuCisKKzIwMTUtMDYtMjQgIE1hdHQg UmFqY2EgIDxtcmFqY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1lZGlhU2Vzc2lvbjogcHJvcGFn YXRlIE1lZGlhU2Vzc2lvbk1ldGFkYXRhIHRvIFdlYlBhZ2VQcm94eQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjgyCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uY3BwCmluZGV4IDUy ZDI4YWY3MWYzNGQ2MzgwYmIzYTdhMmZhNmFiNzNjNzhmMjdkYTkuLmI0NzgwNWZlODJjNTYzMGI4 OGE0MGU3YzVkNjA1NmYxYWRlZGRjNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcApAQCAtMzcsMTEgKzM3LDMzIEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGNvbnN0IGNoYXIqIGFtYmllbnRLaW5kID0g ImFtYmllbnQiOworc3RhdGljIGNvbnN0IGNoYXIqIHRyYW5zaWVudEtpbmQgPSAidHJhbnNpZW50 IjsKK3N0YXRpYyBjb25zdCBjaGFyKiB0cmFuc2llbnRTb2xvS2luZCA9ICJ0cmFuc2llbnQtc29s byI7CitzdGF0aWMgY29uc3QgY2hhciogY29udGVudEtpbmQgPSAiY29udGVudCI7CisKK01lZGlh U2Vzc2lvbjo6S2luZCBNZWRpYVNlc3Npb246OnBhcnNlS2luZChjb25zdCBTdHJpbmcmIGtpbmQp Cit7CisgICAgLy8gNC4gTWVkaWEgU2Vzc2lvbgorICAgIC8vIDIuIElmIG5vIGNvcnJlc3BvbmRp bmcgbWVkaWEgc2Vzc2lvbiB0eXBlIGNhbiBiZSBmb3VuZCBmb3IgdGhlIHByb3ZpZGVkIG1lZGlh IHNlc3Npb24gY2F0ZWdvcnkgb3IgbWVkaWEgc2Vzc2lvbgorICAgIC8vICAgIGNhdGVnb3J5IGlz IGVtcHR5LCB0aGVuIHNldCBtZWRpYSBzZXNzaW9uJ3MgY3VycmVudCBtZWRpYSBzZXNzaW9uIHR5 cGUgdG8gImNvbnRlbnQiLgorICAgIGlmIChraW5kID09IGFtYmllbnRLaW5kKQorICAgICAgICBy ZXR1cm4gTWVkaWFTZXNzaW9uOjpLaW5kOjpBbWJpZW50OworICAgIGlmIChraW5kID09IHRyYW5z aWVudEtpbmQpCisgICAgICAgIHJldHVybiBNZWRpYVNlc3Npb246OktpbmQ6OlRyYW5zaWVudDsK KyAgICBpZiAoa2luZCA9PSB0cmFuc2llbnRTb2xvS2luZCkKKyAgICAgICAgcmV0dXJuIE1lZGlh U2Vzc2lvbjo6S2luZDo6VHJhbnNpZW50U29sbzsKKyAgICByZXR1cm4gTWVkaWFTZXNzaW9uOjpL aW5kOjpDb250ZW50OworfQorCiBNZWRpYVNlc3Npb246Ok1lZGlhU2Vzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIGtpbmQpCiAgICAgOiBtX2RvY3Vt ZW50KGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KSkKLSAgICAsIG1fa2luZChraW5kKQorICAg ICwgbV9raW5kKHBhcnNlS2luZChraW5kKSkKIHsKLSAgICBpZiAobV9raW5kID09ICJjb250ZW50 IikKKyAgICAvLyA0LiBNZWRpYSBTZXNzaW9ucworICAgIC8vIDMuIElmIG1lZGlhIHNlc3Npb24n cyBjdXJyZW50IG1lZGlhIHNlc3Npb24gdHlwZSBpcyAiY29udGVudCIsIHRoZW4gY3JlYXRlIGEg bmV3IG1lZGlhIHJlbW90ZSBjb250cm9sbGVyIGZvciBtZWRpYQorICAgIC8vICAgIHNlc3Npb24u IChPdGhlcndpc2UgbWVkaWEgc2Vzc2lvbiBoYXMgbm8gbWVkaWEgcmVtb3RlIGNvbnRyb2xsZXIu KQorICAgIGlmIChtX2tpbmQgPT0gS2luZDo6Q29udGVudCkKICAgICAgICAgbV9jb250cm9scyA9 IGFkb3B0UmVmKCpuZXcgTWVkaWFSZW1vdGVDb250cm9scyhjb250ZXh0KSk7CiAKICAgICBNZWRp YVNlc3Npb25NYW5hZ2VyOjpzaW5nbGV0b24oKS5hZGRNZWRpYVNlc3Npb24oKnRoaXMpOwpAQCAt NTIsNiArNzQsMjAgQEAgTWVkaWFTZXNzaW9uOjp+TWVkaWFTZXNzaW9uKCkKICAgICBNZWRpYVNl c3Npb25NYW5hZ2VyOjpzaW5nbGV0b24oKS5yZW1vdmVNZWRpYVNlc3Npb24oKnRoaXMpOwogfQog CitTdHJpbmcgTWVkaWFTZXNzaW9uOjpraW5kKCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKG1fa2lu ZCkgeworICAgIGNhc2UgTWVkaWFTZXNzaW9uOjpLaW5kOjpBbWJpZW50OgorICAgICAgICByZXR1 cm4gYW1iaWVudEtpbmQ7CisgICAgY2FzZSBNZWRpYVNlc3Npb246OktpbmQ6OlRyYW5zaWVudDoK KyAgICAgICAgcmV0dXJuIHRyYW5zaWVudEtpbmQ7CisgICAgY2FzZSBNZWRpYVNlc3Npb246Oktp bmQ6OlRyYW5zaWVudFNvbG86CisgICAgICAgIHJldHVybiB0cmFuc2llbnRTb2xvS2luZDsKKyAg ICBjYXNlIE1lZGlhU2Vzc2lvbjo6S2luZDo6Q29udGVudDoKKyAgICAgICAgcmV0dXJuIGNvbnRl bnRLaW5kOworICAgIH0KK30KKwogTWVkaWFSZW1vdGVDb250cm9scyogTWVkaWFTZXNzaW9uOjpj b250cm9scyhib29sJiBpc051bGwpCiB7CiAgICAgTWVkaWFSZW1vdGVDb250cm9scyogY29udHJv bHMgPSBtX2NvbnRyb2xzLmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uaAppbmRleCAxNGZhMGE2OWMxNzNkMzRlYTk1YzU2NjIw MDlmMDAyNWFjOTQxYjFhLi5kMDQ0MzVmODk4NDY5NjdlNTM2MWU4NWM5YWFjYzJjMzQ5NTIxN2Fj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNl c3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNl c3Npb24uaApAQCAtNTMsNyArNTMsNyBAQCBwdWJsaWM6CiAgICAgTWVkaWFTZXNzaW9uKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQmLCBjb25zdCBTdHJpbmcmKTsKICAgICB+TWVkaWFTZXNzaW9uKCk7 CiAKLSAgICBTdHJpbmcga2luZCgpIGNvbnN0IHsgcmV0dXJuIG1fa2luZDsgfQorICAgIFN0cmlu ZyBraW5kKCkgY29uc3Q7CiAgICAgTWVkaWFSZW1vdGVDb250cm9scyogY29udHJvbHMoYm9vbCYg aXNOdWxsKTsKICAgICAKICAgICBTdGF0ZSBjdXJyZW50U3RhdGUoKSBjb25zdCB7IHJldHVybiBt X2N1cnJlbnRTdGF0ZTsgfQpAQCAtNzIsNiArNzIsMTUgQEAgcHVibGljOgogcHJpdmF0ZToKICAg ICBmcmllbmQgY2xhc3MgSFRNTE1lZGlhRWxlbWVudDsKIAorICAgIGVudW0gY2xhc3MgS2luZCB7 CisgICAgICAgIENvbnRlbnQsCisgICAgICAgIFRyYW5zaWVudCwKKyAgICAgICAgVHJhbnNpZW50 U29sbywKKyAgICAgICAgQW1iaWVudAorICAgIH07CisKKyAgICBzdGF0aWMgS2luZCBwYXJzZUtp bmQoY29uc3QgU3RyaW5nJik7CisKICAgICB2b2lkIGFkZE1lZGlhRWxlbWVudChIVE1MTWVkaWFF bGVtZW50Jik7CiAgICAgdm9pZCByZW1vdmVNZWRpYUVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCYp OwogCkBAIC04NSw3ICs5NCw3IEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxIVE1MTWVkaWFFbGVt ZW50Kj4qIG1faXRlcmF0ZWRBY3RpdmVQYXJ0aWNpcGF0aW5nRWxlbWVudHMgeyBudWxscHRyIH07 CiAKICAgICBEb2N1bWVudCYgbV9kb2N1bWVudDsKLSAgICBjb25zdCBTdHJpbmcgbV9raW5kOwor ICAgIGNvbnN0IEtpbmQgbV9raW5kOwogICAgIFJlZlB0cjxNZWRpYVJlbW90ZUNvbnRyb2xzPiBt X2NvbnRyb2xzOwogICAgIE1lZGlhU2Vzc2lvbk1ldGFkYXRhIG1fbWV0YWRhdGE7CiB9Owo=