171893 2017-05-09 15:54:32 -0700 Tiny cleanup in Font::DerivedFonts 2017-05-10 09:06:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino jonlee simon.fraser thorton oldest_to_newest 1306643 0 mmaxfield 2017-05-09 15:54:32 -0700 Tiny cleanup in Font::DerivedFonts 1306645 1 309557 mmaxfield 2017-05-09 15:55:06 -0700 Created attachment 309557 Patch 1306867 2 309557 commit-queue 2017-05-10 09:06:39 -0700 Comment on attachment 309557 Patch Clearing flags on attachment: 309557 Committed r216586: <http://trac.webkit.org/changeset/216586> 1306868 3 commit-queue 2017-05-10 09:06:41 -0700 All reviewed patches have been landed. Closing bug. 309557 2017-05-09 15:55:06 -0700 2017-05-10 09:06:39 -0700 Patch bug-171893-20170509155521.patch text/plain 6865 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2NDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ0NTk5NDk5ZDliNzI5 NDNiM2UzOTA1N2YwOTRiZWMxMDRkZGExYi4uMjEwYzMxMjk2M2NmMzI1MTVhMjk2Y2QyNmZlNzI5 YjIzNGFiZTU3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgVGlueSBjbGVh bnVwIGluIEZvbnQ6OkRlcml2ZWRGb250cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyB2YXJpYWJsZSB3YXMgd3JpdHRlbiB0byBidXQgbmV2ZXIg cmVhZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlv ciBjaGFuZ2UuCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTRm9udEZhY2VTb3VyY2U6OmZvbnQpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6dmVydGljYWxSaWdo dE9yaWVudGF0aW9uRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojp1cHJpZ2h0T3JpZW50 YXRpb25Gb250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnNtYWxsQ2Fwc0ZvbnQpOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udDo6bm9TeW50aGVzaXphYmxlRmVhdHVyZXNGb250KToKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnQ6OmVtcGhhc2lzTWFya0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udDo6YnJva2VuSWRlb2dyYXBoRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpEZXJp dmVkRm9udHM6On5EZXJpdmVkRm9udHMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0ZvbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OkRlcml2ZWRGb250czo6RGVy aXZlZEZvbnRzKTogRGVsZXRlZC4KKwogMjAxNy0wNS0wOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgVFVSTlMgZ2F0aGVyaW5nIGlzIG5vdCB3b3JraW5nIHBy b3Blcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAppbmRleCA1ZmMz NTgyOWY3MmQ0ODg1OWYzMDkzNDEzMTkzYmY4MjY4YWJkMzc4Li4yMGI1ODExMWM4NTlhODBhYmEy ZGVlNmJjYmRhMDVlNzEzNTk3MDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2VTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNv dXJjZS5jcHAKQEAgLTIwNiw5ICsyMDYsOSBAQCBSZWZQdHI8Rm9udD4gQ1NTRm9udEZhY2VTb3Vy Y2U6OmZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGJvbwogICAg IGlmICghbV9pbkRvY3VtZW50Q3VzdG9tUGxhdGZvcm1EYXRhKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICByZXR1cm4gRm9udDo6Y3JlYXRlKG1faW5E b2N1bWVudEN1c3RvbVBsYXRmb3JtRGF0YS0+Zm9udFBsYXRmb3JtRGF0YShmb250RGVzY3JpcHRp b24sIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgZm9udEZhY2VGZWF0dXJlcywgZm9u dEZhY2VWYXJpYW50U2V0dGluZ3MsIGZvbnRGYWNlQ2FwYWJpbGl0aWVzKSwgdHJ1ZSwgZmFsc2Up OworICAgIHJldHVybiBGb250OjpjcmVhdGUobV9pbkRvY3VtZW50Q3VzdG9tUGxhdGZvcm1EYXRh LT5mb250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgZm9u dEZhY2VDYXBhYmlsaXRpZXMpLCB0cnVlKTsKICNlbHNlCi0gICAgcmV0dXJuIEZvbnQ6OmNyZWF0 ZShtX2luRG9jdW1lbnRDdXN0b21QbGF0Zm9ybURhdGEtPmZvbnRQbGF0Zm9ybURhdGEoZm9udERl c2NyaXB0aW9uLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMpLCB0cnVlLCBmYWxzZSk7 CisgICAgcmV0dXJuIEZvbnQ6OmNyZWF0ZShtX2luRG9jdW1lbnRDdXN0b21QbGF0Zm9ybURhdGEt PmZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0 aWNJdGFsaWMpLCB0cnVlKTsKICNlbmRpZgogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udC5jcHAKaW5kZXggY2QwNjdkODIyMThiMWY1Y2M1MTkwM2RkYjFmZWU2 NjkwMTllMzFmZC4uYmM5NjUwY2RmNWE1MzJjOGI3ZWE2ZDE0YmJiZTJkODQ5NTFjYjk2MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAKQEAgLTI2Myw3ICsyNjMs NyBAQCBHbHlwaERhdGEgRm9udDo6Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKFVDaGFyMzIgY2hhcmFj dGVyKSBjb25zdAogY29uc3QgRm9udCYgRm9udDo6dmVydGljYWxSaWdodE9yaWVudGF0aW9uRm9u dCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YSkKLSAgICAgICAgbV9kZXJp dmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2ZWRGb250cz4oaXNDdXN0b21Gb250 KCkpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZl ZEZvbnRzPigpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPnZlcnRpY2FsUmlnaHRPcmll bnRhdGlvbikgewogICAgICAgICBhdXRvIHZlcnRpY2FsUmlnaHRQbGF0Zm9ybURhdGEgPSBGb250 UGxhdGZvcm1EYXRhOjpjbG9uZVdpdGhPcmllbnRhdGlvbihtX3BsYXRmb3JtRGF0YSwgSG9yaXpv bnRhbCk7CiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT52ZXJ0aWNhbFJpZ2h0T3JpZW50YXRp b24gPSBjcmVhdGUodmVydGljYWxSaWdodFBsYXRmb3JtRGF0YSwgaXNDdXN0b21Gb250KCksIGZh bHNlLCB0cnVlKTsKQEAgLTI3NSw3ICsyNzUsNyBAQCBjb25zdCBGb250JiBGb250Ojp2ZXJ0aWNh bFJpZ2h0T3JpZW50YXRpb25Gb250KCkgY29uc3QKIGNvbnN0IEZvbnQmIEZvbnQ6OnVwcmlnaHRP cmllbnRhdGlvbkZvbnQoKSBjb25zdAogewogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCi0g ICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udHM+ KGlzQ3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2Vf dW5pcXVlPERlcml2ZWRGb250cz4oKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT51cHJp Z2h0T3JpZW50YXRpb24pCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT51cHJpZ2h0T3JpZW50 YXRpb24gPSBjcmVhdGUobV9wbGF0Zm9ybURhdGEsIGlzQ3VzdG9tRm9udCgpLCBmYWxzZSwgdHJ1 ZSk7CiAgICAgQVNTRVJUKG1fZGVyaXZlZEZvbnREYXRhLT51cHJpZ2h0T3JpZW50YXRpb24gIT0g dGhpcyk7CkBAIC0yODUsNyArMjg1LDcgQEAgY29uc3QgRm9udCYgRm9udDo6dXByaWdodE9yaWVu dGF0aW9uRm9udCgpIGNvbnN0CiBjb25zdCBGb250KiBGb250OjpzbWFsbENhcHNGb250KGNvbnN0 IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uKSBjb25zdAogewogICAgIGlmICghbV9k ZXJpdmVkRm9udERhdGEpCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3Vu aXF1ZTxEZXJpdmVkRm9udHM+KGlzQ3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJpdmVkRm9u dERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2ZWRGb250cz4oKTsKICAgICBpZiAoIW1fZGVy aXZlZEZvbnREYXRhLT5zbWFsbENhcHMpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFs bENhcHMgPSBjcmVhdGVTY2FsZWRGb250KGZvbnREZXNjcmlwdGlvbiwgc21hbGxDYXBzRm9udFNp emVNdWx0aXBsaWVyKTsKICAgICBBU1NFUlQobV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyAh PSB0aGlzKTsKQEAgLTI5Niw3ICsyOTYsNyBAQCBjb25zdCBGb250JiBGb250Ojpub1N5bnRoZXNp emFibGVGZWF0dXJlc0ZvbnQoKSBjb25zdAogewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlm ICghbV9kZXJpdmVkRm9udERhdGEpCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjpt YWtlX3VuaXF1ZTxEZXJpdmVkRm9udHM+KGlzQ3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJp dmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2ZWRGb250cz4oKTsKICAgICBpZiAo IW1fZGVyaXZlZEZvbnREYXRhLT5ub1N5bnRoZXNpemFibGVGZWF0dXJlcykKICAgICAgICAgbV9k ZXJpdmVkRm9udERhdGEtPm5vU3ludGhlc2l6YWJsZUZlYXR1cmVzID0gY3JlYXRlRm9udFdpdGhv dXRTeW50aGVzaXphYmxlRmVhdHVyZXMoKTsKICAgICBBU1NFUlQobV9kZXJpdmVkRm9udERhdGEt Pm5vU3ludGhlc2l6YWJsZUZlYXR1cmVzICE9IHRoaXMpOwpAQCAtMzA5LDcgKzMwOSw3IEBAIGNv bnN0IEZvbnQmIEZvbnQ6Om5vU3ludGhlc2l6YWJsZUZlYXR1cmVzRm9udCgpIGNvbnN0CiBjb25z dCBGb250KiBGb250OjplbXBoYXNpc01hcmtGb250KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9u dERlc2NyaXB0aW9uKSBjb25zdAogewogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCi0gICAg ICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udHM+KGlz Q3VzdG9tRm9udCgpKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5p cXVlPERlcml2ZWRGb250cz4oKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNp c01hcmspCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgPSBjcmVhdGVT Y2FsZWRGb250KGZvbnREZXNjcmlwdGlvbiwgZW1waGFzaXNNYXJrRm9udFNpemVNdWx0aXBsaWVy KTsKICAgICBBU1NFUlQobV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayAhPSB0aGlzKTsK QEAgLTMxOSw3ICszMTksNyBAQCBjb25zdCBGb250KiBGb250OjplbXBoYXNpc01hcmtGb250KGNv bnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uKSBjb25zdAogY29uc3QgRm9udCYg Rm9udDo6YnJva2VuSWRlb2dyYXBoRm9udCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Rlcml2ZWRG b250RGF0YSkKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERl cml2ZWRGb250cz4oaXNDdXN0b21Gb250KCkpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9 IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnRzPigpOwogICAgIGlmICghbV9kZXJpdmVkRm9u dERhdGEtPmJyb2tlbklkZW9ncmFwaCkgewogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+YnJv a2VuSWRlb2dyYXBoID0gY3JlYXRlKG1fcGxhdGZvcm1EYXRhLCBpc0N1c3RvbUZvbnQoKSwgZmFs c2UpOwogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+YnJva2VuSWRlb2dyYXBoLT5tX2lzQnJv a2VuSWRlb2dyYXBoRmFsbGJhY2sgPSB0cnVlOwpAQCAtMzUwLDEwICszNTAsNiBAQCBjb25zdCBP cGVuVHlwZU1hdGhEYXRhKiBGb250OjptYXRoRGF0YSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbWF0 aERhdGEuZ2V0KCk7CiB9CiAKLUZvbnQ6OkRlcml2ZWRGb250czo6fkRlcml2ZWRGb250cygpCi17 Ci19Ci0KIFJlZlB0cjxGb250PiBGb250OjpjcmVhdGVTY2FsZWRGb250KGNvbnN0IEZvbnREZXNj cmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKIHsKICAg ICByZXR1cm4gcGxhdGZvcm1DcmVhdGVTY2FsZWRGb250KGZvbnREZXNjcmlwdGlvbiwgc2NhbGVG YWN0b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCmluZGV4IGU5Yzli ZjkxMjljZGE4NmJmYzlmZDZjNWFhYjU0YjZlZDRjZjYwZWQuLmI5NjI4ZWFlN2IyYmIwZjhiZWEw MWNmODU2OThlMjg4NzYxNmM5MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250LmgKQEAgLTI1OCwxMyArMjU4LDcgQEAgcHJpdmF0ZToKICAgICAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CiAjZW5kaWYKICAgICBwdWJsaWM6Ci0gICAgICAgIGV4cGxpY2l0IERlcml2 ZWRGb250cyhib29sIGN1c3RvbSkKLSAgICAgICAgICAgIDogZm9yQ3VzdG9tRm9udChjdXN0b20p Ci0gICAgICAgIHsKLSAgICAgICAgfQotICAgICAgICB+RGVyaXZlZEZvbnRzKCk7CiAKLSAgICAg ICAgYm9vbCBmb3JDdXN0b21Gb250OwogICAgICAgICBSZWZQdHI8Rm9udD4gc21hbGxDYXBzOwog ICAgICAgICBSZWZQdHI8Rm9udD4gbm9TeW50aGVzaXphYmxlRmVhdHVyZXM7CiAgICAgICAgIFJl ZlB0cjxGb250PiBlbXBoYXNpc01hcms7Cg==