131527 2014-04-10 21:02:43 -0700 [EME][Mac] Using KeySession.update([renew]) should trigger KeyMessage event instead of NeedKey event 2014-04-11 15:18:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn philipj sergio oldest_to_newest 999772 0 jer.noble 2014-04-10 21:02:43 -0700 [EME][Mac] Using KeySession.update([renew]) should trigger KeyMessage event instead of NeedKey event 999774 1 229104 jer.noble 2014-04-10 21:13:30 -0700 Created attachment 229104 Patch 1000056 2 jer.noble 2014-04-11 15:18:19 -0700 Committed r167161: <http://trac.webkit.org/changeset/167161> 229104 2014-04-10 21:13:30 -0700 2014-04-11 09:03:00 -0700 Patch bug-131527-20140410211310.patch text/plain 3521 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI5ZGI5MjdlOWNmZGU4 OGI2NDU1YzQ1OTRkNjMxODlmNmVlYmRhYS4uNGQyNDhkYWViY2E2YTM1ZDcyOTc1YTUxYWY3YTAy NzkwMDRlMGM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTA0LTEwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtFTUVdW01hY10gVXNpbmcg S2V5U2Vzc2lvbi51cGRhdGUoW3JlbmV3XSkgc2hvdWxkIHRyaWdnZXIgS2V5TWVzc2FnZSBldmVu dCBpbnN0ZWFkIG9mIE5lZWRLZXkgZXZlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzMTUyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIHRyaWdnZXJpbmcgYSBuZWVkS2V5KCkgZXZl bnQsIG5lY2Vzc2F0YXRpbmcgdGhlIGNyZWF0aW9uCisgICAgICAgIG9mIGFuIGVudGlyZWx5IG5l dyBNZWRpYUtleVNlc3Npb24sIGNhdXNlIGEgbmV3IGtleSByZXF1ZXN0IHRvIGJlCisgICAgICAg IGNyZWF0ZWQgYnkgc2VuZGluZyB0aGUgc2FtZSBpbml0RGF0YSBiYWNrIGludG8gdGhlIEFWU2Ft cGxlRGF0YVBhcnNlci4KKworICAgICAgICBBbHNvLCBkbyBzb21lIGRyaXZlLWJ5IGNsZWFuIHVw IHN1Z2dlc3RlZCBieSBEYXJpbiBpbiB0aGUgcmV2aWV3IGZvcgorICAgICAgICByMTY2NTA5Lgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lv bk1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmlzRXF1YWwpOiBTdXBw b3J0IGFuIGFsbG9jLWZyZWUgZXF1YWxpdHkgY2hlY2sgYmV0d2VlbgorICAgICAgICAgICAgVWlu dDhBcnJheSBhbmQgc3RhdGljIHN0cmluZ3MuCisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9u TWVkaWFTb3VyY2VBVkZPYmpDOjp1cGRhdGUpOgorCisyMDE0LTA0LTEwICBKZXIgTm9ibGUgIDxq ZXIubm9ibGVAYXBwbGUuY29tPgorCiAgICAgICAgIFtpT1NdW1dLMl0gVmlkZW9zIHNob3VsZCBh bmltYXRlIGludG8gYW5kIG91dCBvZiBmdWxsc2NyZWVuLgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDk3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRp YVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tCmluZGV4IDA0ZjRl OTQyM2Q0NjIyNzY4ZjM4MzFjNzVhNDcyZWMxOGZmNmE0NzIuLjZmMmE2M2VmNjE0NTFhMGY4NDA0 NDdiYzhiNGU0MTIwMTJkMjRjN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtODUsMTMgKzg1LDMyIEBAIHZv aWQgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6cmVsZWFzZUtleXMoKQogICAgIExPRyhN ZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnJlbGVhc2VLZXlzKCVwKSIsIHRo aXMpOwogfQogCitzdGF0aWMgYm9vbCBpc0VxdWFsKFVpbnQ4QXJyYXkqIGRhdGEsIGNvbnN0IGNo YXIqIGxpdGVyYWwpCit7CisgICAgQVNTRVJUKGRhdGEpOworICAgIEFTU0VSVChsaXRlcmFsKTsK KyAgICB1bnNpZ25lZCBsZW5ndGggPSBkYXRhLT5sZW5ndGgoKTsKKworICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgeworICAgICAgICBpZiAoIWxpdGVyYWxbaV0pCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgaWYgKGRhdGEtPml0ZW0oaSkgIT0g c3RhdGljX2Nhc3Q8dWludDhfdD4obGl0ZXJhbFtpXSkpCisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgfQorICAgIHJldHVybiAhbGl0ZXJhbFtsZW5ndGhdOworfQorCiBib29sIENETVNl c3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnVwZGF0ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxV aW50OEFycmF5PiYgbmV4dE1lc3NhZ2UsIHVuc2lnbmVkIHNob3J0JiBlcnJvckNvZGUsIHVuc2ln bmVkIGxvbmcmIHN5c3RlbUNvZGUpCiB7CisgICAgYm9vbCBzaG91bGRHZW5lcmF0ZUtleVJlcXVl c3QgPSAhbV9jZXJ0aWZpY2F0ZSB8fCBpc0VxdWFsKGtleSwgInJlbmV3Iik7CiAgICAgaWYgKCFt X2NlcnRpZmljYXRlKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJj ZUFWRk9iakM6OnVwZGF0ZSglcCkgLSBjZXJ0aWZpY2F0ZSBkYXRhIiwgdGhpcyk7CiAKICAgICAg ICAgbV9jZXJ0aWZpY2F0ZSA9IGtleTsKKyAgICB9CiAKKyAgICBpZiAoc2hvdWxkR2VuZXJhdGVL ZXlSZXF1ZXN0KSB7CiAgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGNlcnRpZmljYXRlRGF0YSA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6bV9jZXJ0aWZpY2F0ZS0+ZGF0 YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwogICAgICAgICBSZXRhaW5QdHI8 TlNEYXRhPiBpbml0RGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6 bV9pbml0RGF0YS0+ZGF0YSgpIGxlbmd0aDptX2luaXREYXRhLT5sZW5ndGgoKV0pOwogCkBAIC0x MTAsMTQgKzEyOSw2IEBAIGJvb2wgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6dXBkYXRl KFVpbnQ4QXJyYXkqIGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CiAKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiByZW5ld01l c3NhZ2UoInJlbmV3Iik7Ci0gICAgU3RyaW5nIGtleUFzU3RyaW5nKGtleS0+ZGF0YSgpLCBrZXkt Pmxlbmd0aCgpKTsKLQotICAgIGlmIChrZXlBc1N0cmluZyA9PSByZW5ld01lc3NhZ2UpIHsKLSAg ICAgICAgW21fcGFyZW50LT5wYXJzZXIoKSByZW5ld0V4cGlyaW5nQ29udGVudEtleVJlc3BvbnNl RGF0YUZvclRyYWNrSUQ6bV9wYXJlbnQtPnByb3RlY3RlZFRyYWNrSUQoKV07Ci0gICAgICAgIHJl dHVybiB0cnVlOwotICAgIH0KLQogICAgIExPRyhNZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJj ZUFWRk9iakM6OnVwZGF0ZSglcCkgLSBrZXkgZGF0YSIsIHRoaXMpOwogICAgIGVycm9yQ29kZSA9 IE1lZGlhUGxheWVyOjpOb0Vycm9yOwogICAgIHN5c3RlbUNvZGUgPSAwOwo=