213058 2020-06-10 16:29:25 -0700 [Cocoa] MediaUsageManagerCocoa should use a different USVideoUsage initializer 2020-06-11 08:18:31 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1661424 0 eric.carlson 2020-06-10 16:29:25 -0700 <rdar://problam/64007341> 1661436 1 401604 eric.carlson 2020-06-10 16:48:27 -0700 Created attachment 401604 Patch 1661588 2 ews-feeder 2020-06-11 08:18:31 -0700 Committed r262903: <https://trac.webkit.org/changeset/262903> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401604. 401604 2020-06-10 16:48:27 -0700 2020-06-11 08:18:31 -0700 Patch bug-213058-20200610164826.patch text/plain 4531 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0NjQyZDg4NTk5ZmY0YTAy MDY4NWYyYmQ3MzBlYWIyYTRlYmZmNzUuLmYxZjQ3YjAyNmRhOTczZGM2ODI3NDU5ODIwZjE3OGM5 NzFiN2EyYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDYtMTAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBNZWRpYVVz YWdlTWFuYWdlckNvY29hIHNob3VsZCB1c2UgYSBkaWZmZXJlbnQgVVNWaWRlb1VzYWdlIGluaXRp YWxpemVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTMwNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMsIHRlc3RlZCBtYW51YWxseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9NZWRp YS9jb2NvYS9NZWRpYVVzYWdlTWFuYWdlckNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpNZWRp YVVzYWdlTWFuYWdlckNvY29hOjpyZXNldCk6IERyaXZlLWJ5IGZpeDogZG9uJ3QgY2FsbCAtc3Rv cCB1bmxlc3MgdGhlCisgICAgICAgIGVsZW1lbnQgd2FzIHBsYXlpbmcuCisgICAgICAgIChXZWJL aXQ6Ok1lZGlhVXNhZ2VNYW5hZ2VyQ29jb2E6OnVwZGF0ZU1lZGlhVXNhZ2UpOiBVc2UgYSBkaWZm ZXJlbnQgaW5pdGlhbGl6ZXIgc28KKyAgICAgICAgd2UgY2FuIHBhc3MgaW4gdGhlIHN0YXRlLgor CiAyMDIwLTA2LTEwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWJLaXQ6IEFkZCBDbG9ja0tpdFNQSS5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9NZWRpYS9jb2NvYS9NZWRpYVVzYWdlTWFuYWdlckNvY29hLm1tIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvY29jb2EvTWVkaWFVc2FnZU1hbmFnZXJDb2NvYS5tbQpp bmRleCBhMzQ4YTE4Njg2M2Y5MjUyZDQ2ODcyMGMyMWZkZDdlYzc2YWUyOTljLi5mMzc4NGZjMjcx MmIwZGY2Mzg3MTIwNDdjZDcyZjg1MzBjNzc3MjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9NZWRpYS9jb2NvYS9NZWRpYVVzYWdlTWFuYWdlckNvY29hLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL01lZGlhL2NvY29hL01lZGlhVXNhZ2VNYW5hZ2VyQ29jb2Eu bW0KQEAgLTMzLDcgKzMzLDcgQEAKIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiAKIEBpbnRlcmZh Y2UgVVNWaWRlb1VzYWdlIDogTlNPYmplY3QKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEJ1bmRs ZUlkZW50aWZpZXI6KE5TU3RyaW5nICopYnVuZGxlSWRlbnRpZmllciBVUkw6KE5TVVJMICopdXJs IG1lZGlhVVJMOihOU1VSTCAqKW1lZGlhVVJMIE5TX0RFU0lHTkFURURfSU5JVElBTElaRVI7Cist IChpbnN0YW5jZXR5cGUpaW5pdFdpdGhCdW5kbGVJZGVudGlmaWVyOihOU1N0cmluZyAqKWJ1bmRs ZUlkZW50aWZpZXIgVVJMOihOU1VSTCAqKXVybCBtZWRpYVVSTDooTlNVUkwgKiltZWRpYVVSTCB2 aWRlb01ldGFkYXRhOihOU0RpY3Rpb25hcnk8TlNTdHJpbmcgKiwgaWQ+ICopdmlkZW9NZXRhZGF0 YSBOU19ERVNJR05BVEVEX0lOSVRJQUxJWkVSOwogLSAodm9pZClzdG9wOwogLSAodm9pZClyZXN0 YXJ0OwogLSAodm9pZCl1cGRhdGVWaWRlb01ldGFkYXRhOihOU0RpY3Rpb25hcnk8TlNTdHJpbmcg KiwgaWQ+ICopdmlkZW9NZXRhZGF0YTsKQEAgLTEwMCwxMCArMTAwLDggQEAgTWVkaWFVc2FnZU1h bmFnZXJDb2NvYTo6fk1lZGlhVXNhZ2VNYW5hZ2VyQ29jb2EoKQogdm9pZCBNZWRpYVVzYWdlTWFu YWdlckNvY29hOjpyZXNldCgpCiB7CiAgICAgZm9yIChhdXRvJiBzZXNzaW9uIDogbV9tZWRpYVNl c3Npb25zLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChzZXNzaW9uLT51c2FnZVRyYWNrZXIpIHsK KyAgICAgICAgaWYgKHNlc3Npb24tPnVzYWdlVHJhY2tlciAmJiBzZXNzaW9uLT5tZWRpYVVzYWdl SW5mbyAmJiBzZXNzaW9uLT5tZWRpYVVzYWdlSW5mby0+aXNQbGF5aW5nKQogICAgICAgICAgICAg W3Nlc3Npb24tPnVzYWdlVHJhY2tlciBzdG9wXTsKLSAgICAgICAgICAgIHNlc3Npb24tPnVzYWdl VHJhY2tlciA9IG51bGxwdHI7Ci0gICAgICAgIH0KICAgICB9CiAgICAgbV9tZWRpYVNlc3Npb25z LmNsZWFyKCk7CiB9CkBAIC0xNDQsMjEgKzE0Miw2IEBAIHZvaWQgTWVkaWFVc2FnZU1hbmFnZXJD b2NvYTo6dXBkYXRlTWVkaWFVc2FnZShXZWJDb3JlOjpNZWRpYVNlc3Npb25JZGVudGlmaWVyIGlk CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXNlc3Npb24tPnVzYWdl VHJhY2tlcikgewotICAgICAgICAgICAgaWYgKCFtZWRpYVVzYWdlSW5mby5pc1BsYXlpbmcpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICBzZXNzaW9uLT51c2FnZVRyYWNr ZXIgPSBhZG9wdE5TKFtQQUw6OmFsbG9jVVNWaWRlb1VzYWdlSW5zdGFuY2UoKSBpbml0V2l0aEJ1 bmRsZUlkZW50aWZpZXI6c2Vzc2lvbi0+YnVuZGxlSWRlbnRpZmllciBVUkw6KE5TVVJMICopc2Vz c2lvbi0+cGFnZVVSTCBtZWRpYVVSTDooTlNVUkwgKiltZWRpYVVzYWdlSW5mby5tZWRpYVVSTF0p OwotICAgICAgICAgICAgQVNTRVJUKHNlc3Npb24tPnVzYWdlVHJhY2tlcik7Ci0gICAgICAgIH0K LQotICAgICAgICBpZiAoc2Vzc2lvbi0+bWVkaWFVc2FnZUluZm8gJiYgc2Vzc2lvbi0+bWVkaWFV c2FnZUluZm8tPmlzUGxheWluZyAhPSBtZWRpYVVzYWdlSW5mby5pc1BsYXlpbmcpIHsKLSAgICAg ICAgICAgIGlmIChtZWRpYVVzYWdlSW5mby5pc1BsYXlpbmcpCi0gICAgICAgICAgICAgICAgW3Nl c3Npb24tPnVzYWdlVHJhY2tlciByZXN0YXJ0XTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICBbc2Vzc2lvbi0+dXNhZ2VUcmFja2VyIHN0b3BdOwotICAgICAgICB9Ci0KICAgICAg ICAgTlNEaWN0aW9uYXJ5PE5TU3RyaW5nICosIGlkPiAqbWV0YWRhdGEgPSBAewogICAgICAgICAg ICAgVVNWaWRlb01ldGFkYXRhS2V5Q2FuU2hvd0NvbnRyb2xzTWFuYWdlcjogQChtZWRpYVVzYWdl SW5mby5jYW5TaG93Q29udHJvbHNNYW5hZ2VyKSwKICAgICAgICAgICAgIFVTVmlkZW9NZXRhZGF0 YUtleUNhblNob3dOb3dQbGF5aW5nQ29udHJvbHM6IEAobWVkaWFVc2FnZUluZm8uY2FuU2hvd05v d1BsYXlpbmdDb250cm9scyksCkBAIC0xOTEsNyArMTc0LDI1IEBAIHZvaWQgTWVkaWFVc2FnZU1h bmFnZXJDb2NvYTo6dXBkYXRlTWVkaWFVc2FnZShXZWJDb3JlOjpNZWRpYVNlc3Npb25JZGVudGlm aWVyIGlkCiAgICAgICAgICAgICBVU1ZpZGVvTWV0YWRhdGFLZXlJc0xhcmdlRW5vdWdoRm9yTWFp bkNvbnRlbnQ6IEAobWVkaWFVc2FnZUluZm8uaXNMYXJnZUVub3VnaEZvck1haW5Db250ZW50KSwK ICAgICAgICAgfTsKIAotICAgICAgICBbc2Vzc2lvbi0+dXNhZ2VUcmFja2VyIHVwZGF0ZVZpZGVv TWV0YWRhdGE6bWV0YWRhdGFdOworICAgICAgICBpZiAoIXNlc3Npb24tPnVzYWdlVHJhY2tlcikg eworICAgICAgICAgICAgaWYgKCFtZWRpYVVzYWdlSW5mby5pc1BsYXlpbmcpCisgICAgICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBzZXNzaW9uLT51c2FnZVRyYWNrZXIgPSBhZG9w dE5TKFtQQUw6OmFsbG9jVVNWaWRlb1VzYWdlSW5zdGFuY2UoKSBpbml0V2l0aEJ1bmRsZUlkZW50 aWZpZXI6c2Vzc2lvbi0+YnVuZGxlSWRlbnRpZmllciBVUkw6KE5TVVJMICopc2Vzc2lvbi0+cGFn ZVVSTAorICAgICAgICAgICAgICAgIG1lZGlhVVJMOihOU1VSTCAqKW1lZGlhVXNhZ2VJbmZvLm1l ZGlhVVJMIHZpZGVvTWV0YWRhdGE6bWV0YWRhdGFdKTsKKyAgICAgICAgICAgIEFTU0VSVChzZXNz aW9uLT51c2FnZVRyYWNrZXIpOworICAgICAgICAgICAgaWYgKCFzZXNzaW9uLT51c2FnZVRyYWNr ZXIpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg IFtzZXNzaW9uLT51c2FnZVRyYWNrZXIgdXBkYXRlVmlkZW9NZXRhZGF0YTptZXRhZGF0YV07CisK KyAgICAgICAgaWYgKHNlc3Npb24tPm1lZGlhVXNhZ2VJbmZvICYmIHNlc3Npb24tPm1lZGlhVXNh Z2VJbmZvLT5pc1BsYXlpbmcgIT0gbWVkaWFVc2FnZUluZm8uaXNQbGF5aW5nKSB7CisgICAgICAg ICAgICBpZiAobWVkaWFVc2FnZUluZm8uaXNQbGF5aW5nKQorICAgICAgICAgICAgICAgIFtzZXNz aW9uLT51c2FnZVRyYWNrZXIgcmVzdGFydF07CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAg ICAgICAgW3Nlc3Npb24tPnVzYWdlVHJhY2tlciBzdG9wXTsKKyAgICAgICAgfQorCiAgICAgICAg IHNlc3Npb24tPm1lZGlhVXNhZ2VJbmZvID0gbWVkaWFVc2FnZUluZm87CiAKICAgICB9IEBjYXRj aChOU0V4Y2VwdGlvbiAqZXhjZXB0aW9uKSB7Cg==