182974 2018-02-20 08:31:34 -0800 [EME] Adopt new AVContentKeySession success delegate callback 2018-02-20 10:14:38 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson webkit-bug-importer oldest_to_newest 1400774 0 jer.noble 2018-02-20 08:31:34 -0800 [EME] Adopt new AVContentKeySession success delegate callback 1400775 1 jer.noble 2018-02-20 08:32:15 -0800 <rdar://problem/36079035> 1400776 2 334273 jer.noble 2018-02-20 08:34:38 -0800 Created attachment 334273 Patch 1400780 3 334273 eric.carlson 2018-02-20 08:49:55 -0800 Comment on attachment 334273 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334273&action=review > Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:490 > +void CDMInstanceFairPlayStreamingAVFObjC::requestDidSucceed(AVContentKeyRequest *request) Nit: you should just omit the parameter since it can never be used. 1400817 4 334273 commit-queue 2018-02-20 10:14:37 -0800 Comment on attachment 334273 Patch Clearing flags on attachment: 334273 Committed r228823: <https://trac.webkit.org/changeset/228823> 1400820 5 commit-queue 2018-02-20 10:14:38 -0800 All reviewed patches have been landed. Closing bug. 334273 2018-02-20 08:34:38 -0800 2018-02-20 10:14:37 -0800 Patch bug-182974-20180220083437.patch text/plain 5970 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU1ZTc3ZjY0M2Y5YWUy ZWQxODNiMzhkNmY1MWNmM2VlZmI3ODZhNS4uZTRhNGEyNWFmYWRjNDhmMzM0YmU4NzMwYWM0MDY3 ZjA3ZjhjNTUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAyLTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdIEFkb3B0IG5ldyBB VkNvbnRlbnRLZXlTZXNzaW9uIHN1Y2Nlc3MgZGVsZWdhdGUgY2FsbGJhY2sKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjk3NAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzYwNzkwMzU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3RvcmUgdGhlIHVwZGF0ZUxpY2Vuc2VDYWxsYmFjayBpZiB0aGUgbmV3 IHByb3RvY29sIG1ldGhvZCBpcyBwcmVzZW50IGFuZCBzdXBwb3J0ZWQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3Ry ZWFtaW5nQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tOgorICAgICAgICAo LVtXZWJDb3JlRlBTQ29udGVudEtleVNlc3Npb25EZWxlZ2F0ZSBjb250ZW50S2V5U2Vzc2lvbjpj b250ZW50S2V5UmVxdWVzdERpZFN1Y2NlZWQ6XSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0 YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6dXBkYXRlTGljZW5zZSk6CisgICAgICAgIChX ZWJDb3JlOjpDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6ZGlkRmFpbFRvUHJv dmlkZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OnJlcXVlc3REaWRTdWNjZWVkKToKKwogMjAxOC0wMi0xOSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbRU1FXSBBZGQgbWVjaGFuaXNtIGZv ciBNZWRpYUtleVNlc3Npb24gdG8gcmVhY3QgdG8gSERDUCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0 YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FW Rk9iakMuaAppbmRleCAyNDM0YzU3MjhjZjFlMGUxZjZhYThmMWFhNmViZDYzYjA0YzcxYmVkLi5i Y2E3YjkzNGFiMDllZWEyMjNkODY1NjdhMGI0YjNjMDNmNjAyM2RkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5j ZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdB VkZPYmpDLmgKQEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkUHJvdmlkZVJl bmV3aW5nUmVxdWVzdChBVkNvbnRlbnRLZXlSZXF1ZXN0ICopOwogICAgIHZvaWQgZGlkUHJvdmlk ZVBlcnNpc3RhYmxlUmVxdWVzdChBVkNvbnRlbnRLZXlSZXF1ZXN0ICopOwogICAgIHZvaWQgZGlk RmFpbFRvUHJvdmlkZVJlcXVlc3QoQVZDb250ZW50S2V5UmVxdWVzdCAqLCBOU0Vycm9yICopOwor ICAgIHZvaWQgcmVxdWVzdERpZFN1Y2NlZWQoQVZDb250ZW50S2V5UmVxdWVzdCAqKTsKICAgICBi b29sIHNob3VsZFJldHJ5UmVxdWVzdEZvclJlYXNvbihBVkNvbnRlbnRLZXlSZXF1ZXN0ICosIE5T U3RyaW5nICopOwogICAgIHZvaWQgc2Vzc2lvbklkZW50aWZpZXJDaGFuZ2VkKE5TRGF0YSAqKTsK ICAgICB2b2lkIG91dHB1dE9ic2N1cmVkRHVlVG9JbnN1ZmZpY2llbnRFeHRlcm5hbFByb3RlY3Rp b25DaGFuZ2VkKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9i akMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbQppbmRleCBkZDVhZDE5NDg3 NzQ1YzNiOTAzMjRlOTRiZTUyNzM0YzBkNWI2NjNkLi4wM2FhNjI3NmMwYWFiY2EzYWQ1NDQ1NDMy MDY3YzFkMDZkNjg5NmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2Jq Qy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbQpAQCAtMzQsNiArMzQs NyBAQAogI2ltcG9ydCAiU2hhcmVkQnVmZmVyLmgiCiAjaW1wb3J0ICJUZXh0RGVjb2Rlci5oIgog I2ltcG9ydCA8QVZGb3VuZGF0aW9uL0FWQ29udGVudEtleVNlc3Npb24uaD4KKyNpbXBvcnQgPG9i amMvcnVudGltZS5oPgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvQVZGb3VuZGF0aW9uU1BJLmg+CiAj aW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0hhc2gu aD4KQEAgLTEwOCw2ICsxMDksMTMgQEAgLSAodm9pZCljb250ZW50S2V5U2Vzc2lvbjooQVZDb250 ZW50S2V5U2Vzc2lvbiAqKXNlc3Npb24gY29udGVudEtleVJlcXVlc3Q6KEFWQ28KICAgICAgICAg X3BhcmVudC0+ZGlkRmFpbFRvUHJvdmlkZVJlcXVlc3Qoa2V5UmVxdWVzdCwgZXJyKTsKIH0KIAor LSAodm9pZCljb250ZW50S2V5U2Vzc2lvbjooQVZDb250ZW50S2V5U2Vzc2lvbiAqKXNlc3Npb24g Y29udGVudEtleVJlcXVlc3REaWRTdWNjZWVkOihBVkNvbnRlbnRLZXlSZXF1ZXN0ICopa2V5UmVx dWVzdAoreworICAgIFVOVVNFRF9QQVJBTShzZXNzaW9uKTsKKyAgICBpZiAoX3BhcmVudCkKKyAg ICAgICAgX3BhcmVudC0+cmVxdWVzdERpZFN1Y2NlZWQoa2V5UmVxdWVzdCk7Cit9CisKIC0gKEJP T0wpY29udGVudEtleVNlc3Npb246KEFWQ29udGVudEtleVNlc3Npb24gKilzZXNzaW9uIHNob3Vs ZFJldHJ5Q29udGVudEtleVJlcXVlc3Q6KEFWQ29udGVudEtleVJlcXVlc3QgKilrZXlSZXF1ZXN0 IHJlYXNvbjooQVZDb250ZW50S2V5UmVxdWVzdFJldHJ5UmVhc29uKXJldHJ5UmVhc29uCiB7CiAg ICAgVU5VU0VEX1BBUkFNKHNlc3Npb24pOwpAQCAtMzA5LDEwICszMTcsMTYgQEAgdm9pZCBDRE1J bnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6dXBkYXRlTGljZW5zZShjb25zdCBTdHJp bmcmLCBMaWNlbnNlVHkKICAgICBbbV9yZXF1ZXN0IHByb2Nlc3NDb250ZW50S2V5UmVzcG9uc2U6 W2dldEFWQ29udGVudEtleVJlc3BvbnNlQ2xhc3MoKSBjb250ZW50S2V5UmVzcG9uc2VXaXRoRmFp clBsYXlTdHJlYW1pbmdLZXlSZXNwb25zZURhdGE6cmVzcG9uc2VEYXRhLmNyZWF0ZU5TRGF0YSgp LmdldCgpXV07CiAKICAgICAvLyBGSVhNRShyZGFyOi8vcHJvYmxlbS8zNTU5MjI3Nyk6IHN0YXNo IHRoZSBjYWxsYmFjayBhbmQgY2FsbCBpdCBvbmNlIEFWQ29udGVudEtleVJlc3BvbnNlIHN1cHBv cnRzIGEgc3VjY2VzcyBjYWxsYmFjay4KLSAgICBLZXlTdGF0dXNWZWN0b3Iga2V5U3RhdHVzZXM7 Ci0gICAga2V5U3RhdHVzZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eSgxKTsKLSAgICBrZXlTdGF0 dXNlcy51bmNoZWNrZWRBcHBlbmQoc3RkOjptYWtlX3BhaXIoV1RGTW92ZShrZXlJRHMuZmlyc3Qo KSksIEtleVN0YXR1czo6VXNhYmxlKSk7Ci0gICAgY2FsbGJhY2soZmFsc2UsIHN0ZDo6bWFrZV9v cHRpb25hbChXVEZNb3ZlKGtleVN0YXR1c2VzKSksIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0 LCBTdWNjZWVkZWQpOworICAgIHN0cnVjdCBvYmpjX21ldGhvZF9kZXNjcmlwdGlvbiBtZXRob2Qg PSBwcm90b2NvbF9nZXRNZXRob2REZXNjcmlwdGlvbihAcHJvdG9jb2woQVZDb250ZW50S2V5U2Vz c2lvbkRlbGVnYXRlKSwgQHNlbGVjdG9yKGNvbnRlbnRLZXlTZXNzaW9uOmNvbnRlbnRLZXlSZXF1 ZXN0RGlkU3VjY2VlZDopLCBOTywgWUVTKTsKKyAgICBpZiAoIW1ldGhvZC5uYW1lKSB7CisgICAg ICAgIEtleVN0YXR1c1ZlY3RvciBrZXlTdGF0dXNlczsKKyAgICAgICAga2V5U3RhdHVzZXMucmVz ZXJ2ZUluaXRpYWxDYXBhY2l0eSgxKTsKKyAgICAgICAga2V5U3RhdHVzZXMudW5jaGVja2VkQXBw ZW5kKHN0ZDo6bWFrZV9wYWlyKFdURk1vdmUoa2V5SURzLmZpcnN0KCkpLCBLZXlTdGF0dXM6OlVz YWJsZSkpOworICAgICAgICBjYWxsYmFjayhmYWxzZSwgc3RkOjptYWtlX29wdGlvbmFsKFdURk1v dmUoa2V5U3RhdHVzZXMpKSwgc3RkOjpudWxsb3B0LCBzdGQ6Om51bGxvcHQsIFN1Y2NlZWRlZCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX3VwZGF0ZUxpY2Vuc2VDYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spOwogfQogCiB2b2lkIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1p bmdBVkZPYmpDOjpsb2FkU2Vzc2lvbihMaWNlbnNlVHlwZSBsaWNlbnNlVHlwZSwgY29uc3QgU3Ry aW5nJiBzZXNzaW9uSWQsIGNvbnN0IFN0cmluZyYgb3JpZ2luLCBMb2FkU2Vzc2lvbkNhbGxiYWNr IGNhbGxiYWNrKQpAQCAtNDY5LDggKzQ4MywyMSBAQCB2b2lkIENETUluc3RhbmNlRmFpclBsYXlT dHJlYW1pbmdBVkZPYmpDOjpkaWRGYWlsVG9Qcm92aWRlUmVxdWVzdChBVkNvbnRlbnRLZXlSZQog ewogICAgIFVOVVNFRF9QQVJBTShyZXF1ZXN0KTsKICAgICBVTlVTRURfUEFSQU0oZXJyb3IpOwot ICAgIGlmIChtX3JlcXVlc3RMaWNlbnNlQ2FsbGJhY2spCi0gICAgICAgIG1fcmVxdWVzdExpY2Vu c2VDYWxsYmFjayhTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpLCBtX3Nlc3Npb25JZCwgZmFsc2UsIEZh aWxlZCk7CisgICAgaWYgKG1fdXBkYXRlTGljZW5zZUNhbGxiYWNrKQorICAgICAgICBtX3VwZGF0 ZUxpY2Vuc2VDYWxsYmFjayhmYWxzZSwgc3RkOjpudWxsb3B0LCBzdGQ6Om51bGxvcHQsIHN0ZDo6 bnVsbG9wdCwgRmFpbGVkKTsKK30KKwordm9pZCBDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5n QVZGT2JqQzo6cmVxdWVzdERpZFN1Y2NlZWQoQVZDb250ZW50S2V5UmVxdWVzdCAqcmVxdWVzdCkK K3sKKyAgICBVTlVTRURfUEFSQU0ocmVxdWVzdCk7CisgICAgaWYgKCFtX3VwZGF0ZUxpY2Vuc2VD YWxsYmFjaykKKyAgICAgICAgcmV0dXJuOworCisgICAgVmVjdG9yPFJlZjxTaGFyZWRCdWZmZXI+ PiBrZXlJRHMgPSB0aGlzLT5rZXlJRHMoKTsKKyAgICBLZXlTdGF0dXNWZWN0b3Iga2V5U3RhdHVz ZXM7CisgICAga2V5U3RhdHVzZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eSgxKTsKKyAgICBrZXlT dGF0dXNlcy51bmNoZWNrZWRBcHBlbmQoc3RkOjptYWtlX3BhaXIoV1RGTW92ZShrZXlJRHMuZmly c3QoKSksIEtleVN0YXR1czo6VXNhYmxlKSk7CisgICAgbV91cGRhdGVMaWNlbnNlQ2FsbGJhY2so ZmFsc2UsIHN0ZDo6bWFrZV9vcHRpb25hbChXVEZNb3ZlKGtleVN0YXR1c2VzKSksIHN0ZDo6bnVs bG9wdCwgc3RkOjpudWxsb3B0LCBTdWNjZWVkZWQpOwogfQogCiBib29sIENETUluc3RhbmNlRmFp clBsYXlTdHJlYW1pbmdBVkZPYmpDOjpzaG91bGRSZXRyeVJlcXVlc3RGb3JSZWFzb24oQVZDb250 ZW50S2V5UmVxdWVzdCAqcmVxdWVzdCwgTlNTdHJpbmcgKnJlYXNvbikK