157172 2016-04-29 03:34:10 -0700 [OpenType] OpenTypeVerticalData object should not be created if the font is not OpenType 2016-05-03 01:17:46 -0700 1 1 1 Unclassified WebKit Platform WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned commit-queue darin mmaxfield mrobinson oldest_to_newest 1188574 0 cgarcia 2016-04-29 03:34:10 -0700 It's a bit weird that the object is always created and has an isOpenType() method to check whether it's an OpenType or not. The caller is always deleting the object when it's not an OpenType, so it would be better if the create method returned nullptr instead of creating the object when the font is not OpenType. 1188578 1 277690 cgarcia 2016-04-29 03:39:49 -0700 Created attachment 277690 Patch 1188646 2 277690 darin 2016-04-29 09:35:16 -0700 Comment on attachment 277690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277690&action=review > Source/WebCore/platform/graphics/FontCache.cpp:322 > auto addResult = fontVerticalDataCache().add(platformData, nullptr); > - if (addResult.isNewEntry) { > - RefPtr<OpenTypeVerticalData> data = OpenTypeVerticalData::create(platformData); > - addResult.iterator->value = data->isOpenType() ? WTFMove(data) : nullptr; > - } > + if (addResult.isNewEntry) > + addResult.iterator->value = OpenTypeVerticalData::create(platformData); This is now a perfect candidate for using the new "ensure" function instead of add. 1189700 3 cgarcia 2016-05-03 01:17:46 -0700 Committed r200364: <http://trac.webkit.org/changeset/200364> 277690 2016-04-29 03:39:49 -0700 2016-04-29 04:18:25 -0700 Patch wcore-open-type.diff text/plain 7359 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MzdmOTFlLi5lNTdhNTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTYtMDQtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtPcGVuVHlwZV0gT3BlblR5cGVWZXJ0aWNhbERhdGEgb2JqZWN0IHNob3Vs ZCBub3QgYmUgY3JlYXRlZCBpZiB0aGUgZm9udCBpcyBub3QgT3BlblR5cGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzE3MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0J3MgYSBiaXQgd2VpcmQgdGhh dCB0aGUgb2JqZWN0IGlzIGFsd2F5cyBjcmVhdGVkIGFuZCBoYXMgYW4gaXNPcGVuVHlwZSgpIG1l dGhvZCB0byBjaGVjayB3aGV0aGVyIGl0J3MgYW4KKyAgICAgICAgT3BlblR5cGUgb3Igbm90LiBU aGUgY2FsbGVyIGlzIGFsd2F5cyBkZWxldGluZyB0aGUgb2JqZWN0IHdoZW4gaXQncyBub3QgYW4g T3BlblR5cGUsIHNvIGl0IHdvdWxkIGJlIGJldHRlciBpZgorICAgICAgICB0aGUgY3JlYXRlIG1l dGhvZCByZXR1cm5lZCBudWxscHRyIGluc3RlYWQgb2YgY3JlYXRpbmcgdGhlIG9iamVjdCB3aGVu IHRoZSBmb250IGlzIG5vdCBPcGVuVHlwZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OnZlcnRpY2FsRGF0 YSk6IERvIG5vdCB1c2UgaXNPcGVuVHlwZSgpLCB3ZSBjYW4gbm93IHNpbXBseSB1c2UgdGhlIHJl dHVybiB2YWx1ZSBvZiBPcGVuVHlwZVZlcnRpY2FsRGF0YTo6Y3JlYXRlKCkuCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVWZXJ0aWNhbERhdGEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bG9hZEhtdHhUYWJsZSk6IE1vdmVkIHRvIGEgaGVscGVyIGZ1bnRpb24g dGhhdCByZXR1cm5zIGZhbHNlIGlmIHRoZSBmb250IGlzIG5vdCBPcGVuVHlwZS4KKyAgICAgICAg KFdlYkNvcmU6Ok9wZW5UeXBlVmVydGljYWxEYXRhOjpjcmVhdGUpOiBUcnkgdG8gbG9hZCB0aGUg SG10eCB0YWJsZSwgYW5kIGNyZWF0ZSB0aGUgb2JqZWN0IGlmIHN1Y2NlZWRlZCBvcgorICAgICAg ICByZXR1cm4gbnVsbHB0ciBvdGhlcndpc2UuCisgICAgICAgIChXZWJDb3JlOjpPcGVuVHlwZVZl cnRpY2FsRGF0YTo6T3BlblR5cGVWZXJ0aWNhbERhdGEpOiBSZWNlaXZlIHRoZSBhZHZhbmNlV2lk dGhzIGFzIGNvbnN0cnVjdG9yIHBhcmFtZXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok9wZW5UeXBl VmVydGljYWxEYXRhOjpsb2FkTWV0cmljcyk6IExvYWQgYWxsIG90aGVyIHRhYmxlcy4KKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVZlcnRpY2FsRGF0YS5oOgor ICAgICAgICAoV2ViQ29yZTo6T3BlblR5cGVWZXJ0aWNhbERhdGE6OmlzT3BlblR5cGUpOiBEZWxl dGVkLgorCisyMDE2LTA0LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKwogICAgICAgICBbRnJlZVR5cGVdIEFTU0VSVElPTiBGQUlMRUQ6ICFsb29rdXBGb3JX cml0aW5nKEV4dHJhY3Rvcjo6ZXh0cmFjdChlbnRyeSkpLnNlY29uZCBpbiBGb250Q2FjaGU6Omdl dFZlcnRpY2FsRGF0YSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTcxMzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zv bnRDYWNoZS5jcHAKaW5kZXggODA0OTZmZS4uY2IxNjkxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCkBAIC0zMTgsMTAgKzMxOCw4IEBAIEZv bnRWZXJ0aWNhbERhdGFDYWNoZSYgZm9udFZlcnRpY2FsRGF0YUNhY2hlKCkKIFJlZlB0cjxPcGVu VHlwZVZlcnRpY2FsRGF0YT4gRm9udENhY2hlOjp2ZXJ0aWNhbERhdGEoY29uc3QgRm9udFBsYXRm b3JtRGF0YSYgcGxhdGZvcm1EYXRhKQogewogICAgIGF1dG8gYWRkUmVzdWx0ID0gZm9udFZlcnRp Y2FsRGF0YUNhY2hlKCkuYWRkKHBsYXRmb3JtRGF0YSwgbnVsbHB0cik7Ci0gICAgaWYgKGFkZFJl c3VsdC5pc05ld0VudHJ5KSB7Ci0gICAgICAgIFJlZlB0cjxPcGVuVHlwZVZlcnRpY2FsRGF0YT4g ZGF0YSA9IE9wZW5UeXBlVmVydGljYWxEYXRhOjpjcmVhdGUocGxhdGZvcm1EYXRhKTsKLSAgICAg ICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IGRhdGEtPmlzT3BlblR5cGUoKSA/IFdURk1v dmUoZGF0YSkgOiBudWxscHRyOwotICAgIH0KKyAgICBpZiAoYWRkUmVzdWx0LmlzTmV3RW50cnkp CisgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSBPcGVuVHlwZVZlcnRpY2FsRGF0 YTo6Y3JlYXRlKHBsYXRmb3JtRGF0YSk7CiAgICAgcmV0dXJuIGFkZFJlc3VsdC5pdGVyYXRvci0+ dmFsdWU7CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW50eXBlL09wZW5UeXBlVmVydGljYWxEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVmVydGljYWxEYXRhLmNwcAppbmRl eCAwNjhmMjFhLi5mMmU2ODEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVZlcnRpY2FsRGF0YS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVWZXJ0aWNhbERhdGEuY3Bw CkBAIC0zNzksMzkgKzM3OSw1MiBAQCBzdHJ1Y3QgR1NVQlRhYmxlIDogVGFibGVCYXNlIHsKIAog fSAvLyBuYW1lc3BhY2UgT3BlblR5cGUKIAotT3BlblR5cGVWZXJ0aWNhbERhdGE6Ok9wZW5UeXBl VmVydGljYWxEYXRhKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSkKLSAgICA6 IG1fZGVmYXVsdFZlcnRPcmlnaW5ZKDApCitzdGF0aWMgYm9vbCBsb2FkSG10eFRhYmxlKGNvbnN0 IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgVmVjdG9yPHVpbnQxNl90PiYgYWR2YW5j ZVdpZHRocykKIHsKLSAgICBsb2FkTWV0cmljcyhwbGF0Zm9ybURhdGEpOwotICAgIGxvYWRWZXJ0 aWNhbEdseXBoU3Vic3RpdHV0aW9ucyhwbGF0Zm9ybURhdGEpOwotfQotCi12b2lkIE9wZW5UeXBl VmVydGljYWxEYXRhOjpsb2FkTWV0cmljcyhjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9y bURhdGEpCi17Ci0gICAgLy8gTG9hZCBoaGVhIGFuZCBobXR4IHRvIGdldCB4LWNvbXBvbmVudCBv ZiB2ZXJ0aWNhbCBvcmlnaW5zLgotICAgIC8vIElmIHRoZXNlIHRhYmxlcyBhcmUgbWlzc2luZywg aXQncyBub3QgYW4gT3BlblR5cGUgZm9udC4KICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZm ZXIgPSBwbGF0Zm9ybURhdGEub3BlblR5cGVUYWJsZShPcGVuVHlwZTo6SGhlYVRhZyk7CiAgICAg Y29uc3QgT3BlblR5cGU6OkhoZWFUYWJsZSogaGhlYSA9IE9wZW5UeXBlOjp2YWxpZGF0ZVRhYmxl PE9wZW5UeXBlOjpIaGVhVGFibGU+KGJ1ZmZlcik7CiAgICAgaWYgKCFoaGVhKQotICAgICAgICBy ZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB1aW50MTZfdCBjb3VudEhtdHhFbnRy aWVzID0gaGhlYS0+bnVtYmVyT2ZITWV0cmljczsKICAgICBpZiAoIWNvdW50SG10eEVudHJpZXMp IHsKICAgICAgICAgTE9HX0VSUk9SKCJJbnZhbGlkIG51bWJlck9mSE1ldHJpY3MiKTsKLSAgICAg ICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgYnVmZmVyID0g cGxhdGZvcm1EYXRhLm9wZW5UeXBlVGFibGUoT3BlblR5cGU6OkhtdHhUYWcpOwogICAgIGNvbnN0 IE9wZW5UeXBlOjpIbXR4VGFibGUqIGhtdHggPSBPcGVuVHlwZTo6dmFsaWRhdGVUYWJsZTxPcGVu VHlwZTo6SG10eFRhYmxlPihidWZmZXIsIGNvdW50SG10eEVudHJpZXMpOwogICAgIGlmICghaG10 eCkgewogICAgICAgICBMT0dfRVJST1IoImhoZWEgZXhpc3RzIGJ1dCBobXR4IGRvZXMgbm90IChv ciBicm9rZW4pIik7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KLSAgICBtX2FkdmFuY2VXaWR0aHMucmVzaXplKGNvdW50SG10eEVudHJpZXMpOworCisgICAg YWR2YW5jZVdpZHRocy5yZXNpemUoY291bnRIbXR4RW50cmllcyk7CiAgICAgZm9yICh1aW50MTZf dCBpID0gMDsgaSA8IGNvdW50SG10eEVudHJpZXM7ICsraSkKLSAgICAgICAgbV9hZHZhbmNlV2lk dGhzW2ldID0gaG10eC0+ZW50cmllc1tpXS5hZHZhbmNlV2lkdGg7CisgICAgICAgIGFkdmFuY2VX aWR0aHNbaV0gPSBobXR4LT5lbnRyaWVzW2ldLmFkdmFuY2VXaWR0aDsKKyAgICByZXR1cm4gdHJ1 ZTsKK30KIAorUmVmUHRyPE9wZW5UeXBlVmVydGljYWxEYXRhPiBPcGVuVHlwZVZlcnRpY2FsRGF0 YTo6Y3JlYXRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSkKK3sKKyAgICAv LyBMb2FkIGhoZWEgYW5kIGhtdHggdG8gZ2V0IHgtY29tcG9uZW50IG9mIHZlcnRpY2FsIG9yaWdp bnMuIElmIHRoZXNlIHRhYmxlcyBhcmUgbWlzc2luZywgaXQncyBub3QgYW4gT3BlblR5cGUgZm9u dC4KKyAgICBWZWN0b3I8dWludDE2X3Q+IGFkdmFuY2VXaWR0aHM7CisgICAgaWYgKCFsb2FkSG10 eFRhYmxlKHBsYXRmb3JtRGF0YSwgYWR2YW5jZVdpZHRocykpCisgICAgICAgIHJldHVybiBudWxs cHRyOworCisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBPcGVuVHlwZVZlcnRpY2FsRGF0YShwbGF0 Zm9ybURhdGEsIFdURk1vdmUoYWR2YW5jZVdpZHRocykpKTsKK30KKworT3BlblR5cGVWZXJ0aWNh bERhdGE6Ok9wZW5UeXBlVmVydGljYWxEYXRhKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRm b3JtRGF0YSwgVmVjdG9yPHVpbnQxNl90PiYmIGFkdmFuY2VXaWR0aHMpCisgICAgOiBtX2FkdmFu Y2VXaWR0aHMoV1RGTW92ZShhZHZhbmNlV2lkdGhzKSkKK3sKKyAgICBsb2FkTWV0cmljcyhwbGF0 Zm9ybURhdGEpOworICAgIGxvYWRWZXJ0aWNhbEdseXBoU3Vic3RpdHV0aW9ucyhwbGF0Zm9ybURh dGEpOworfQorCit2b2lkIE9wZW5UeXBlVmVydGljYWxEYXRhOjpsb2FkTWV0cmljcyhjb25zdCBG b250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEpCit7CiAgICAgLy8gTG9hZCB2aGVhIGZpcnN0 LiBUaGlzIHRhYmxlIGlzIHJlcXVpcmVkIGZvciBmb250cyB0aGF0IHN1cHBvcnQgdmVydGljYWwg Zmxvdy4KLSAgICBidWZmZXIgPSBwbGF0Zm9ybURhdGEub3BlblR5cGVUYWJsZShPcGVuVHlwZTo6 VmhlYVRhZyk7CisgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gcGxhdGZvcm1EYXRh Lm9wZW5UeXBlVGFibGUoT3BlblR5cGU6OlZoZWFUYWcpOwogICAgIGNvbnN0IE9wZW5UeXBlOjpW aGVhVGFibGUqIHZoZWEgPSBPcGVuVHlwZTo6dmFsaWRhdGVUYWJsZTxPcGVuVHlwZTo6VmhlYVRh YmxlPihidWZmZXIpOwogICAgIGlmICghdmhlYSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVWZXJ0 aWNhbERhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09w ZW5UeXBlVmVydGljYWxEYXRhLmgKaW5kZXggZmMzMmQ1ZC4uNjI3YjEyOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVWZXJ0aWNh bERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9P cGVuVHlwZVZlcnRpY2FsRGF0YS5oCkBAIC00MSwxOSArNDEsMTUgQEAgY2xhc3MgR2x5cGhQYWdl OwogCiBjbGFzcyBPcGVuVHlwZVZlcnRpY2FsRGF0YSA6IHB1YmxpYyBSZWZDb3VudGVkPE9wZW5U eXBlVmVydGljYWxEYXRhPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8T3BlblR5 cGVWZXJ0aWNhbERhdGE+IGNyZWF0ZShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURh dGEpCi0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE9wZW5UeXBlVmVydGljYWxE YXRhKHBsYXRmb3JtRGF0YSkpOwotICAgIH0KKyAgICBzdGF0aWMgUmVmUHRyPE9wZW5UeXBlVmVy dGljYWxEYXRhPiBjcmVhdGUoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYpOwogCi0gICAgYm9vbCBp c09wZW5UeXBlKCkgY29uc3QgeyByZXR1cm4gIW1fYWR2YW5jZVdpZHRocy5pc0VtcHR5KCk7IH0K ICAgICBib29sIGhhc1ZlcnRpY2FsTWV0cmljcygpIGNvbnN0IHsgcmV0dXJuICFtX2FkdmFuY2VI ZWlnaHRzLmlzRW1wdHkoKTsgfQogICAgIGZsb2F0IGFkdmFuY2VIZWlnaHQoY29uc3QgRm9udCos IEdseXBoKSBjb25zdDsKICAgICB2b2lkIGdldFZlcnRpY2FsVHJhbnNsYXRpb25zRm9yR2x5cGhz KGNvbnN0IEZvbnQqLCBjb25zdCBHbHlwaCosIHNpemVfdCwgZmxvYXQqIG91dFhZQXJyYXkpIGNv bnN0OwogICAgIHZvaWQgc3Vic3RpdHV0ZVdpdGhWZXJ0aWNhbEdseXBocyhjb25zdCBGb250Kiwg R2x5cGhQYWdlKikgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgT3BlblR5cGVWZXJ0 aWNhbERhdGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYpOworICAgIGV4cGxpY2l0IE9wZW5UeXBl VmVydGljYWxEYXRhKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmLCBWZWN0b3I8dWludDE2X3Q+JiYg YWR2YW5jZVdpZHRocyk7CiAKICAgICB2b2lkIGxvYWRNZXRyaWNzKGNvbnN0IEZvbnRQbGF0Zm9y bURhdGEmKTsKICAgICB2b2lkIGxvYWRWZXJ0aWNhbEdseXBoU3Vic3RpdHV0aW9ucyhjb25zdCBG b250UGxhdGZvcm1EYXRhJik7CkBAIC02Myw3ICs1OSw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9y PHVpbnQxNl90PiBtX2FkdmFuY2VXaWR0aHM7CiAgICAgVmVjdG9yPHVpbnQxNl90PiBtX2FkdmFu Y2VIZWlnaHRzOwogICAgIFZlY3RvcjxpbnQxNl90PiBtX3RvcFNpZGVCZWFyaW5nczsKLSAgICBp bnQxNl90IG1fZGVmYXVsdFZlcnRPcmlnaW5ZOworICAgIGludDE2X3QgbV9kZWZhdWx0VmVydE9y aWdpblkgeyAwIH07CiAgICAgSGFzaE1hcDxHbHlwaCwgaW50MTZfdD4gbV92ZXJ0T3JpZ2luWTsK IH07CiAK