168384 2017-02-15 11:53:20 -0800 [WebIDL] Remove custom conversion from FontFace code by using a Variant 2017-02-15 15:39:57 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 1277295 0 sam 2017-02-15 11:53:20 -0800 [WebIDL] Remove custom conversion from FontFace code by using a Variant 1277298 1 301642 sam 2017-02-15 12:01:41 -0800 Created attachment 301642 Patch 1277320 2 301642 achristensen 2017-02-15 13:43:33 -0800 Comment on attachment 301642 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301642&action=review > Source/WebCore/css/FontFace.idl:47 > - Constructor(DOMString family, any source, optional FontFaceDescriptors descriptors) > + Constructor(DOMString family, (DOMString or BinaryData) source, optional FontFaceDescriptors descriptors) Did you used to be able to call this with JSValues that were not ArrayBuffers or ArrayBufferViews? Could you add a test that verifies that that can't be done any more? 1277334 3 sam 2017-02-15 14:02:21 -0800 (In reply to comment #2) > Comment on attachment 301642 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301642&action=review > > > Source/WebCore/css/FontFace.idl:47 > > - Constructor(DOMString family, any source, optional FontFaceDescriptors descriptors) > > + Constructor(DOMString family, (DOMString or BinaryData) source, optional FontFaceDescriptors descriptors) > > Did you used to be able to call this with JSValues that were not > ArrayBuffers or ArrayBufferViews? Could you add a test that verifies that > that can't be done any more? Good idea. I think the old code was wrong, in that it should be converting anything that is not a ArrayBuffer or ArrayBufferView to a String. I'll add a test. 1277396 4 sam 2017-02-15 15:39:57 -0800 Committed r212405: <http://trac.webkit.org/changeset/212405> 301642 2017-02-15 12:01:41 -0800 2017-02-15 13:43:33 -0800 Patch bug-168384-20170215115906.patch text/plain 6079 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE3LTAyLTE1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYklETF0gUmVtb3ZlIGN1c3RvbSBj b252ZXJzaW9uIGZyb20gRm9udEZhY2UgY29kZSBieSB1c2luZyBhIFZhcmlhbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODM4NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hdGNoIHRoZSBmb250IGZh Y2Ugc3BlYyBhbmQgdXNlIGEgdW5pb24gcmF0aGVyIHRoYW4gYW55IGluIHRoZSBGb250RmFjZSBj b25zdHJ1Y3Rvci4KKworICAgICAgICAqIGNzcy9Gb250RmFjZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250RmFjZTo6Y3JlYXRlKToKKyAgICAgICAgKiBjc3MvRm9udEZhY2UuaDoKKyAgICAg ICAgKiBjc3MvRm9udEZhY2UuaWRsOgorCiAyMDE3LTAyLTE1ICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFBhc3MgIlJlcXVpcmVzQ3VzdG9tVVJMTG9hZGluZyIg aW4gQVZVUkxBc3NldCBvcHRpb25zIGRpY3Rpb25hcnkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz cy9Gb250RmFjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNl LmNwcAkocmV2aXNpb24gMjEyMzY4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsOSBAQAogI2luY2x1ZGUgIkZvbnRWYXJpYW50 QnVpbGRlci5oIgogI2luY2x1ZGUgIkpTRm9udEZhY2UuaCIKICNpbmNsdWRlICJTdHlsZVByb3Bl cnRpZXMuaCIKKyNpbmNsdWRlIDxydW50aW1lL0FycmF5QnVmZmVyLmg+CisjaW5jbHVkZSA8cnVu dGltZS9BcnJheUJ1ZmZlclZpZXcuaD4KKyNpbmNsdWRlIDxydW50aW1lL0pTQ0lubGluZXMuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00Niw5ICs0OSw4IEBAIHN0YXRpYyBib29sIHBv cHVsYXRlRm9udEZhY2VXaXRoQXJyYXlCdWYKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUV4Y2Vw dGlvbk9yPFJlZjxGb250RmFjZT4+IEZvbnRGYWNlOjpjcmVhdGUoSlNDOjpFeGVjU3RhdGUmIHN0 YXRlLCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFN0cmluZyYgZmFtaWx5LCBKU0M6OkpTVmFs dWUgc291cmNlLCBjb25zdCBEZXNjcmlwdG9ycyYgZGVzY3JpcHRvcnMpCitFeGNlcHRpb25PcjxS ZWY8Rm9udEZhY2U+PiBGb250RmFjZTo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3Qg U3RyaW5nJiBmYW1pbHksIFNvdXJjZSYmIHNvdXJjZSwgY29uc3QgRGVzY3JpcHRvcnMmIGRlc2Ny aXB0b3JzKQogewotICAgIEpTQzo6Vk0mIHZtID0gc3RhdGUudm0oKTsKICAgICBhdXRvIHJlc3Vs dCA9IGFkb3B0UmVmKCpuZXcgRm9udEZhY2UoZG9jdW1lbnQuZm9udFNlbGVjdG9yKCkpKTsKIAog ICAgIGJvb2wgZGF0YVJlcXVpcmVzQXN5bmNocm9ub3VzTG9hZGluZyA9IHRydWU7CkBAIC01Nywx NyArNTksMjcgQEAgRXhjZXB0aW9uT3I8UmVmPEZvbnRGYWNlPj4gRm9udEZhY2U6OmNyZQogICAg IGlmIChzZXRGYW1pbHlSZXN1bHQuaGFzRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBzZXRG YW1pbHlSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwogCi0gICAgaWYgKHNvdXJjZS5pc1N0cmlu ZygpKSB7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBGb250RmFjZTo6cGFyc2VTdHJpbmcoYXNTdHJp bmcoc291cmNlKS0+dmFsdWUoJnN0YXRlKSwgQ1NTUHJvcGVydHlTcmMpOwotICAgICAgICBpZiAo IWlzPENTU1ZhbHVlTGlzdD4odmFsdWUuZ2V0KCkpKQotICAgICAgICAgICAgcmV0dXJuIEV4Y2Vw dGlvbiB7IFNZTlRBWF9FUlIgfTsKLSAgICAgICAgQ1NTRm9udEZhY2U6OmFwcGVuZFNvdXJjZXMo cmVzdWx0LT5iYWNraW5nKCksIGRvd25jYXN0PENTU1ZhbHVlTGlzdD4oKnZhbHVlKSwgJmRvY3Vt ZW50LCBmYWxzZSk7Ci0gICAgfSBlbHNlIGlmIChhdXRvIGFycmF5QnVmZmVyVmlldyA9IHRvVW5z aGFyZWRBcnJheUJ1ZmZlclZpZXcodm0sIHNvdXJjZSkpCi0gICAgICAgIGRhdGFSZXF1aXJlc0Fz eW5jaHJvbm91c0xvYWRpbmcgPSBwb3B1bGF0ZUZvbnRGYWNlV2l0aEFycmF5QnVmZmVyKHJlc3Vs dC0+YmFja2luZygpLCBhcnJheUJ1ZmZlclZpZXcucmVsZWFzZU5vbk51bGwoKSk7Ci0gICAgZWxz ZSBpZiAoYXV0byBhcnJheUJ1ZmZlciA9IHRvVW5zaGFyZWRBcnJheUJ1ZmZlcih2bSwgc291cmNl KSkgewotICAgICAgICBhdXRvIGFycmF5QnVmZmVyVmlldyA9IEpTQzo6VWludDhBcnJheTo6Y3Jl YXRlKGFycmF5QnVmZmVyLCAwLCBhcnJheUJ1ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKLSAgICAgICAg ZGF0YVJlcXVpcmVzQXN5bmNocm9ub3VzTG9hZGluZyA9IHBvcHVsYXRlRm9udEZhY2VXaXRoQXJy YXlCdWZmZXIocmVzdWx0LT5iYWNraW5nKCksIGFycmF5QnVmZmVyVmlldy5yZWxlYXNlTm9uTnVs bCgpKTsKLSAgICB9CisgICAgYXV0byBzb3VyY2VDb252ZXJzaW9uUmVzdWx0ID0gV1RGOjpzd2l0 Y2hPbihzb3VyY2UsCisgICAgICAgIFsmXSAoU3RyaW5nJiBzdHJpbmcpIC0+IEV4Y2VwdGlvbk9y PHZvaWQ+IHsKKyAgICAgICAgICAgIGF1dG8gdmFsdWUgPSBGb250RmFjZTo6cGFyc2VTdHJpbmco c3RyaW5nLCBDU1NQcm9wZXJ0eVNyYyk7CisgICAgICAgICAgICBpZiAoIWlzPENTU1ZhbHVlTGlz dD4odmFsdWUuZ2V0KCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBTWU5U QVhfRVJSIH07CisgICAgICAgICAgICBDU1NGb250RmFjZTo6YXBwZW5kU291cmNlcyhyZXN1bHQt PmJhY2tpbmcoKSwgZG93bmNhc3Q8Q1NTVmFsdWVMaXN0PigqdmFsdWUpLCAmZG9jdW1lbnQsIGZh bHNlKTsKKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAgIH0sCisgICAgICAgIFsmXSAo UmVmUHRyPEFycmF5QnVmZmVyVmlldz4mIGFycmF5QnVmZmVyVmlldykgLT4gRXhjZXB0aW9uT3I8 dm9pZD4geworICAgICAgICAgICAgZGF0YVJlcXVpcmVzQXN5bmNocm9ub3VzTG9hZGluZyA9IHBv cHVsYXRlRm9udEZhY2VXaXRoQXJyYXlCdWZmZXIocmVzdWx0LT5iYWNraW5nKCksIGFycmF5QnVm ZmVyVmlldy5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAg ICAgIH0sCisgICAgICAgIFsmXSAoUmVmUHRyPEFycmF5QnVmZmVyPiYgYXJyYXlCdWZmZXIpIC0+ IEV4Y2VwdGlvbk9yPHZvaWQ+IHsKKyAgICAgICAgICAgIGF1dG8gYXJyYXlCdWZmZXJWaWV3ID0g SlNDOjpVaW50OEFycmF5OjpjcmVhdGUoYXJyYXlCdWZmZXIsIDAsIGFycmF5QnVmZmVyLT5ieXRl TGVuZ3RoKCkpOworICAgICAgICAgICAgZGF0YVJlcXVpcmVzQXN5bmNocm9ub3VzTG9hZGluZyA9 IHBvcHVsYXRlRm9udEZhY2VXaXRoQXJyYXlCdWZmZXIocmVzdWx0LT5iYWNraW5nKCksIGFycmF5 QnVmZmVyVmlldy5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAgICAgIHJldHVybiB7IH07Cisg ICAgICAgIH0KKyAgICApOworCisgICAgaWYgKHNvdXJjZUNvbnZlcnNpb25SZXN1bHQuaGFzRXhj ZXB0aW9uKCkpCisgICAgICAgIHJldHVybiBzb3VyY2VDb252ZXJzaW9uUmVzdWx0LnJlbGVhc2VF eGNlcHRpb24oKTsKIAogICAgIC8vIFRoZXNlIHRlcm5hcmllcyBtYXRjaCB0aGUgZGVmYXVsdCBz dHJpbmdzIGluc2lkZSB0aGUgRm9udEZhY2VEZXNjcmlwdG9ycyBkaWN0aW9uYXJ5IGluc2lkZSBG b250RmFjZS5pZGwuCiAgICAgYXV0byBzZXRTdHlsZVJlc3VsdCA9IHJlc3VsdC0+c2V0U3R5bGUo ZGVzY3JpcHRvcnMuc3R5bGUuaXNFbXB0eSgpID8gQVNDSUlMaXRlcmFsKCJub3JtYWwiKSA6IGRl c2NyaXB0b3JzLnN0eWxlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5oCShyZXZpc2lvbiAyMTIz NjgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuaAkod29ya2luZyBjb3B5KQpAQCAt MjgsOCArMjgsMTQgQEAKICNpbmNsdWRlICJDU1NGb250RmFjZS5oIgogI2luY2x1ZGUgIkNTU1By b3BlcnR5TmFtZXMuaCIKICNpbmNsdWRlICJKU0RPTVByb21pc2UuaCIKKyNpbmNsdWRlIDx3dGYv VmFyaWFudC5oPgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKK25hbWVzcGFjZSBKU0Mgewor Y2xhc3MgQXJyYXlCdWZmZXI7CitjbGFzcyBBcnJheUJ1ZmZlclZpZXc7Cit9CisKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogY2xhc3MgRm9udEZhY2UgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxG b250RmFjZT4sIHByaXZhdGUgQ1NTRm9udEZhY2U6OkNsaWVudCB7CkBAIC00Miw3ICs0OCw5IEBA IHB1YmxpYzoKICAgICAgICAgU3RyaW5nIHZhcmlhbnQ7CiAgICAgICAgIFN0cmluZyBmZWF0dXJl U2V0dGluZ3M7CiAgICAgfTsKLSAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmPEZvbnRGYWNlPj4g Y3JlYXRlKEpTQzo6RXhlY1N0YXRlJiwgRG9jdW1lbnQmLCBjb25zdCBTdHJpbmcmIGZhbWlseSwg SlNDOjpKU1ZhbHVlIHNvdXJjZSwgY29uc3QgRGVzY3JpcHRvcnMmKTsKKyAgICAKKyAgICB1c2lu ZyBTb3VyY2UgPSBWYXJpYW50PFN0cmluZywgUmVmUHRyPEpTQzo6QXJyYXlCdWZmZXI+LCBSZWZQ dHI8SlNDOjpBcnJheUJ1ZmZlclZpZXc+PjsKKyAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmPEZv bnRGYWNlPj4gY3JlYXRlKERvY3VtZW50JiwgY29uc3QgU3RyaW5nJiBmYW1pbHksIFNvdXJjZSYm LCBjb25zdCBEZXNjcmlwdG9ycyYpOwogICAgIHN0YXRpYyBSZWY8Rm9udEZhY2U+IGNyZWF0ZShD U1NGb250RmFjZSYpOwogICAgIHZpcnR1YWwgfkZvbnRGYWNlKCk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9Gb250RmFjZS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3Nz L0ZvbnRGYWNlLmlkbAkocmV2aXNpb24gMjEyMzY4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0Zv bnRGYWNlLmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMsOCBAQAogICogVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKK3R5cGVkZWYgKEFycmF5QnVmZmVyIG9yIEFy cmF5QnVmZmVyVmlldykgQmluYXJ5RGF0YTsKKwogZW51bSBGb250RmFjZUxvYWRTdGF0dXMgewog ICAgICJ1bmxvYWRlZCIsCiAgICAgImxvYWRpbmciLApAQCAtNDAsOSArNDIsOSBAQCBkaWN0aW9u YXJ5IEZvbnRGYWNlRGVzY3JpcHRvcnMgewogfTsKIAogWwotICAgIENvbnN0cnVjdG9yQ2FsbFdp dGg9RG9jdW1lbnQmU2NyaXB0U3RhdGUsCisgICAgQ29uc3RydWN0b3JDYWxsV2l0aD1Eb2N1bWVu dCwKICAgICBDb25zdHJ1Y3Rvck1heVRocm93RXhjZXB0aW9uLAotICAgIENvbnN0cnVjdG9yKERP TVN0cmluZyBmYW1pbHksIGFueSBzb3VyY2UsIG9wdGlvbmFsIEZvbnRGYWNlRGVzY3JpcHRvcnMg ZGVzY3JpcHRvcnMpCisgICAgQ29uc3RydWN0b3IoRE9NU3RyaW5nIGZhbWlseSwgKERPTVN0cmlu ZyBvciBCaW5hcnlEYXRhKSBzb3VyY2UsIG9wdGlvbmFsIEZvbnRGYWNlRGVzY3JpcHRvcnMgZGVz Y3JpcHRvcnMpCiBdIGludGVyZmFjZSBGb250RmFjZSB7CiAgICAgW1NldHRlck1heVRocm93RXhj ZXB0aW9uXSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGZhbWlseTsKICAgICBbU2V0dGVyTWF5VGhyb3dF eGNlcHRpb25dIGF0dHJpYnV0ZSBET01TdHJpbmcgc3R5bGU7Cg==