139836 2014-12-19 15:06:03 -0800 [SVG -> OTF Converter] Make placeholders more robust 2014-12-19 20:42:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino d-r fmalita gyuyoung.kim jonlee mitz pdr schenney sergio simon.fraser thorton oldest_to_newest 1057185 0 mmaxfield 2014-12-19 15:06:03 -0800 [SVG -> OTF Converter] Make placeholders more robust 1057187 1 243580 mmaxfield 2014-12-19 15:07:13 -0800 Created attachment 243580 Patch 1057198 2 243580 mitz 2014-12-19 15:35:13 -0800 Comment on attachment 243580 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243580&action=review > Source/WebCore/svg/SVGToOTFFontConversion.cpp:93 > + { Perhaps ASSERT(!m_written) here? > Source/WebCore/svg/SVGToOTFFontConversion.cpp:614 > + Placeholder toCoverageTable(*this, subtableLocation); I think it would have been a little nicer if SVGToOTFFontConverter had a member function that returned a placeholder (and then the Placeholder constructor could be private and friend with that member function), so here you’d just say auto toCoverageTable = appendPlaceholder(subtableLocation); 1057264 3 243580 mmaxfield 2014-12-19 20:28:40 -0800 Comment on attachment 243580 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243580&action=review >> Source/WebCore/svg/SVGToOTFFontConversion.cpp:93 >> + { > > Perhaps ASSERT(!m_written) here? Done. >> Source/WebCore/svg/SVGToOTFFontConversion.cpp:614 >> + Placeholder toCoverageTable(*this, subtableLocation); > > I think it would have been a little nicer if SVGToOTFFontConverter had a member function that returned a placeholder (and then the Placeholder constructor could be private and friend with that member function), so here you’d just say > auto toCoverageTable = appendPlaceholder(subtableLocation); Done. 1057266 4 mmaxfield 2014-12-19 20:42:11 -0800 Committed r177620: <http://trac.webkit.org/changeset/177620> 243580 2014-12-19 15:07:13 -0800 2014-12-19 15:35:13 -0800 Patch bug-139836-20141219150712.patch text/plain 4780 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmN2Q2MTlkYzJiMzAw MzkxOWUwNTFlZDlmOWVjNzcyYjg5N2QzMi4uNWFiNTg1NzgzNzA4YzJhN2ZjNzJhZWU0OGZjNTQ4 NjVlNWM0NDQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTEyLTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBNYWtlIHBsYWNlaG9sZGVycyBtb3JlIHJvYnVzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5ODM2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjcmVhdGVzIGEg UGxhY2Vob2xkZXIgb2JqZWN0IHdoaWNoIGhpZGVzIHRoZSBjb21wbGV4aXR5IG9mCisgICAgICAg IHBvcHVsYXRpbmcgb2Zmc2V0cyB0byBzdWJ0YWJsZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz IGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogc3ZnL1NW R1RvT1RGRm9udENvbnZlcnNpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVG9PVEZGb250 Q29udmVydGVyOjpQbGFjZWhvbGRlcjo6UGxhY2Vob2xkZXIpOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHVG9PVEZGb250Q29udmVydGVyOjpQbGFjZWhvbGRlcjo6cG9wdWxhdGUpOgorICAgICAgICAo V2ViQ29yZTo6U1ZHVG9PVEZGb250Q29udmVydGVyOjpQbGFjZWhvbGRlcjo6flBsYWNlaG9sZGVy KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kQXJhYmlj UmVwbGFjZW1lbnRTdWJ0YWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdUb09URkZvbnRDb252 ZXJ0ZXI6OmFwcGVuZEdTVUJUYWJsZSk6CisKIDIwMTQtMTItMTkgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgV2ViQ29yZTo6TWFjaFNlbmRSaWdo dHMgZm9yIHRoZSBjb21wb3NpdGluZyByZW5kZXIgc2VydmVyIHBvcnQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAppbmRleCBlZDdlN2NmYTY0Nzk5MjY2 YjM1MDRjZWZjYzBmNGFhYTg2ZDVlOTkxLi5mN2Y2ZDBiMTI4MTI1NGJjZjUwMDE1ZjgxM2UxZDRi NTFhYTc4OTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250Q29u dmVyc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNp b24uY3BwCkBAIC03Nyw2ICs3Nyw0MCBAQCBwcml2YXRlOgogICAgICAgICBmbG9hdCB2ZXJ0aWNh bEFkdmFuY2U7CiAgICAgfTsKIAorICAgIGNsYXNzIFBsYWNlaG9sZGVyIHsKKyAgICBwdWJsaWM6 CisgICAgICAgIFBsYWNlaG9sZGVyKFNWR1RvT1RGRm9udENvbnZlcnRlciYgY29udmVydGVyLCBz aXplX3QgYmFzZU9mT2Zmc2V0KQorICAgICAgICAgICAgOiBtX2NvbnZlcnRlcihjb252ZXJ0ZXIp CisgICAgICAgICAgICAsIG1fYmFzZU9mT2Zmc2V0KGJhc2VPZk9mZnNldCkKKyAgICAgICAgICAg ICwgbV9sb2NhdGlvbihtX2NvbnZlcnRlci5tX3Jlc3VsdC5zaXplKCkpCisjaWYgIUFTU0VSVF9E SVNBQkxFRAorICAgICAgICAgICAgLCBtX3dyaXR0ZW4oZmFsc2UpCisjZW5kaWYKKyAgICAgICAg eworICAgICAgICAgICAgbV9jb252ZXJ0ZXIuYXBwZW5kMTYoMCk7CisgICAgICAgIH0KKyAgICAg ICAgdm9pZCBwb3B1bGF0ZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNpemVfdCBkZWx0YSA9 IG1fY29udmVydGVyLm1fcmVzdWx0LnNpemUoKSAtIG1fYmFzZU9mT2Zmc2V0OworICAgICAgICAg ICAgQVNTRVJUKGRlbHRhIDwgc3RkOjpudW1lcmljX2xpbWl0czx1aW50MTZfdD46Om1heCgpKTsK KyAgICAgICAgICAgIG1fY29udmVydGVyLm92ZXJ3cml0ZTE2KG1fbG9jYXRpb24sIGRlbHRhKTsK KyNpZiAhQVNTRVJUX0RJU0FCTEVECisgICAgICAgICAgICBtX3dyaXR0ZW4gPSB0cnVlOworI2Vu ZGlmCisgICAgICAgIH0KKyAgICAgICAgflBsYWNlaG9sZGVyKCkKKyAgICAgICAgeworICAgICAg ICAgICAgQVNTRVJUKG1fd3JpdHRlbik7CisgICAgICAgIH0KKyAgICBwcml2YXRlOgorICAgICAg ICBTVkdUb09URkZvbnRDb252ZXJ0ZXImIG1fY29udmVydGVyOworICAgICAgICBjb25zdCBzaXpl X3QgbV9iYXNlT2ZPZmZzZXQ7CisgICAgICAgIGNvbnN0IHNpemVfdCBtX2xvY2F0aW9uOworI2lm ICFBU1NFUlRfRElTQUJMRUQKKyAgICAgICAgYm9vbCBtX3dyaXR0ZW47CisjZW5kaWYKKyAgICB9 OworCiAgICAgc3RydWN0IEtlcm5pbmdEYXRhIHsKICAgICAgICAgS2VybmluZ0RhdGEodWludDE2 X3QgZ2x5cGgxLCB1aW50MTZfdCBnbHlwaDIsIGludDE2X3QgYWRqdXN0bWVudCkKICAgICAgICAg ICAgIDogZ2x5cGgxKGdseXBoMSkKQEAgLTU3NywxMiArNjExLDEyIEBAIHZvaWQgU1ZHVG9PVEZG b250Q29udmVydGVyOjphcHBlbmRBcmFiaWNSZXBsYWNlbWVudFN1YnRhYmxlKHNpemVfdCBzdWJ0 YWJsZVJlY29yCiAgICAgb3ZlcndyaXRlMTYoc3VidGFibGVSZWNvcmRMb2NhdGlvbiArIDYsIG1f cmVzdWx0LnNpemUoKSAtIHN1YnRhYmxlUmVjb3JkTG9jYXRpb24pOwogICAgIGF1dG8gc3VidGFi bGVMb2NhdGlvbiA9IG1fcmVzdWx0LnNpemUoKTsKICAgICBhcHBlbmQxNigyKTsgLy8gRm9ybWF0 IDIKLSAgICBhcHBlbmQxNigwKTsgLy8gUGxhY2Vob2xkZXIgZm9yIG9mZnNldCB0byBjb3ZlcmFn ZSB0YWJsZSwgcmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIHN1YnN0aXR1dGlvbiB0YWJsZQorICAg IFBsYWNlaG9sZGVyIHRvQ292ZXJhZ2VUYWJsZSgqdGhpcywgc3VidGFibGVMb2NhdGlvbik7CiAg ICAgYXBwZW5kMTYoYXJhYmljRmluYWxSZXBsYWNlbWVudHMuc2l6ZSgpKTsgLy8gR2x5cGhDb3Vu dAogICAgIGZvciAoYXV0byYgcGFpciA6IGFyYWJpY0ZpbmFsUmVwbGFjZW1lbnRzKQogICAgICAg ICBhcHBlbmQxNihwYWlyLnNlY29uZCk7CiAKLSAgICBvdmVyd3JpdGUxNihzdWJ0YWJsZUxvY2F0 aW9uICsgMiwgbV9yZXN1bHQuc2l6ZSgpIC0gc3VidGFibGVMb2NhdGlvbik7CisgICAgdG9Db3Zl cmFnZVRhYmxlLnBvcHVsYXRlKCk7CiAgICAgYXBwZW5kMTYoMSk7IC8vIENvdmVyYWdlRm9ybWF0 CiAgICAgYXBwZW5kMTYoYXJhYmljRmluYWxSZXBsYWNlbWVudHMuc2l6ZSgpKTsgLy8gR2x5cGhD b3VudAogICAgIGZvciAoYXV0byYgcGFpciA6IGFyYWJpY0ZpbmFsUmVwbGFjZW1lbnRzKQpAQCAt NTk2LDEwICs2MzAsOCBAQCB2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kR1NVQlRh YmxlKCkKIAogICAgIGFwcGVuZDMyKDB4MDAwMTAwMDApOyAvLyBWZXJzaW9uCiAgICAgYXBwZW5k MTYoaGVhZGVyU2l6ZSk7IC8vIE9mZnNldCB0byBTY3JpcHRMaXN0Ci0gICAgYXV0byBmZWF0dXJl TGlzdE9mZnNldExvY2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOwotICAgIGFwcGVuZDE2KDApOyAv LyBQbGFjZWhvbGRlciBmb3IgRmVhdHVyZUxpc3Qgb2Zmc2V0Ci0gICAgYXV0byBsb29rdXBMaXN0 T2Zmc2V0TG9jYXRpb24gPSBtX3Jlc3VsdC5zaXplKCk7Ci0gICAgYXBwZW5kMTYoMCk7IC8vIFBs YWNlaG9sZGVyIGZvciBMb29rdXBMaXN0IG9mZnNldAorICAgIFBsYWNlaG9sZGVyIHRvRmVhdHVy ZUxpc3QoKnRoaXMsIHRhYmxlTG9jYXRpb24pOworICAgIFBsYWNlaG9sZGVyIHRvTG9va3VwTGlz dCgqdGhpcywgdGFibGVMb2NhdGlvbik7CiAgICAgQVNTRVJUKHRhYmxlTG9jYXRpb24gKyBoZWFk ZXJTaXplID09IG1fcmVzdWx0LnNpemUoKSk7CiAKICAgICAvLyBTY3JpcHRMaXN0CkBAIC02MjIs NyArNjU0LDcgQEAgdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZEdTVUJUYWJsZSgp CiAgICAgICAgIGFwcGVuZDE2KGkpOyAvLyBJbmRleCBvZiBvdXIgZmVhdHVyZSBpbnRvIHRoZSBG ZWF0dXJlTGlzdAogCiAgICAgLy8gRmVhdHVyZUxpc3QKLSAgICBvdmVyd3JpdGUxNihmZWF0dXJl TGlzdE9mZnNldExvY2F0aW9uLCBtX3Jlc3VsdC5zaXplKCkgLSB0YWJsZUxvY2F0aW9uKTsKKyAg ICB0b0ZlYXR1cmVMaXN0LnBvcHVsYXRlKCk7CiAgICAgYXV0byBmZWF0dXJlTGlzdExvY2F0aW9u ID0gbV9yZXN1bHQuc2l6ZSgpOwogICAgIHNpemVfdCBmZWF0dXJlTGlzdFNpemUgPSAyICsgNiAq IGZlYXR1cmVDb3VudDsKICAgICBzaXplX3QgZmVhdHVyZVRhYmxlU2l6ZSA9IDY7CkBAIC02NDYs NyArNjc4LDcgQEAgdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZEdTVUJUYWJsZSgp CiAgICAgfQogCiAgICAgLy8gTG9va3VwTGlzdAotICAgIG92ZXJ3cml0ZTE2KGxvb2t1cExpc3RP ZmZzZXRMb2NhdGlvbiwgbV9yZXN1bHQuc2l6ZSgpIC0gdGFibGVMb2NhdGlvbik7CisgICAgdG9M b29rdXBMaXN0LnBvcHVsYXRlKCk7CiAgICAgYXV0byBsb29rdXBMaXN0TG9jYXRpb24gPSBtX3Jl c3VsdC5zaXplKCk7CiAgICAgYXBwZW5kMTYoZmVhdHVyZUNvdW50KTsgLy8gTG9va3VwQ291bnQK ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZmVhdHVyZUNvdW50OyArK2kpCg==