157092 2016-04-27 10:50:58 -0700 Rename DerivedFontData to DerivedFonts 2016-04-27 11:59:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue oldest_to_newest 1187810 0 mmaxfield 2016-04-27 10:50:58 -0700 Rename DerivedFontData to DerivedFonts 1187811 1 277489 mmaxfield 2016-04-27 10:53:27 -0700 Created attachment 277489 Patch 1187897 2 277489 commit-queue 2016-04-27 11:59:24 -0700 Comment on attachment 277489 Patch Clearing flags on attachment: 277489 Committed r200138: <http://trac.webkit.org/changeset/200138> 1187898 3 commit-queue 2016-04-27 11:59:29 -0700 All reviewed patches have been landed. Closing bug. 277489 2016-04-27 10:53:27 -0700 2016-04-27 11:59:24 -0700 Patch bug-157092-20160427105357.patch text/plain 6848 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFlZjU3MDQ3ZjU0NTVl NmQyMjFkZTdkMTdmZWMwNjNhNmM5YmQwYS4uOTViZWIyNmNlNzczOTU5ZmMwN2M1NGY1YWViODY2 NGQzNTBmYzU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA0LTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIERl cml2ZWRGb250RGF0YSB0byBEZXJpdmVkRm9udHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzA5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBmb2xsb3ctdXAgdG8gcjE3ODUxMCB3aGVy ZSB3ZSBuYW1lZCBTaW1wbGVGb250RGF0YSB0byBGb250LgorICAgICAgICBUaGlzIHBhdGNoIGRp ZG4ndCBpbmNsdWRlIHJlbmFtaW5nIERlcml2ZWRGb250RGF0YSB0byBEZXJpdmVkRm9udHMuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdl LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250Ojp2ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb25Gb250KToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OnVwcmlnaHRPcmllbnRhdGlvbkZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6c21hbGxDYXBzRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpub1N5bnRoZXNpemFi bGVGZWF0dXJlc0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZW1waGFzaXNNYXJrRm9u dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpicm9rZW5JZGVvZ3JhcGhGb250KToKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnQ6Om5vblN5bnRoZXRpY0l0YWxpY0ZvbnQpOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udDo6RGVyaXZlZEZvbnRzOjp+RGVyaXZlZEZvbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OkRlcml2ZWRGb250RGF0YTo6fkRlcml2ZWRGb250RGF0YSk6IERlbGV0ZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6RGVyaXZlZEZvbnRzOjpEZXJpdmVkRm9udHMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6 RGVyaXZlZEZvbnREYXRhOjpEZXJpdmVkRm9udERhdGEpOiBEZWxldGVkLgorCiAyMDE2LTA0LTI3 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBJRExdIENs ZWFuIHVwIHN1cHBvcnQgZm9yIFtDbGFtcF0gSURMIGV4dGVuZGVkIGF0dHJpYnV0ZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAppbmRleCBlMmRjMDU0YTNmNzlmZjAz NzRhZGViMzVlODQ4NGU0MTA5MGJjMmYwLi5mNGYzYTQ0ZmJiMGQ5MTE2YmJlMjQ4NjQyMDNiZDZl MTBiNjk5MzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApA QCAtMjUxLDcgKzI1MSw3IEBAIEdseXBoRGF0YSBGb250OjpnbHlwaERhdGFGb3JDaGFyYWN0ZXIo VUNoYXIzMiBjaGFyYWN0ZXIpIGNvbnN0CiBjb25zdCBGb250JiBGb250Ojp2ZXJ0aWNhbFJpZ2h0 T3JpZW50YXRpb25Gb250KCkgY29uc3QKIHsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQot ICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnRE YXRhPihpc0N1c3RvbUZvbnQoKSk7CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjpt YWtlX3VuaXF1ZTxEZXJpdmVkRm9udHM+KGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVy aXZlZEZvbnREYXRhLT52ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb24pIHsKICAgICAgICAgYXV0byB2 ZXJ0aWNhbFJpZ2h0UGxhdGZvcm1EYXRhID0gRm9udFBsYXRmb3JtRGF0YTo6Y2xvbmVXaXRoT3Jp ZW50YXRpb24obV9wbGF0Zm9ybURhdGEsIEhvcml6b250YWwpOwogICAgICAgICBtX2Rlcml2ZWRG b250RGF0YS0+dmVydGljYWxSaWdodE9yaWVudGF0aW9uID0gY3JlYXRlKHZlcnRpY2FsUmlnaHRQ bGF0Zm9ybURhdGEsIGlzQ3VzdG9tRm9udCgpLCBmYWxzZSwgdHJ1ZSk7CkBAIC0yNjMsNyArMjYz LDcgQEAgY29uc3QgRm9udCYgRm9udDo6dmVydGljYWxSaWdodE9yaWVudGF0aW9uRm9udCgpIGNv bnN0CiBjb25zdCBGb250JiBGb250Ojp1cHJpZ2h0T3JpZW50YXRpb25Gb250KCkgY29uc3QKIHsK ICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQotICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9 IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnREYXRhPihpc0N1c3RvbUZvbnQoKSk7CisgICAg ICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udHM+KGlz Q3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT51cHJpZ2h0T3JpZW50 YXRpb24pCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT51cHJpZ2h0T3JpZW50YXRpb24gPSBj cmVhdGUobV9wbGF0Zm9ybURhdGEsIGlzQ3VzdG9tRm9udCgpLCBmYWxzZSwgdHJ1ZSk7CiAgICAg QVNTRVJUKG1fZGVyaXZlZEZvbnREYXRhLT51cHJpZ2h0T3JpZW50YXRpb24gIT0gdGhpcyk7CkBA IC0yNzMsNyArMjczLDcgQEAgY29uc3QgRm9udCYgRm9udDo6dXByaWdodE9yaWVudGF0aW9uRm9u dCgpIGNvbnN0CiBjb25zdCBGb250KiBGb250OjpzbWFsbENhcHNGb250KGNvbnN0IEZvbnREZXNj cmlwdGlvbiYgZm9udERlc2NyaXB0aW9uKSBjb25zdAogewogICAgIGlmICghbV9kZXJpdmVkRm9u dERhdGEpCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJp dmVkRm9udERhdGE+KGlzQ3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEg PSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2ZWRGb250cz4oaXNDdXN0b21Gb250KCkpOwogICAgIGlm ICghbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykKICAgICAgICAgbV9kZXJpdmVkRm9udERh dGEtPnNtYWxsQ2FwcyA9IGNyZWF0ZVNjYWxlZEZvbnQoZm9udERlc2NyaXB0aW9uLCBzbWFsbENh cHNGb250U2l6ZU11bHRpcGxpZXIpOwogICAgIEFTU0VSVChtX2Rlcml2ZWRGb250RGF0YS0+c21h bGxDYXBzICE9IHRoaXMpOwpAQCAtMjg0LDcgKzI4NCw3IEBAIGNvbnN0IEZvbnQqIEZvbnQ6OnNt YWxsQ2Fwc0ZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pIGNvbnN0 CiBjb25zdCBGb250JiBGb250Ojpub1N5bnRoZXNpemFibGVGZWF0dXJlc0ZvbnQoKSBjb25zdAog ewogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRh ID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udERhdGE+KGlzQ3VzdG9tRm9udCgpKTsKKyAg ICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2ZWRGb250cz4o aXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPm5vU3ludGhlc2l6 YWJsZUZlYXR1cmVzKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+bm9TeW50aGVzaXphYmxl RmVhdHVyZXMgPSBjcmVhdGVGb250V2l0aG91dFN5bnRoZXNpemFibGVGZWF0dXJlcygpOwogICAg IEFTU0VSVChtX2Rlcml2ZWRGb250RGF0YS0+bm9TeW50aGVzaXphYmxlRmVhdHVyZXMgIT0gdGhp cyk7CkBAIC0yOTUsNyArMjk1LDcgQEAgY29uc3QgRm9udCYgRm9udDo6bm9TeW50aGVzaXphYmxl RmVhdHVyZXNGb250KCkgY29uc3QKIGNvbnN0IEZvbnQqIEZvbnQ6OmVtcGhhc2lzTWFya0ZvbnQo Y29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pIGNvbnN0CiB7CiAgICAgaWYg KCFtX2Rlcml2ZWRGb250RGF0YSkKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1h a2VfdW5pcXVlPERlcml2ZWRGb250RGF0YT4oaXNDdXN0b21Gb250KCkpOworICAgICAgICBtX2Rl cml2ZWRGb250RGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnRzPihpc0N1c3RvbUZv bnQoKSk7CiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrKQogICAgICAg ICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0gY3JlYXRlU2NhbGVkRm9udChmb250 RGVzY3JpcHRpb24sIGVtcGhhc2lzTWFya0ZvbnRTaXplTXVsdGlwbGllcik7CiAgICAgQVNTRVJU KG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgIT0gdGhpcyk7CkBAIC0zMDUsNyArMzA1 LDcgQEAgY29uc3QgRm9udCogRm9udDo6ZW1waGFzaXNNYXJrRm9udChjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbikgY29uc3QKIGNvbnN0IEZvbnQmIEZvbnQ6OmJyb2tlbklk ZW9ncmFwaEZvbnQoKSBjb25zdAogewogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCi0gICAg ICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udERhdGE+ KGlzQ3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2Vf dW5pcXVlPERlcml2ZWRGb250cz4oaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVk Rm9udERhdGEtPmJyb2tlbklkZW9ncmFwaCkgewogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ YnJva2VuSWRlb2dyYXBoID0gY3JlYXRlKG1fcGxhdGZvcm1EYXRhLCBpc0N1c3RvbUZvbnQoKSwg ZmFsc2UpOwogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+YnJva2VuSWRlb2dyYXBoLT5tX2lz QnJva2VuSWRlb2dyYXBoRmFsbGJhY2sgPSB0cnVlOwpAQCAtMzE3LDcgKzMxNyw3IEBAIGNvbnN0 IEZvbnQmIEZvbnQ6OmJyb2tlbklkZW9ncmFwaEZvbnQoKSBjb25zdAogY29uc3QgRm9udCYgRm9u dDo6bm9uU3ludGhldGljSXRhbGljRm9udCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Rlcml2ZWRG b250RGF0YSkKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERl cml2ZWRGb250RGF0YT4oaXNDdXN0b21Gb250KCkpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0 YSA9IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnRzPihpc0N1c3RvbUZvbnQoKSk7CiAgICAg aWYgKCFtX2Rlcml2ZWRGb250RGF0YS0+bm9uU3ludGhldGljSXRhbGljKSB7CiAjaWYgUExBVEZP Uk0oQ09DT0EpIHx8IFVTRShDQUlSTykKICAgICAgICAgRm9udFBsYXRmb3JtRGF0YSBub25TeW50 aGV0aWNJdGFsaWNGb250UGxhdGZvcm1EYXRhID0gRm9udFBsYXRmb3JtRGF0YTo6Y2xvbmVXaXRo U3ludGhldGljT2JsaXF1ZShtX3BsYXRmb3JtRGF0YSwgZmFsc2UpOwpAQCAtMzUyLDcgKzM1Miw3 IEBAIGNvbnN0IE9wZW5UeXBlTWF0aERhdGEqIEZvbnQ6Om1hdGhEYXRhKCkgY29uc3QKICAgICBy ZXR1cm4gbV9tYXRoRGF0YS5nZXQoKTsKIH0KIAotRm9udDo6RGVyaXZlZEZvbnREYXRhOjp+RGVy aXZlZEZvbnREYXRhKCkKK0ZvbnQ6OkRlcml2ZWRGb250czo6fkRlcml2ZWRGb250cygpCiB7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA3YjhiNTQwZTIw YTJmM2E2N2FiMjJkZWUxNGE2ZTAwNzdiZTcwMDNmLi5jYzAwYjlmODZkYjhiYTE5MGI4ZTVmNjAz ZTgyZmIxNjhhZDVhN2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5o CkBAIC0yNDgsMTYgKzI0OCwxNiBAQCBwcml2YXRlOgogCiAgICAgR2x5cGggbV96ZXJvV2lkdGhT cGFjZUdseXBoIHsgMCB9OwogCi0gICAgc3RydWN0IERlcml2ZWRGb250RGF0YSB7CisgICAgc3Ry dWN0IERlcml2ZWRGb250cyB7CiAjaWYgIUNPTVBJTEVSKE1TVkMpCiAgICAgICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwogI2VuZGlmCiAgICAgcHVibGljOgotICAgICAgICBleHBsaWNpdCBE ZXJpdmVkRm9udERhdGEoYm9vbCBjdXN0b20pCisgICAgICAgIGV4cGxpY2l0IERlcml2ZWRGb250 cyhib29sIGN1c3RvbSkKICAgICAgICAgICAgIDogZm9yQ3VzdG9tRm9udChjdXN0b20pCiAgICAg ICAgIHsKICAgICAgICAgfQotICAgICAgICB+RGVyaXZlZEZvbnREYXRhKCk7CisgICAgICAgIH5E ZXJpdmVkRm9udHMoKTsKIAogICAgICAgICBib29sIGZvckN1c3RvbUZvbnQ7CiAgICAgICAgIFJl ZlB0cjxGb250PiBzbWFsbENhcHM7CkBAIC0yNjksNyArMjY5LDcgQEAgcHJpdmF0ZToKICAgICAg ICAgUmVmUHRyPEZvbnQ+IG5vblN5bnRoZXRpY0l0YWxpYzsKICAgICB9OwogCi0gICAgbXV0YWJs ZSBzdGQ6OnVuaXF1ZV9wdHI8RGVyaXZlZEZvbnREYXRhPiBtX2Rlcml2ZWRGb250RGF0YTsKKyAg ICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxEZXJpdmVkRm9udHM+IG1fZGVyaXZlZEZvbnREYXRh OwogCiAjaWYgVVNFKENHKSB8fCBVU0UoQ0FJUk8pCiAgICAgZmxvYXQgbV9zeW50aGV0aWNCb2xk T2Zmc2V0Owo=