130919 2014-03-28 16:50:07 -0700 [MSE][Mac] Support lease-renewal. 2014-03-31 10:01:26 -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 995497 0 jer.noble 2014-03-28 16:50:07 -0700 [MSE][Mac] Support lease-renewal. 995500 1 228093 jer.noble 2014-03-28 16:54:58 -0700 Created attachment 228093 Patch 995893 2 228093 commit-queue 2014-03-31 09:43:58 -0700 Comment on attachment 228093 Patch Clearing flags on attachment: 228093 Committed r166509: <http://trac.webkit.org/changeset/166509> 995894 3 commit-queue 2014-03-31 09:44:01 -0700 All reviewed patches have been landed. Closing bug. 995905 4 228093 darin 2014-03-31 10:01:26 -0700 Comment on attachment 228093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228093&action=review > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:116 > + static NeverDestroyed<String> renewMessage("renew"); > + String keyAsString(key->data(), key->length()); > + > + if (keyAsString == renewMessage) { This is a tortured way to check if the key is "renew". I suggest writing a function to do it without memory allocation. Maybe put it in a header somewhere, but at least do it within this file for now: static bool isEqual(const uint8_t* data, unsigned length, const char* literal) { for (unsigned i = 0; i < length; ++i) { if (data[i] != static_cast<uint8_t>(literal[i])) return false; } return !literal[length]; } Then get rid of the renewMessage and keyAsStringLocal variables. And write: if (isEqual(key->data(), key->length(), "renew") { 228093 2014-03-28 16:54:58 -0700 2014-03-31 10:01:26 -0700 Patch bug-130919-20140328165442.patch text/plain 2948 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0Y2FlYjg2ZGVhYThk OWI0MzE4MzhhN2ZjM2ExN2NlNDU3ZDk0Yi4uYWJkYjhiZjkwNmUyYjkwOWVjMGI2YTZhODAxZjg5 OWZkODYzZGM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTAzLTI4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdW01hY10gU3VwcG9y dCBsZWFzZS1yZW5ld2FsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMwOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVHJpZ2dlciBhIG5ldyBrZXkgcmVxdWVzdCB3aGVuIHJlY2VpdmluZyBhbiB1cGRh dGUgbWVzc2FnZSBjb250YWludGluZyAicmVuZXciLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbToK KyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OmdlbmVyYXRl S2V5UmVxdWVzdCk6IERyaXZlLWJ5IGZpeDsgZ2VuZXJhdGUgYSBVVEYtOAorICAgICAgICAgICAg YmFzZWQgYXJyYXkuCisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZP YmpDOjp1cGRhdGUpOgorCisyMDE0LTAzLTI4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgorCiAgICAgICAgIFtNU0VdIEltcGxlbWVudCBzdXBwb3J0IGZvciBTb3VyY2VCdWZmZXIu cmVtb3ZlKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMTU2MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1l ZGlhU291cmNlQVZGT2JqQy5tbQppbmRleCBkNzhkZTI3OWE5Y2Y5Mjc1MjA5YTAyNzE5NTU2MGZk MjllNTZhMjRkLi4wNGY0ZTk0MjNkNDYyMjc2OGYzODMxYzc1YTQ3MmVjMThmZjZhNDcyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFW Rk9iakMubW0KQEAgLTM4LDYgKzM4LDcgQEAKICNpbXBvcnQgIlVVSUQuaCIKICNpbXBvcnQgPENv cmVNZWRpYS9DTUJhc2UuaD4KICNpbXBvcnQgPG9iamMvb2JqYy1ydW50aW1lLmg+CisjaW1wb3J0 IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogU09GVF9MSU5LX0ZSQU1FV09SS19PUFRJT05BTChB VkZvdW5kYXRpb24pCiBTT0ZUX0xJTktfQ0xBU1MoQVZGb3VuZGF0aW9uLCBBVlN0cmVhbURhdGFQ YXJzZXIpOwpAQCAtNzMsMTEgKzc0LDEwIEBAIFBhc3NSZWZQdHI8VWludDhBcnJheT4gQ0RNU2Vz c2lvbk1lZGlhU291cmNlQVZGT2JqQzo6Z2VuZXJhdGVLZXlSZXF1ZXN0KGNvbnN0IFN0CiAgICAg bV9pbml0RGF0YSA9IGluaXREYXRhOwogCiAgICAgU3RyaW5nIGNlcnRpZmljYXRlU3RyaW5nKEFT Q0lJTGl0ZXJhbCgiY2VydGlmaWNhdGUiKSk7Ci0gICAgUmVmUHRyPEFycmF5QnVmZmVyPiBidWZm ZXIgPSBBcnJheUJ1ZmZlcjo6Y3JlYXRlKGNlcnRpZmljYXRlU3RyaW5nLmxlbmd0aCgpLCAyKTsK LSAgICBSZWZQdHI8SlNDOjpVaW50MTZBcnJheT4gYXJyYXkgPSBKU0M6OlVpbnQxNkFycmF5Ojpj cmVhdGUoYnVmZmVyLCAwLCBjZXJ0aWZpY2F0ZVN0cmluZy5sZW5ndGgoKSk7CisgICAgUmVmUHRy PFVpbnQ4QXJyYXk+IGFycmF5ID0gVWludDhBcnJheTo6Y3JlYXRlKGNlcnRpZmljYXRlU3RyaW5n Lmxlbmd0aCgpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwLCBsZW5ndGggPSBjZXJ0aWZpY2F0 ZVN0cmluZy5sZW5ndGgoKTsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICBhcnJheS0+c2V0KGks IGNlcnRpZmljYXRlU3RyaW5nW2ldKTsKLSAgICByZXR1cm4gVWludDhBcnJheTo6Y3JlYXRlKGJ1 ZmZlciwgMCwgYnVmZmVyLT5ieXRlTGVuZ3RoKCkpOworICAgIHJldHVybiBhcnJheTsKIH0KIAog dm9pZCBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZWxlYXNlS2V5cygpCkBAIC0xMTAs NiArMTEwLDE0IEBAIGJvb2wgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6dXBkYXRlKFVp bnQ4QXJyYXkqIGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiByZW5ld01lc3Nh Z2UoInJlbmV3Iik7CisgICAgU3RyaW5nIGtleUFzU3RyaW5nKGtleS0+ZGF0YSgpLCBrZXktPmxl bmd0aCgpKTsKKworICAgIGlmIChrZXlBc1N0cmluZyA9PSByZW5ld01lc3NhZ2UpIHsKKyAgICAg ICAgW21fcGFyZW50LT5wYXJzZXIoKSByZW5ld0V4cGlyaW5nQ29udGVudEtleVJlc3BvbnNlRGF0 YUZvclRyYWNrSUQ6bV9wYXJlbnQtPnByb3RlY3RlZFRyYWNrSUQoKV07CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKwogICAgIExPRyhNZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJjZUFW Rk9iakM6OnVwZGF0ZSglcCkgLSBrZXkgZGF0YSIsIHRoaXMpOwogICAgIGVycm9yQ29kZSA9IE1l ZGlhUGxheWVyOjpOb0Vycm9yOwogICAgIHN5c3RlbUNvZGUgPSAwOwo=