153440 2016-01-25 13:16:17 -0800 Remove broken cache from CSSFontFaceSource 2016-01-25 21:51:30 -0800 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 1158467 0 mmaxfield 2016-01-25 13:16:17 -0800 Remove broken cache from CSSFontFaceSource 1158469 1 269783 mmaxfield 2016-01-25 13:22:19 -0800 Created attachment 269783 Patch 1158471 2 269783 mmaxfield 2016-01-25 13:25:37 -0800 Comment on attachment 269783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=269783&action=review > Source/WebCore/css/CSSFontFaceSource.cpp:138 > return WTFMove(placeholderFontCopyInLoadingState); Can move the return onto the line above. 1158500 3 269792 mmaxfield 2016-01-25 14:16:55 -0800 Created attachment 269792 Patch for committing 1158596 4 269792 commit-queue 2016-01-25 16:35:26 -0800 Comment on attachment 269792 Patch for committing Clearing flags on attachment: 269792 Committed r195567: <http://trac.webkit.org/changeset/195567> 269783 2016-01-25 13:22:19 -0800 2016-01-25 14:06:19 -0800 Patch bug-153440-20160125132153.patch text/plain 5836 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdkZjQwY2M4ZDQ3MWU0 ZGQ0Njc0MDEyMTFhNTczZDNkZWZlOGRiNS4uNjU1YWM5NDkxM2U5MmY2MmFjMjI0MDY3ZjgyYTNi OTAzZjQ1ZTI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTAxLTI1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGJy b2tlbiBjYWNoZSBmcm9tIENTU0ZvbnRGYWNlU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM0NDAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNhY2hlIGhhcyBiZWVuIGJyb2tlbiBzaW5j ZSAyMDEzIChyMTU4MDg1KS4gR2l2ZW4gd2UgZGlkbid0IG5vdGljZSBhIHBlcmYKKyAgICAgICAg aGl0IHdoZW4gaXQgYnJva2UsIGFuZCB0aGUgZmFjdCBpdCdzIGJlZW4gYnJva2VuIGZvciB5ZWFy cywgaXQgY2xlYXJseSBpc24ndAorICAgICAgICBuZWNlc3NhcnkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzQxNCBjb25zaXN0cyBvZiBhIGZh aXJseSBpbnZhc2l2ZQorICAgICAgICBjaGFuZ2UgdG8gQ1NTRm9udEZhY2VTb3VyY2U7IHRoaXMg cGF0Y2ggaW5jbHVkZXMgYSB3b3JraW5nIHZlcnNpb24gb2YgdGhpcworICAgICAgICBjYWNoZSwg YWxvbmcgd2l0aCBhbiBlYXN5IHdheSB0byBlbmFibGUvZGlzYWJsZSBpdCAodG8gbWVhc3VyZSBw b3NzaWJsZSBwZXJmCisgICAgICAgIGNoYW5nZXMpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMg YSBzaG9ydC10ZXJtIGNsZWFudXAgcGF0Y2ggaW4gdGhlIG1lYW4gdGltZSB1bnRpbCB0aGUgYWJv dmUKKyAgICAgICAgaW52YXNpdmUgY2hhbmdlIGdldHMgbGFuZGVkLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIChvciBwZXJmb3JtYW5jZSEpIGNo YW5nZS4KKworICAgICAgICAqIGNzcy9DU1NGb250RmFjZVNvdXJjZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NGb250RmFjZVNvdXJjZTo6Zm9udCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NG b250RmFjZVNvdXJjZTo6fkNTU0ZvbnRGYWNlU291cmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpwcnVuZVRhYmxlKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpmb250TG9hZGVkKTogRGVsZXRlZC4KKyAgICAg ICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuaDoKKwogMjAxNi0wMS0yNSAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQjogSW1wbGVtZW50IGdl dEluZGV4UmVjb3JkIGluIHRoZSBTUUxpdGUgYmFja2luZyBzdG9yZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCmluZGV4IDQzNzVjZmZjMjEwZWQxMjYzNzZkYmQyOTVi MTdhYTM5YWY4YzU4ZGEuLjk0MzI3MTM1YzgzMzVmN2I5NzVhMWNlYzgwNjE0OWFlNzBlNjEzMjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcApAQCAtNjYsMTUgKzY2 LDYgQEAgQ1NTRm9udEZhY2VTb3VyY2U6On5DU1NGb250RmFjZVNvdXJjZSgpCiB7CiAgICAgaWYg KG1fZm9udCkKICAgICAgICAgbV9mb250LT5yZW1vdmVDbGllbnQodGhpcyk7Ci0gICAgcHJ1bmVU YWJsZSgpOwotfQotCi12b2lkIENTU0ZvbnRGYWNlU291cmNlOjpwcnVuZVRhYmxlKCkKLXsKLSAg ICBpZiAobV9mb250VGFibGUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2Zv bnRUYWJsZS5jbGVhcigpOwogfQogCiBib29sIENTU0ZvbnRGYWNlU291cmNlOjppc1ZhbGlkKCkg Y29uc3QKQEAgLTg2LDcgKzc3LDYgQEAgYm9vbCBDU1NGb250RmFjZVNvdXJjZTo6aXNWYWxpZCgp IGNvbnN0CiAKIHZvaWQgQ1NTRm9udEZhY2VTb3VyY2U6OmZvbnRMb2FkZWQoQ2FjaGVkRm9udCop CiB7Ci0gICAgcHJ1bmVUYWJsZSgpOwogICAgIGlmIChtX2ZhY2UpCiAgICAgICAgIG1fZmFjZS0+ Zm9udExvYWRlZCh0aGlzKTsKIH0KQEAgLTEwNywxOSArOTcsMTIgQEAgUmVmUHRyPEZvbnQ+IENT U0ZvbnRGYWNlU291cmNlOjpmb250KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0 aW9uLCBib28KICAgICAgICAgcmV0dXJuIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuZm9udEZvckZh bWlseShmb250RGVzY3JpcHRpb24sIG1fc3RyaW5nLCB0cnVlKTsKICAgICB9CiAKLSAgICB1bnNp Z25lZCBoYXNoS2V5ID0gKGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpICsgMSkg PDwgNSB8IGZvbnREZXNjcmlwdGlvbi53aWR0aFZhcmlhbnQoKSA8PCAzCi0gICAgICAgICAgICAg ICAgICAgICAgIHwgKGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsID8g NCA6IDApIHwgKHN5bnRoZXRpY0JvbGQgPyAyIDogMCkgfCAoc3ludGhldGljSXRhbGljID8gMSA6 IDApOwotCi0gICAgUmVmUHRyPEZvbnQ+IGZvbnQgPSBtX2ZvbnRUYWJsZS5hZGQoaGFzaEtleSwg bnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChmb250KQotICAgICAgICByZXR1cm4g Zm9udC5yZWxlYXNlKCk7Ci0KICAgICBpZiAoIW1fZm9udCB8fCBtX2ZvbnQtPmlzTG9hZGVkKCkp IHsKICAgICAgICAgaWYgKG1fZm9udCkgewogICAgICAgICAgICAgaWYgKCFtX2ZvbnQtPmVuc3Vy ZUN1c3RvbUZvbnREYXRhKG1fc3RyaW5nKSkKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAotICAgICAgICAgICAgZm9udCA9IG1fZm9udC0+Y3JlYXRlRm9udChmb250RGVzY3JpcHRp b24sIG1fc3RyaW5nLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMsIGZvbnRGYWNlRmVh dHVyZXMsIGZvbnRGYWNlVmFyaWFudFNldHRpbmdzKTsKKyAgICAgICAgICAgIHJldHVybiBtX2Zv bnQtPmNyZWF0ZUZvbnQoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZywgc3ludGhldGljQm9sZCwg c3ludGhldGljSXRhbGljLCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlhbnRTZXR0aW5n cyk7CiAgICAgICAgIH0gZWxzZSB7CiAjaWYgRU5BQkxFKFNWR19GT05UUykKICAgICAgICAgICAg IC8vIEluLURvY3VtZW50IFNWRyBGb250cwpAQCAtMTM3LDEyICsxMjAsMTMgQEAgUmVmUHRyPEZv bnQ+IENTU0ZvbnRGYWNlU291cmNlOjpmb250KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERl c2NyaXB0aW9uLCBib28KICAgICAgICAgICAgICAgICBhdXRvIGN1c3RvbVBsYXRmb3JtRGF0YSA9 IGNyZWF0ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEoKm1fZ2VuZXJhdGVkT1RGQnVmZmVyKTsKICAg ICAgICAgICAgICAgICBpZiAoIWN1c3RvbVBsYXRmb3JtRGF0YSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgICAgICAgICAgZm9udCA9IEZvbnQ6OmNyZWF0ZShj dXN0b21QbGF0Zm9ybURhdGEtPmZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBzeW50 aGV0aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMsIGZvbnRGYWNlRmVhdHVyZXMsIGZvbnRGYWNlVmFy aWFudFNldHRpbmdzKSwgdHJ1ZSwgZmFsc2UpOworICAgICAgICAgICAgICAgIHJldHVybiBGb250 OjpjcmVhdGUoY3VzdG9tUGxhdGZvcm1EYXRhLT5mb250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlw dGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljLCBmb250RmFjZUZlYXR1cmVzLCBm b250RmFjZVZhcmlhbnRTZXR0aW5ncyksIHRydWUsIGZhbHNlKTsKICNlbHNlCi0gICAgICAgICAg ICAgICAgZm9udCA9IEZvbnQ6OmNyZWF0ZShzdGQ6Om1ha2VfdW5pcXVlPFNWR0ZvbnREYXRhPiht X3N2Z0ZvbnRGYWNlRWxlbWVudC5nZXQoKSksIGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVs U2l6ZSgpLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMpOworICAgICAgICAgICAgICAg IHJldHVybiBGb250OjpjcmVhdGUoc3RkOjptYWtlX3VuaXF1ZTxTVkdGb250RGF0YT4obV9zdmdG b250RmFjZUVsZW1lbnQuZ2V0KCkpLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUo KSwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljKTsKICNlbmRpZgogICAgICAgICAgICAg fQogI2VuZGlmCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgfQogICAgIH0g ZWxzZSB7CiAgICAgICAgIC8vIEtpY2sgb2ZmIHRoZSBsb2FkLiBEbyBpdCBzb29uIHJhdGhlciB0 aGFuIG5vdywgYmVjYXVzZSB3ZSBtYXkgYmUgaW4gdGhlIG1pZGRsZSBvZiBsYXlvdXQsCkBAIC0x NTMsOCArMTM3LDYgQEAgUmVmUHRyPEZvbnQ+IENTU0ZvbnRGYWNlU291cmNlOjpmb250KGNvbnN0 IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBib28KICAgICAgICAgUmVmPEZvbnQ+ IHBsYWNlaG9sZGVyRm9udENvcHlJbkxvYWRpbmdTdGF0ZSA9IEZvbnQ6OmNyZWF0ZShwbGFjZWhv bGRlckZvbnQtPnBsYXRmb3JtRGF0YSgpLCB0cnVlLCB0cnVlKTsKICAgICAgICAgcmV0dXJuIFdU Rk1vdmUocGxhY2Vob2xkZXJGb250Q29weUluTG9hZGluZ1N0YXRlKTsKICAgICB9Ci0KLSAgICBy ZXR1cm4gZm9udC5yZWxlYXNlKCk7CiB9CiAKICNpZiBFTkFCTEUoU1ZHX0ZPTlRTKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmggYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaAppbmRleCBmNjk4NThkMGNjYjg0YWNjMTc5MzY2 YjEwMjZiMGE0MDEzZmIwNmQwLi4zNTgyMTM0ZTA4ZDc1ZjUyZmFkYzdkNGE0N2UwOTczYWEzMjA5 N2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaApAQCAtMzQsNyArMzQs NiBAQAogI2luY2x1ZGUgIlNWR0ZvbnRGYWNlRWxlbWVudC5oIgogI2VuZGlmCiAjaW5jbHVkZSAi VGltZXIuaCIKLSNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0 b21pY1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC04MSw3ICs4MCw2IEBAIHBy aXZhdGU6CiAgICAgQXRvbWljU3RyaW5nIG1fc3RyaW5nOyAvLyBVUkkgZm9yIHJlbW90ZSwgYnVp bHQtaW4gZm9udCBuYW1lIGZvciBsb2NhbC4KICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRGb250PiBtX2ZvbnQ7IC8vIEZvciByZW1vdGUgZm9udHMsIGEgcG9pbnRlciB0byBvdXIgY2Fj aGVkIHJlc291cmNlLgogICAgIENTU0ZvbnRGYWNlKiBtX2ZhY2U7IC8vIE91ciBvd25pbmcgZm9u dCBmYWNlLgotICAgIEhhc2hNYXA8dW5zaWduZWQsIFJlZlB0cjxGb250Pj4gbV9mb250VGFibGU7 IC8vIFRoZSBoYXNoIGtleSBpcyBjb21wb3NlZCBvZiBzaXplIHN5bnRoZXRpYyBzdHlsZXMuCiAK ICNpZiBFTkFCTEUoU1ZHX09URl9DT05WRVJURVIpCiAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4g bV9nZW5lcmF0ZWRPVEZCdWZmZXI7Cg== 269792 2016-01-25 14:16:55 -0800 2016-01-25 16:35:26 -0800 Patch for committing bug-153440-20160125141629.patch text/plain 6079 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdhZGM4NGJhOWMzOTJi YmYzNjhmMTE4ZDU1Mjk0NjEwMjE4Mjc3Yi4uMjU1ZDNkMzRmMWI1NjNmZDFlZTY5MTAxYjgyNzc3 ZGM2MzZmNTU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTAxLTI1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGJy b2tlbiBjYWNoZSBmcm9tIENTU0ZvbnRGYWNlU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM0NDAKKworICAgICAgICBSZXZpZXdlZCBieSBT aW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhpcyBjYWNoZSBoYXMgYmVlbiBicm9rZW4gc2luY2Ug MjAxMyAocjE1ODA4NSkuIEdpdmVuIHdlIGRpZG4ndCBub3RpY2UgYSBwZXJmCisgICAgICAgIGhp dCB3aGVuIGl0IGJyb2tlLCBhbmQgdGhlIGZhY3QgaXQncyBiZWVuIGJyb2tlbiBmb3IgeWVhcnMs IGl0IGNsZWFybHkgaXNuJ3QKKyAgICAgICAgbmVjZXNzYXJ5LgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM0MTQgY29uc2lzdHMgb2YgYSBmYWly bHkgaW52YXNpdmUKKyAgICAgICAgY2hhbmdlIHRvIENTU0ZvbnRGYWNlU291cmNlOyB0aGlzIHBh dGNoIGluY2x1ZGVzIGEgd29ya2luZyB2ZXJzaW9uIG9mIHRoaXMKKyAgICAgICAgY2FjaGUsIGFs b25nIHdpdGggYW4gZWFzeSB3YXkgdG8gZW5hYmxlL2Rpc2FibGUgaXQgKHRvIG1lYXN1cmUgcG9z c2libGUgcGVyZgorICAgICAgICBjaGFuZ2VzKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEg c2hvcnQtdGVybSBjbGVhbnVwIHBhdGNoIGluIHRoZSBtZWFuIHRpbWUgdW50aWwgdGhlIGFib3Zl CisgICAgICAgIGludmFzaXZlIGNoYW5nZSBnZXRzIGxhbmRlZC4KKworICAgICAgICBObyBuZXcg dGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciAob3IgcGVyZm9ybWFuY2UhKSBjaGFu Z2UuCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTRm9udEZhY2VTb3VyY2U6OmZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9u dEZhY2VTb3VyY2U6On5DU1NGb250RmFjZVNvdXJjZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpDU1NGb250RmFjZVNvdXJjZTo6cHJ1bmVUYWJsZSk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpDU1NGb250RmFjZVNvdXJjZTo6Zm9udExvYWRlZCk6IERlbGV0ZWQuCisgICAgICAg ICogY3NzL0NTU0ZvbnRGYWNlU291cmNlLmg6CisKIDIwMTYtMDEtMjUgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbV2luXSBBbm90aGVyIGJ1 aWxkIGZpeCBhZnRlciByMTk1NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2VTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNl LmNwcAppbmRleCA0Mzc1Y2ZmYzIxMGVkMTI2Mzc2ZGJkMjk1YjE3YWEzOWFmOGM1OGRhLi43MmM4 MTExMTY2YzEzMjYwZWI3ODlhN2M1ZDRlZjhmZDRmYWI4ZGU3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZVNvdXJjZS5jcHAKQEAgLTY2LDE1ICs2Niw2IEBAIENTU0ZvbnRGYWNlU291 cmNlOjp+Q1NTRm9udEZhY2VTb3VyY2UoKQogewogICAgIGlmIChtX2ZvbnQpCiAgICAgICAgIG1f Zm9udC0+cmVtb3ZlQ2xpZW50KHRoaXMpOwotICAgIHBydW5lVGFibGUoKTsKLX0KLQotdm9pZCBD U1NGb250RmFjZVNvdXJjZTo6cHJ1bmVUYWJsZSgpCi17Ci0gICAgaWYgKG1fZm9udFRhYmxlLmlz RW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9mb250VGFibGUuY2xlYXIoKTsKIH0K IAogYm9vbCBDU1NGb250RmFjZVNvdXJjZTo6aXNWYWxpZCgpIGNvbnN0CkBAIC04Niw3ICs3Nyw2 IEBAIGJvb2wgQ1NTRm9udEZhY2VTb3VyY2U6OmlzVmFsaWQoKSBjb25zdAogCiB2b2lkIENTU0Zv bnRGYWNlU291cmNlOjpmb250TG9hZGVkKENhY2hlZEZvbnQqKQogewotICAgIHBydW5lVGFibGUo KTsKICAgICBpZiAobV9mYWNlKQogICAgICAgICBtX2ZhY2UtPmZvbnRMb2FkZWQodGhpcyk7CiB9 CkBAIC0xMDcsMTkgKzk3LDEyIEBAIFJlZlB0cjxGb250PiBDU1NGb250RmFjZVNvdXJjZTo6Zm9u dChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgYm9vCiAgICAgICAgIHJl dHVybiBGb250Q2FjaGU6OnNpbmdsZXRvbigpLmZvbnRGb3JGYW1pbHkoZm9udERlc2NyaXB0aW9u LCBtX3N0cmluZywgdHJ1ZSk7CiAgICAgfQogCi0gICAgdW5zaWduZWQgaGFzaEtleSA9IChmb250 RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSArIDEpIDw8IDUgfCBmb250RGVzY3JpcHRp b24ud2lkdGhWYXJpYW50KCkgPDwgMwotICAgICAgICAgICAgICAgICAgICAgICB8IChmb250RGVz Y3JpcHRpb24ub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbCA/IDQgOiAwKSB8IChzeW50aGV0aWNC b2xkID8gMiA6IDApIHwgKHN5bnRoZXRpY0l0YWxpYyA/IDEgOiAwKTsKLQotICAgIFJlZlB0cjxG b250PiBmb250ID0gbV9mb250VGFibGUuYWRkKGhhc2hLZXksIG51bGxwdHIpLml0ZXJhdG9yLT52 YWx1ZTsKLSAgICBpZiAoZm9udCkKLSAgICAgICAgcmV0dXJuIGZvbnQucmVsZWFzZSgpOwotCiAg ICAgaWYgKCFtX2ZvbnQgfHwgbV9mb250LT5pc0xvYWRlZCgpKSB7CiAgICAgICAgIGlmIChtX2Zv bnQpIHsKICAgICAgICAgICAgIGlmICghbV9mb250LT5lbnN1cmVDdXN0b21Gb250RGF0YShtX3N0 cmluZykpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAgICAgICAgIGZv bnQgPSBtX2ZvbnQtPmNyZWF0ZUZvbnQoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZywgc3ludGhl dGljQm9sZCwgc3ludGhldGljSXRhbGljLCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlh bnRTZXR0aW5ncyk7CisgICAgICAgICAgICByZXR1cm4gbV9mb250LT5jcmVhdGVGb250KGZvbnRE ZXNjcmlwdGlvbiwgbV9zdHJpbmcsIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgZm9u dEZhY2VGZWF0dXJlcywgZm9udEZhY2VWYXJpYW50U2V0dGluZ3MpOwogICAgICAgICB9IGVsc2Ug ewogI2lmIEVOQUJMRShTVkdfRk9OVFMpCiAgICAgICAgICAgICAvLyBJbi1Eb2N1bWVudCBTVkcg Rm9udHMKQEAgLTEzNywyNCArMTIwLDIxIEBAIFJlZlB0cjxGb250PiBDU1NGb250RmFjZVNvdXJj ZTo6Zm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgYm9vCiAgICAg ICAgICAgICAgICAgYXV0byBjdXN0b21QbGF0Zm9ybURhdGEgPSBjcmVhdGVGb250Q3VzdG9tUGxh dGZvcm1EYXRhKCptX2dlbmVyYXRlZE9URkJ1ZmZlcik7CiAgICAgICAgICAgICAgICAgaWYgKCFj dXN0b21QbGF0Zm9ybURhdGEpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwot ICAgICAgICAgICAgICAgIGZvbnQgPSBGb250OjpjcmVhdGUoY3VzdG9tUGxhdGZvcm1EYXRhLT5m b250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhldGlj SXRhbGljLCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlhbnRTZXR0aW5ncyksIHRydWUs IGZhbHNlKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gRm9udDo6Y3JlYXRlKGN1c3RvbVBsYXRm b3JtRGF0YS0+Zm9udFBsYXRmb3JtRGF0YShmb250RGVzY3JpcHRpb24sIHN5bnRoZXRpY0JvbGQs IHN5bnRoZXRpY0l0YWxpYywgZm9udEZhY2VGZWF0dXJlcywgZm9udEZhY2VWYXJpYW50U2V0dGlu Z3MpLCB0cnVlLCBmYWxzZSk7CiAjZWxzZQotICAgICAgICAgICAgICAgIGZvbnQgPSBGb250Ojpj cmVhdGUoc3RkOjptYWtlX3VuaXF1ZTxTVkdGb250RGF0YT4obV9zdmdGb250RmFjZUVsZW1lbnQu Z2V0KCkpLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhldGljQm9s ZCwgc3ludGhldGljSXRhbGljKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gRm9udDo6Y3JlYXRl KHN0ZDo6bWFrZV91bmlxdWU8U1ZHRm9udERhdGE+KG1fc3ZnRm9udEZhY2VFbGVtZW50LmdldCgp KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXRpY0JvbGQsIHN5 bnRoZXRpY0l0YWxpYyk7CiAjZW5kaWYKICAgICAgICAgICAgIH0KICNlbmRpZgorICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAvLyBL aWNrIG9mZiB0aGUgbG9hZC4gRG8gaXQgc29vbiByYXRoZXIgdGhhbiBub3csIGJlY2F1c2Ugd2Ug bWF5IGJlIGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0LAogICAgICAgICAvLyBhbmQgdGhlIGxvYWRl ciBtYXkgaW52b2tlIGFyYml0cmFyeSBkZWxlZ2F0ZSBvciBldmVudCBoYW5kbGVyIGNvZGUuCiAg ICAgICAgIGZvbnRTZWxlY3Rvci0+YmVnaW5Mb2FkaW5nRm9udFNvb24obV9mb250LmdldCgpKTsK IAotICAgICAgICBSZWY8Rm9udD4gcGxhY2Vob2xkZXJGb250ID0gRm9udENhY2hlOjpzaW5nbGV0 b24oKS5sYXN0UmVzb3J0RmFsbGJhY2tGb250KGZvbnREZXNjcmlwdGlvbik7Ci0gICAgICAgIFJl ZjxGb250PiBwbGFjZWhvbGRlckZvbnRDb3B5SW5Mb2FkaW5nU3RhdGUgPSBGb250OjpjcmVhdGUo cGxhY2Vob2xkZXJGb250LT5wbGF0Zm9ybURhdGEoKSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAgICAgIHJl dHVybiBXVEZNb3ZlKHBsYWNlaG9sZGVyRm9udENvcHlJbkxvYWRpbmdTdGF0ZSk7CisgICAgICAg IHJldHVybiBGb250OjpjcmVhdGUoRm9udENhY2hlOjpzaW5nbGV0b24oKS5sYXN0UmVzb3J0RmFs bGJhY2tGb250KGZvbnREZXNjcmlwdGlvbiktPnBsYXRmb3JtRGF0YSgpLCB0cnVlLCB0cnVlKTsK ICAgICB9Ci0KLSAgICByZXR1cm4gZm9udC5yZWxlYXNlKCk7CiB9CiAKICNpZiBFTkFCTEUoU1ZH X0ZPTlRTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNl LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaAppbmRleCBmNjk4NThk MGNjYjg0YWNjMTc5MzY2YjEwMjZiMGE0MDEzZmIwNmQwLi4zNTgyMTM0ZTA4ZDc1ZjUyZmFkYzdk NGE0N2UwOTczYWEzMjA5N2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2VTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2Uu aApAQCAtMzQsNyArMzQsNiBAQAogI2luY2x1ZGUgIlNWR0ZvbnRGYWNlRWxlbWVudC5oIgogI2Vu ZGlmCiAjaW5jbHVkZSAiVGltZXIuaCIKLSNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC04 MSw3ICs4MCw2IEBAIHByaXZhdGU6CiAgICAgQXRvbWljU3RyaW5nIG1fc3RyaW5nOyAvLyBVUkkg Zm9yIHJlbW90ZSwgYnVpbHQtaW4gZm9udCBuYW1lIGZvciBsb2NhbC4KICAgICBDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRGb250PiBtX2ZvbnQ7IC8vIEZvciByZW1vdGUgZm9udHMsIGEgcG9p bnRlciB0byBvdXIgY2FjaGVkIHJlc291cmNlLgogICAgIENTU0ZvbnRGYWNlKiBtX2ZhY2U7IC8v IE91ciBvd25pbmcgZm9udCBmYWNlLgotICAgIEhhc2hNYXA8dW5zaWduZWQsIFJlZlB0cjxGb250 Pj4gbV9mb250VGFibGU7IC8vIFRoZSBoYXNoIGtleSBpcyBjb21wb3NlZCBvZiBzaXplIHN5bnRo ZXRpYyBzdHlsZXMuCiAKICNpZiBFTkFCTEUoU1ZHX09URl9DT05WRVJURVIpCiAgICAgUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gbV9nZW5lcmF0ZWRPVEZCdWZmZXI7Cg==