189147 2018-08-29 22:33:32 -0700 svg/W3C-SVG-1.1/render-groups-03-t.svg and some other SVG tests leak documents 2018-09-19 03:11:05 -0700 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=189460 InRadar P2 Normal --- 1 simon.fraser simon.fraser ap commit-queue dino mmaxfield sabouhallawa simon.fraser webkit-bug-importer zimmermann oldest_to_newest 1455160 0 simon.fraser 2018-08-29 22:33:32 -0700 Seems like there's one Node left which references the doc: SVGDocument 0x28a401268 3 (refCount 0, referencingNodeCount 1) file:///Volumes/Data/Development/apple/webkit/OpenSource/LayoutTests/svg/W3C-SVG-1.1/render-groups-03-t.svg 1457974 1 simon.fraser 2018-09-08 20:20:06 -0700 There's an SVGFontFaceElement that doesn't go away. 1457980 2 349276 simon.fraser 2018-09-08 20:29:19 -0700 Created attachment 349276 Patch showing how to use RefToken tracking on SVGFontFaceElements 1457990 3 simon.fraser 2018-09-08 20:54:29 -0700 There's a retain cycle: 3 0x107903384 WTF::RefPtr<WebCore::SVGFontFaceElement, WTF::DumbPtrTraits<WebCore::SVGFontFaceElement> >::RefPtr(WebCore::SVGFontFaceElement*) 4 0x1078db8ed WTF::RefPtr<WebCore::SVGFontFaceElement, WTF::DumbPtrTraits<WebCore::SVGFontFaceElement> >::RefPtr(WebCore::SVGFontFaceElement*) 5 0x1078db696 WebCore::CSSFontFaceSource::CSSFontFaceSource(WebCore::CSSFontFace&, WTF::String const&, WebCore::CachedFont*, WebCore::SVGFontFaceElement*, WTF::RefPtr<JSC::ArrayBufferView, WTF::DumbPtrTraits<JSC::ArrayBufferView> >&&) 6 0x1078dbb9d WebCore::CSSFontFaceSource::CSSFontFaceSource(WebCore::CSSFontFace&, WTF::String const&, WebCore::CachedFont*, WebCore::SVGFontFaceElement*, WTF::RefPtr<JSC::ArrayBufferView, WTF::DumbPtrTraits<JSC::ArrayBufferView> >&&) 7 0x1078cc4f6 WebCore::CSSFontFace::appendSources(WebCore::CSSFontFace&, WebCore::CSSValueList&, WebCore::Document*, bool) 8 0x1078de81d WebCore::CSSFontSelector::addFontFaceRule(WebCore::StyleRuleFontFace&, bool) 9 0x1078ddd9d WebCore::CSSFontSelector::buildCompleted() Document -> CSSFontSelector -> CSSFontFaceSource -> SVGFontFaceElement -> Document. 1457991 4 webkit-bug-importer 2018-09-08 20:54:55 -0700 <rdar://problem/44269623> 1457996 5 349282 simon.fraser 2018-09-08 21:07:50 -0700 Created attachment 349282 Patch 1458229 6 349282 commit-queue 2018-09-10 14:19:59 -0700 Comment on attachment 349282 Patch Clearing flags on attachment: 349282 Committed r235862: <https://trac.webkit.org/changeset/235862> 1458230 7 commit-queue 2018-09-10 14:20:01 -0700 All reviewed patches have been landed. Closing bug. 349276 2018-09-08 20:29:19 -0700 2018-09-08 21:08:04 -0700 Patch showing how to use RefToken tracking on SVGFontFaceElements SVGFontFaceElement-ref-tracking.patch text/plain 3557 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VNYWMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL21hYy9QYWdlTWFjLm1tCmluZGV4IDQ0ZTk0MGMxZWU0NTk2OGVhZDFmYzky MzQ1NzBkOWQ5MWRlZGU4MzMuLmMxZjM5NTM2YjEzZWMwMDU1NDI2M2EzNjRlZGU5MGU5OGQ3MTMy YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9tYWMvUGFnZU1hYy5tbQpAQCAtMzcsNiArMzcsNyBAQAogI2lt cG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiUmVuZGVyT2JqZWN0LmgiCiAjaW1wb3J0ICJTVkdE b2N1bWVudC5oIgorI2ltcG9ydCAiU1ZHRm9udEZhY2VFbGVtZW50LmgiCiAjaW1wb3J0IDxwYWwv TG9nZ2luZy5oPgogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtODEsNiArODIsMTEgQEAgdm9pZCBQ YWdlOjpwbGF0Zm9ybUluaXRpYWxpemUoKQogICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIqIGRv Y3VtZW50VHlwZSA9IGlzPFNWR0RvY3VtZW50Pihkb2N1bWVudCkgPyAiU1ZHRG9jdW1lbnQiIDog IkRvY3VtZW50IjsKICAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIiVzICVwICVsbHUgKHJl ZkNvdW50ICVkLCByZWZlcmVuY2luZ05vZGVDb3VudCAlZCkgJXMiLCBkb2N1bWVudFR5cGUsIGRv Y3VtZW50LCBkb2N1bWVudC0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIGRvY3VtZW50LT5yZWZD b3VudCgpLCBkb2N1bWVudC0+cmVmZXJlbmNpbmdOb2RlQ291bnQoKSwgZG9jdW1lbnQtPnVybCgp LnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgCisg ICAgICAgICAgICBmb3IgKGF1dG8qIGVsZW1lbnQgOiBTVkdGb250RmFjZUVsZW1lbnQ6OmFsbFNW R0ZvbnRGYWNlRWxlbWVudHMoKSkgeworICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiU1ZH Rm9udEZhY2VFbGVtZW50ICVwIChyZWZDb3VudCAlZCkiLCBlbGVtZW50LCBlbGVtZW50LT5yZWZD b3VudCgpKTsKKyAgICAgICAgICAgICAgICBlbGVtZW50LT5yZWZUcmFja2VyKCkuZHVtcFJlbWFp bmluZ1JlZmVyZW5jZXMoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSk7CiAgICAgfSk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuY3BwCmluZGV4IDkwZWMyNjk3 Yzc3NGVjM2FjOTkwMGZkM2I2MDQ5YjgyODI4MDc5ZGYuLmZjMjE4YTZiMTI5ODU0OWIxNzYyNWZh YTU0MDJmNDk0ZTRiNmJiNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250 RmFjZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1l bnQuY3BwCkBAIC01MSwxMiArNTEsMjAgQEAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKFNW R0ZvbnRGYWNlRWxlbWVudCk7CiAKIHVzaW5nIG5hbWVzcGFjZSBTVkdOYW1lczsKIAorSGFzaFNl dDxTVkdGb250RmFjZUVsZW1lbnQqPiYgU1ZHRm9udEZhY2VFbGVtZW50OjphbGxTVkdGb250RmFj ZUVsZW1lbnRzKCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaFNldDxTVkdGb250 RmFjZUVsZW1lbnQqPj4gYWxsRWxlbWVudHM7CisgICAgcmV0dXJuIGFsbEVsZW1lbnRzOworfQor CiBpbmxpbmUgU1ZHRm9udEZhY2VFbGVtZW50OjpTVkdGb250RmFjZUVsZW1lbnQoY29uc3QgUXVh bGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDogU1ZHRWxlbWVu dCh0YWdOYW1lLCBkb2N1bWVudCkKICAgICAsIG1fZm9udEZhY2VSdWxlKFN0eWxlUnVsZUZvbnRG YWNlOjpjcmVhdGUoTXV0YWJsZVN0eWxlUHJvcGVydGllczo6Y3JlYXRlKEhUTUxTdGFuZGFyZE1v ZGUpKSkKICAgICAsIG1fZm9udEVsZW1lbnQobnVsbHB0cikKIHsKICAgICBBU1NFUlQoaGFzVGFn TmFtZShmb250X2ZhY2VUYWcpKTsKKyAgICAKKyAgICBhbGxTVkdGb250RmFjZUVsZW1lbnRzKCku YWRkKHRoaXMpOwogfQogCiBSZWY8U1ZHRm9udEZhY2VFbGVtZW50PiBTVkdGb250RmFjZUVsZW1l bnQ6OmNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCYgZG9jdW1l bnQpCkBAIC02NCw2ICs3MiwxMSBAQCBSZWY8U1ZHRm9udEZhY2VFbGVtZW50PiBTVkdGb250RmFj ZUVsZW1lbnQ6OmNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLAogICAgIHJldHVy biBhZG9wdFJlZigqbmV3IFNWR0ZvbnRGYWNlRWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCkpOwog fQogCitTVkdGb250RmFjZUVsZW1lbnQ6On5TVkdGb250RmFjZUVsZW1lbnQoKQoreworICAgIGFs bFNWR0ZvbnRGYWNlRWxlbWVudHMoKS5yZW1vdmUodGhpcyk7Cit9CisKIHZvaWQgU1ZHRm9udEZh Y2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25z dCBBdG9taWNTdHJpbmcmIHZhbHVlKQogeyAgICAKICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 SWQgPSBjc3NQcm9wZXJ0eUlkRm9yU1ZHQXR0cmlidXRlTmFtZShuYW1lKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuaAppbmRleCA0ZDUzNjUzNDViNTA2MGVjZDc2NWZkMTdk M2JmMjI1ZDAwOGMzZTNhLi44Mjk4ODc4MmY0MmM5MjBlOWRkZGNmYzM3ZTc1YjFlOGIxOWUyOTgy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvbnRGYWNlRWxlbWVudC5oCkBAIC0yNCw2ICsyNCw3 IEBACiAjaWYgRU5BQkxFKFNWR19GT05UUykKIAogI2luY2x1ZGUgIlNWR0VsZW1lbnQuaCIKKyNp bmNsdWRlIDx3dGYvSGFzaFNldC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM0LDYg KzM1LDggQEAgY2xhc3MgU1ZHRm9udEZhY2VFbGVtZW50IGZpbmFsIDogcHVibGljIFNWR0VsZW1l bnQgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoU1ZHRm9udEZhY2VFbGVtZW50KTsKIHB1 YmxpYzoKICAgICBzdGF0aWMgUmVmPFNWR0ZvbnRGYWNlRWxlbWVudD4gY3JlYXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOworICAgIAorICAgIHN0YXRpYyBIYXNoU2V0PFNWR0Zv bnRGYWNlRWxlbWVudCo+JiBhbGxTVkdGb250RmFjZUVsZW1lbnRzKCk7CiAKICAgICB1bnNpZ25l ZCB1bml0c1BlckVtKCkgY29uc3Q7CiAgICAgaW50IHhIZWlnaHQoKSBjb25zdDsKQEAgLTU1LDYg KzU4LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFNWR0ZvbnRGYWNlRWxlbWVudChjb25z dCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKKyAgICB+U1ZHRm9udEZhY2VFbGVtZW50KCk7 CiAKICAgICB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBB dG9taWNTdHJpbmcmKSBmaW5hbDsKIAo= 349282 2018-09-08 21:07:50 -0700 2018-09-10 14:19:59 -0700 Patch bug-189147-20180908210749.patch text/plain 7321 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk5ZmI2YjFjNWI5NTA4 MjAwY2QxNDNlNTViNTlkMjQ3NzdmNmYxYS4uOTVmMWY0MjEyODEwOGVhMGNhOGM1MTYyZThiZWRm ZGZhZDNkNTUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE4LTA5LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIHN2Zy9XM0MtU1ZH LTEuMS9yZW5kZXItZ3JvdXBzLTAzLXQuc3ZnIGFuZCBzb21lIG90aGVyIFNWRyB0ZXN0cyBsZWFr IGRvY3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg5MTQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IAorICAgICAgICBEb2N1bWVudDo6cmVtb3ZlZExhc3RSZWYoKSBuZWVkcyB0byBjbGVhbiB1cCBt X2ZvbnRTZWxlY3RvciwgYmVjYXVzZSBpdCBjYW4gcmVmZXJlbmNlCisgICAgICAgIENTU0ZvbnRG YWNlU291cmNlcyB0aGF0IGtlZXAgU1ZHRm9udEZhY2VFbGVtZW50cyBhbGl2ZSwgYW5kIHRoZXkg aW4gdHVybiB3aWxsIGtlZXAKKyAgICAgICAgdGhlIERvY3VtZW50IGFsaXZlLgorICAgICAgICAK KyAgICAgICAgQWxzbyBhZGQgdGhlIGJlZ2lubmluZ3Mgb2YgYSBGb250cyBsb2cgY2hhbm5lbC4K KworICAgICAgICBUaGlzIHdpbGwgYmUgdGVzdGVkIGJ5IHdvcmxkIGxlYWsgdGVzdGluZyAod2Vi a2l0Lm9yZy9iLzE4OTMzMikuCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6Q1NTRm9udFNlbGVjdG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6fkNTU0ZvbnRTZWxlY3Rvcik6CisgICAg ICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZW1v dmVkTGFzdFJlZik6CisgICAgICAgICogcGxhdGZvcm0vTG9nZ2luZy5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2Fj aGU6OnB1cmdlSW5hY3RpdmVGb250RGF0YUlmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRDYWNoZTo6cHVyZ2VJbmFjdGl2ZUZvbnREYXRhKToKKyAgICAgICAgKiBzdmcvU1ZHRm9udEZh Y2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ZvbnRGYWNlRWxlbWVudDo6U1ZH Rm9udEZhY2VFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ZvbnRGYWNlRWxlbWVudDo6 flNWR0ZvbnRGYWNlRWxlbWVudCk6CisgICAgICAgICogc3ZnL1NWR0ZvbnRGYWNlRWxlbWVudC5o OgorCiAyMDE4LTA5LTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gdHJhY2sgdW5iYWxhbmNlZCByZWYoKS9kZXJl ZigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCmluZGV4IDlhZDg4YTJhNGRm NjJhODUxNzg2YzBmMzRhOTU0MWQwYTNjZmZkY2MuLmEyZTVlYjJmYmQ3ZTMzNGE1M2MxNTMzY2Zk YTlhNjk4Nzk5MTY0MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2Vs ZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBA IC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiRm9udFNlbGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVk ZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgorI2luY2x1ZGUgIkxvZ2dpbmcu aCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlN0eWxlUHJvcGVydGllcy5oIgog I2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKQEAgLTY4LDEwICs2OSwxMyBAQCBDU1NGb250U2Vs ZWN0b3I6OkNTU0ZvbnRTZWxlY3RvcihEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgQVNTRVJUKG1f ZG9jdW1lbnQpOwogICAgIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuYWRkQ2xpZW50KCp0aGlzKTsK ICAgICBtX2Nzc0ZvbnRGYWNlU2V0LT5hZGRDbGllbnQoKnRoaXMpOworICAgIExPRyhGb250cywg IkNTU0ZvbnRTZWxlY3RvciAlcCBjdG9yIiwgdGhpcyk7CiB9CiAKIENTU0ZvbnRTZWxlY3Rvcjo6 fkNTU0ZvbnRTZWxlY3RvcigpCiB7CisgICAgTE9HKEZvbnRzLCAiQ1NTRm9udFNlbGVjdG9yICVw IGR0b3IiLCB0aGlzKTsKKwogICAgIGNsZWFyRG9jdW1lbnQoKTsKICAgICBtX2Nzc0ZvbnRGYWNl U2V0LT5yZW1vdmVDbGllbnQoKnRoaXMpOwogICAgIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkucmVt b3ZlQ2xpZW50KCp0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDU1ZThmZGFlZGI5 M2VmMzQ0MDBkYjI5MjM2ZGJmNDY4ODdkZWZiMzUuLjA5MTBkNjllNTlmYzBmZmJiMTQxZDljOTc2 YTliY2FlMjg4MTViM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNjg0LDYgKzY4NCw5 IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZWRMYXN0UmVmKCkKICNlbmRpZgogICAgICAgICBtX2Fz c29jaWF0ZWRGb3JtQ29udHJvbHMuY2xlYXIoKTsKIAorICAgICAgICBtX2ZvbnRTZWxlY3Rvci0+ Y2xlYXJEb2N1bWVudCgpOworICAgICAgICBtX2ZvbnRTZWxlY3Rvci0+dW5yZWdpc3RlckZvcklu dmFsaWRhdGlvbkNhbGxiYWNrcygqdGhpcyk7CisKICAgICAgICAgZGV0YWNoUGFyc2VyKCk7CiAK ICAgICAgICAgLy8gcmVtb3ZlRGV0YWNoZWRDaGlsZHJlbigpIGRvZXNuJ3QgYWx3YXlzIHVucmVn aXN0ZXIgSURzLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oCmluZGV4IGI0N2NiZjk5Mzk5MWEy YWNhZDkzNWMzN2ZkMmM1NTM2OWVkNjU2ZTQuLjM5MGUzNzVmN2ZmZDY4ZjRkN2I3NGYwMWY1OWVm MWFmZGNlYzM4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmgKQEAgLTQ5LDYgKzQ5LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIE0oRXZlbnRzKSBcCiAgICAgTShGaWxlQVBJKSBc CiAgICAgTShGaWx0ZXJzKSBcCisgICAgTShGb250cykgXAogICAgIE0oRnJhbWVzKSBcCiAgICAg TShGVFApIFwKICAgICBNKEZ1bGxzY3JlZW4pIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCmluZGV4IGQyNDhmMmZmOGViMDAwODQzYmY4ODc2YWRk MjkyZTljNDAyZDJjYzMuLjU4NzczYmU3M2MyNmMzNzkxMzk4MDkwYmQ1NDBiM2E5MjBhZDU2YmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcApA QCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAjaW5jbHVkZSAiRm9u dFBsYXRmb3JtRGF0YS5oIgogI2luY2x1ZGUgIkZvbnRTZWxlY3Rvci5oIgorI2luY2x1ZGUgIkxv Z2dpbmcuaCIKICNpbmNsdWRlICJXZWJLaXRGb250RmFtaWx5TmFtZXMuaCIKICNpbmNsdWRlIDx3 dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaD4KQEAg LTM1MCw2ICszNTEsOCBAQCB2b2lkIEZvbnRDYWNoZTo6cHVyZ2VJbmFjdGl2ZUZvbnREYXRhSWZO ZWVkZWQoKQogICAgIGJvb2wgdW5kZXJNZW1vcnlQcmVzc3VyZSA9IE1lbW9yeVByZXNzdXJlSGFu ZGxlcjo6c2luZ2xldG9uKCkuaXNVbmRlck1lbW9yeVByZXNzdXJlKCk7CiAgICAgdW5zaWduZWQg aW5hY3RpdmVGb250RGF0YUxpbWl0ID0gdW5kZXJNZW1vcnlQcmVzc3VyZSA/IGNNYXhVbmRlck1l bW9yeVByZXNzdXJlSW5hY3RpdmVGb250RGF0YSA6IGNNYXhJbmFjdGl2ZUZvbnREYXRhOwogCisg ICAgTE9HKEZvbnRzLCAiRm9udENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGFJZk5lZWRlZCgp IC0gdW5kZXJNZW1vcnlQcmVzc3VyZSAlZCwgaW5hY3RpdmVGb250RGF0YUxpbWl0ICV1IiwgdW5k ZXJNZW1vcnlQcmVzc3VyZSwgaW5hY3RpdmVGb250RGF0YUxpbWl0KTsKKwogICAgIGlmIChjYWNo ZWRGb250cygpLnNpemUoKSA8IGluYWN0aXZlRm9udERhdGFMaW1pdCkKICAgICAgICAgcmV0dXJu OwogICAgIHVuc2lnbmVkIGluYWN0aXZlQ291bnQgPSBpbmFjdGl2ZUZvbnRDb3VudCgpOwpAQCAt MzYyLDYgKzM2NSw4IEBAIHZvaWQgRm9udENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGFJZk5l ZWRlZCgpCiAKIHZvaWQgRm9udENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGEodW5zaWduZWQg cHVyZ2VDb3VudCkKIHsKKyAgICBMT0coRm9udHMsICJGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVG b250RGF0YSgldSkiLCBwdXJnZUNvdW50KTsKKwogICAgIHBydW5lVW5yZWZlcmVuY2VkRW50cmll c0Zyb21Gb250Q2FzY2FkZUNhY2hlKCk7CiAgICAgcHJ1bmVTeXN0ZW1GYWxsYmFja0ZvbnRzKCk7 CiAKQEAgLTM3Miw2ICszNzcsNyBAQCB2b2lkIEZvbnRDYWNoZTo6cHVyZ2VJbmFjdGl2ZUZvbnRE YXRhKHVuc2lnbmVkIHB1cmdlQ291bnQpCiAgICAgd2hpbGUgKHB1cmdlQ291bnQpIHsKICAgICAg ICAgVmVjdG9yPFJlZlB0cjxGb250PiwgMjA+IGZvbnRzVG9EZWxldGU7CiAgICAgICAgIGZvciAo YXV0byYgZm9udCA6IGNhY2hlZEZvbnRzKCkudmFsdWVzKCkpIHsKKyAgICAgICAgICAgIExPRyhG b250cywgIiB0cnlpbmcgdG8gcHVyZ2UgZm9udCAlcyAoaGFzIG9uZSByZWYgJWQpIiwgZm9udC0+ cGxhdGZvcm1EYXRhKCkuZGVzY3JpcHRpb24oKS51dGY4KCkuZGF0YSgpLCBmb250LT5oYXNPbmVS ZWYoKSk7CiAgICAgICAgICAgICBpZiAoIWZvbnQtPmhhc09uZVJlZigpKQogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgZm9udHNUb0RlbGV0ZS5hcHBlbmQoV1RGTW92ZShm b250KSk7CkBAIC0zOTYsNiArNDAyLDkgQEAgdm9pZCBGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVG b250RGF0YSh1bnNpZ25lZCBwdXJnZUNvdW50KQogICAgICAgICBpZiAoZW50cnkudmFsdWUgJiYg IWNhY2hlZEZvbnRzKCkuY29udGFpbnMoKmVudHJ5LnZhbHVlKSkKICAgICAgICAgICAgIGtleXNU b1JlbW92ZS51bmNoZWNrZWRBcHBlbmQoZW50cnkua2V5KTsKICAgICB9CisKKyAgICBMT0coRm9u dHMsICIgcmVtb3ZpbmcgJWx1IGtleXMiLCBrZXlzVG9SZW1vdmUuc2l6ZSgpKTsKKwogICAgIGZv ciAoYXV0byYga2V5IDoga2V5c1RvUmVtb3ZlKQogICAgICAgICBmb250UGxhdGZvcm1EYXRhQ2Fj aGUoKS5yZW1vdmUoa2V5KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0Zv bnRGYWNlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50 LmNwcAppbmRleCA5MGVjMjY5N2M3NzRlYzNhYzk5MDBmZDNiNjA0OWI4MjgyODA3OWRmLi5mZTNi NjE5NTMwZDUxMGI1NTcyYWUyNWEwYTE0Y2JkODBiOGI2OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkRv Y3VtZW50LmgiCiAjaW5jbHVkZSAiRWxlbWVudEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiRm9udENh c2NhZGUuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiU1ZHRG9jdW1lbnRFeHRl bnNpb25zLmgiCiAjaW5jbHVkZSAiU1ZHRm9udEVsZW1lbnQuaCIKICNpbmNsdWRlICJTVkdGb250 RmFjZVNyY0VsZW1lbnQuaCIKQEAgLTU2LDkgKzU3LDE1IEBAIGlubGluZSBTVkdGb250RmFjZUVs ZW1lbnQ6OlNWR0ZvbnRGYWNlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBE b2N1CiAgICAgLCBtX2ZvbnRGYWNlUnVsZShTdHlsZVJ1bGVGb250RmFjZTo6Y3JlYXRlKE11dGFi bGVTdHlsZVByb3BlcnRpZXM6OmNyZWF0ZShIVE1MU3RhbmRhcmRNb2RlKSkpCiAgICAgLCBtX2Zv bnRFbGVtZW50KG51bGxwdHIpCiB7CisgICAgTE9HKEZvbnRzLCAiU1ZHRm9udEZhY2VFbGVtZW50 ICVwIGN0b3IiLCB0aGlzKTsKICAgICBBU1NFUlQoaGFzVGFnTmFtZShmb250X2ZhY2VUYWcpKTsK IH0KIAorU1ZHRm9udEZhY2VFbGVtZW50Ojp+U1ZHRm9udEZhY2VFbGVtZW50KCkKK3sKKyAgICBM T0coRm9udHMsICJTVkdGb250RmFjZUVsZW1lbnQgJXAgZHRvciIsIHRoaXMpOworfQorCiBSZWY8 U1ZHRm9udEZhY2VFbGVtZW50PiBTVkdGb250RmFjZUVsZW1lbnQ6OmNyZWF0ZShjb25zdCBRdWFs aWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCYgZG9jdW1lbnQpCiB7CiAgICAgcmV0dXJuIGFk b3B0UmVmKCpuZXcgU1ZHRm9udEZhY2VFbGVtZW50KHRhZ05hbWUsIGRvY3VtZW50KSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmgKaW5kZXggNGQ1MzY1MzQ1YjUwNjBlY2Q3 NjVmZDE3ZDNiZjIyNWQwMDhjM2UzYS4uOGY4YmE1ODkyYmUyODA3OThlZTQxZGMwMGJkMWIzY2I3 ZDMwOThhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvbnRGYWNlRWxlbWVu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb250RmFjZUVsZW1lbnQuaApAQCAtNTUs NiArNTUsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgU1ZHRm9udEZhY2VFbGVtZW50KGNv bnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOworICAgIH5TVkdGb250RmFjZUVsZW1lbnQo KTsKIAogICAgIHZvaWQgcGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0 IEF0b21pY1N0cmluZyYpIGZpbmFsOwogCg==