204671 2019-11-28 03:05:12 -0800 [GTK] Turn off antialiasing when rendering with Ahem 2020-01-17 04:00:07 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=54763 https://bugs.webkit.org/show_bug.cgi?id=206265 P2 Normal --- 54763 205187 1 magomez clopez bugs-noreply cgarcia clopez ews-watchlist fujii mcatanzaro mmaxfield pnormand simon.fraser oldest_to_newest 1593990 0 magomez 2019-11-28 03:05:12 -0800 r252701 disabled antialiasing for the Ahem font (which is just rectangles for testing) for apple, and marked as passing all the failing tests, but these are not passing for gtk yet. Maybe we should follow the same approach and disable antialiasing. imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-002.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-003.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-004.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-005.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-006.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-007.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-008.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-009.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-010.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-014.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-015.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-016.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-017.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-002.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-003.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-004.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-005.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-justify-006.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-002.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-003.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-004.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-005.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-006.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-007.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-008.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-009.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-010.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-014.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-015.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-016.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-text/text-align/text-align-start-017.html [ ImageOnlyFailure ] 1606680 1 387726 clopez 2020-01-14 16:28:38 -0800 Created attachment 387726 Patch 1606832 2 387726 cgarcia 2020-01-15 00:48:11 -0800 Comment on attachment 387726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387726&action=review > Source/WebCore/ChangeLog:11 > + the glyps causes small pixel differences with the reference test. glyps -> glyphs > Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp:139 > + FcChar8* fontConfigFamilyName; > + FcPatternGetString(m_platformData.fcPattern(), FC_FAMILY, 0, &fontConfigFamilyName); > + String familyName = String::fromUTF8(reinterpret_cast<char*>(fontConfigFamilyName)); > + // Disable antialiasing for the Ahem font because many tests require this. > + if (equalIgnoringASCIICase(familyName, "Ahem")) > + m_allowsAntialiasing = false; This doesn't work for web fonts, because FC_FAMILY is not set. You need to set the family name in FontCustomPlatformData::fontPlatformData(). Since we are always going to modify the pattern now, we can modify defaultFontconfigOptions() to return a RefPtr with the static pattern duplicated. Then you can get the family name from the FC face directly (freeTypeFace->family_name) and set it in the pattern with FcPatternAddString 1606895 3 clopez 2020-01-15 06:14:15 -0800 (In reply to Carlos Garcia Campos from comment #2) > This doesn't work for web fonts, because FC_FAMILY is not set. You need to > set the family name in FontCustomPlatformData::fontPlatformData(). Since we > are always going to modify the pattern now, we can modify > defaultFontconfigOptions() to return a RefPtr with the static pattern > duplicated. Then you can get the family name from the FC face directly > (freeTypeFace->family_name) and set it in the pattern with FcPatternAddString You are totally right! And thanks for the pointers! very useful :) After testing this I can see how now it works across a bigger range of tests, including fixing the ones from bug 206265 and bug 152821. 1606901 4 clopez 2020-01-15 06:28:14 -0800 *** Bug 152821 has been marked as a duplicate of this bug. *** 1606912 5 clopez 2020-01-15 06:44:14 -0800 Committed r254567: <https://trac.webkit.org/changeset/254567> 1607620 6 clopez 2020-01-16 13:26:38 -0800 (In reply to Carlos Alberto Lopez Perez from comment #5) > Committed r254567: <https://trac.webkit.org/changeset/254567> It seems I caused a leak here because I didn't call adoptRef() when creating the RefPtr from FcPattern. Re-opening to fix 1607648 7 387956 clopez 2020-01-16 14:04:04 -0800 Created attachment 387956 Patch 1607902 8 387956 cgarcia 2020-01-17 00:10:43 -0800 Comment on attachment 387956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387956&action=review > Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:75 > + return RefPtr<FcPattern>(adoptRef(FcPatternDuplicate(pattern))); Isn't return adoptRef(FcPatternDuplicate(pattern)) enough? 1607940 9 clopez 2020-01-17 03:54:33 -0800 (In reply to Carlos Garcia Campos from comment #8) > Comment on attachment 387956 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387956&action=review > > > Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:75 > > + return RefPtr<FcPattern>(adoptRef(FcPatternDuplicate(pattern))); > > Isn't return adoptRef(FcPatternDuplicate(pattern)) enough? yes, it is.. will change it before landing 1607941 10 clopez 2020-01-17 04:00:07 -0800 Committed r254741: <https://trac.webkit.org/changeset/254741> 387726 2020-01-14 16:28:38 -0800 2020-01-16 14:04:00 -0800 Patch bug-204671-20200115012837.patch text/plain 9546 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZmOGM1MmE1ZTM5Y2Nk Mzg5MDdlYjcxNmRlMTM1YmU0ODBmOGIwZi4uZTMwYjEwZDBjNTQ4ODZlNWJlNzVmZTM4NWE2NWI5 Y2NiMTVhNTQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAxLTE0ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFR1cm4gb2ZmIGFudGlhbGlhc2luZyB3aGVuIHJlbmRlcmluZyB3aXRoIEFoZW0KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDY3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hbnkgQ1NTIHJlbGF0 ZWQgdGVzdHMgdXNlIHRoZSAiQWhlbSIgZm9udCB0byBjb21wYXJlIGl0cyBzcGVjaWFsCisgICAg ICAgIHNxdWFyZWQgZ2x5cGhzIHdpdGggdGhlIHBvc2l0aW9uZWQgZWxlbWVudHMgb2YgdGhlIHRl c3QuIEJ1dCBpZgorICAgICAgICB3ZSBlbmFibGUgYW50aWFsaWFzaW5nIGZvciB0aGlzIGZvbnQs IHRoZW4gdGhlIGFudGlhbGlhc2luZyBvZgorICAgICAgICB0aGUgZ2x5cHMgY2F1c2VzIHNtYWxs IHBpeGVsIGRpZmZlcmVuY2VzIHdpdGggdGhlIHJlZmVyZW5jZSB0ZXN0LgorCisgICAgICAgIFNv LCB0aGlzIHBhdGNoIGRpc2FibGVzIGFudGlhbGlhc2luZyBmb3IgdGhlIEFoZW0gZm9udCBpbiBH VEsgYW5kIFdQRQorICAgICAgICBwb3J0cy4gVGhpcyBjb21taXQgaXRzIHByZXR0eSBtdWNoIGxp a2UgcjI1MjcwMSBmb3IgdGhlIE1hYy9pT1MgcG9ydHMuCisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBo aWNzQ29udGV4dEltcGxDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHRJbXBsQ2Fpcm86OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6cGxhdGZvcm1Jbml0KToKKwogMjAyMC0wMS0xNCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gVW5yZXZpZXdlZCBidWlsZCB3 YXJuaW5nIGZpeCBhZnRlciByMjU0NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRJbXBsQ2Fpcm8uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0SW1wbENhaXJv LmNwcAppbmRleCAxYTgxZDQwM2Q0MDI0YzMxYjAyYTI0OGM0ZWUyY2FlNmFkZDUxMjdmLi5iY2Ey OWRmYjY5NDk4NmU4Nzc0NjZiOGYwNzc4NmZiZDFiZjM5NDU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRJbXBsQ2Fpcm8u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dEltcGxDYWlyby5jcHAKQEAgLTI1NCw2ICsyNTQsOSBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dEltcGxDYWlybzo6ZHJhd0dseXBocyhjb25zdCBGb250JiBmb250LCBjb25zdCBHbHlwaEJ1 ZmZlciYgZwogICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZvbnQgPSBmb250LnBsYXRm b3JtRGF0YSgpLnNjYWxlZEZvbnQoKTsKICAgICBkb3VibGUgc3ludGhldGljQm9sZE9mZnNldCA9 IGZvbnQuc3ludGhldGljQm9sZE9mZnNldCgpOwogCisgICAgaWYgKCFmb250LmFsbG93c0FudGlh bGlhc2luZygpKQorICAgICAgICBmb250U21vb3RoaW5nID0gRm9udFNtb290aGluZ01vZGU6Ok5v U21vb3RoaW5nOworCiAgICAgYXV0byYgc3RhdGUgPSBncmFwaGljc0NvbnRleHQoKS5zdGF0ZSgp OwogICAgIENhaXJvOjpkcmF3R2x5cGhzKG1fcGxhdGZvcm1Db250ZXh0LCBDYWlybzo6RmlsbFNv dXJjZShzdGF0ZSksIENhaXJvOjpTdHJva2VTb3VyY2Uoc3RhdGUpLAogICAgICAgICBDYWlybzo6 U2hhZG93U3RhdGUoc3RhdGUpLCBwb2ludCwgc2NhbGVkRm9udCwgc3ludGhldGljQm9sZE9mZnNl dCwgZ2x5cGhzLCB4T2Zmc2V0LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNw cAppbmRleCBjZDA4MmNhNTA1N2VjNDhhOTkzZDc4OTk1YjZjOWI1ZGNhNmJkZDU5Li4xNmUxMmJi NTc5N2Y4ZTcxNjVmYWJhY2I5OGU4NmU1YzVmZmZkMmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVG b250RGF0YUZyZWVUeXBlLmNwcApAQCAtMTMwLDYgKzEzMCwxMyBAQCB2b2lkIEZvbnQ6OnBsYXRm b3JtSW5pdCgpCiAgICAgfQogCiAgICAgbV9zeW50aGV0aWNCb2xkT2Zmc2V0ID0gbV9wbGF0Zm9y bURhdGEuc3ludGhldGljQm9sZCgpID8gMS4wZiA6IDAuZjsKKworICAgIEZjQ2hhcjgqIGZvbnRD b25maWdGYW1pbHlOYW1lOworICAgIEZjUGF0dGVybkdldFN0cmluZyhtX3BsYXRmb3JtRGF0YS5m Y1BhdHRlcm4oKSwgRkNfRkFNSUxZLCAwLCAmZm9udENvbmZpZ0ZhbWlseU5hbWUpOworICAgIFN0 cmluZyBmYW1pbHlOYW1lID0gU3RyaW5nOjpmcm9tVVRGOChyZWludGVycHJldF9jYXN0PGNoYXIq Pihmb250Q29uZmlnRmFtaWx5TmFtZSkpOworICAgIC8vIERpc2FibGUgYW50aWFsaWFzaW5nIGZv ciB0aGUgQWhlbSBmb250IGJlY2F1c2UgbWFueSB0ZXN0cyByZXF1aXJlIHRoaXMuCisgICAgaWYg KGVxdWFsSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZSwgIkFoZW0iKSkKKyAgICAgICAgbV9h bGxvd3NBbnRpYWxpYXNpbmcgPSBmYWxzZTsKIH0KIAogdm9pZCBGb250OjpwbGF0Zm9ybUNoYXJX aWR0aEluaXQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IGYwZWJkYTA1NzZhODQ5MTc4MTk3OTgzNjBmMjUxNzMzNzJlMjBm NTUuLmUwMTkyYWUyNzA4M2QzOGVhMTc4MjU1YTAwNDc5MTZlN2JjNGE5OTcgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMC0wMS0xNCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9w ZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBUdXJuIG9mZiBhbnRpYWxpYXNpbmcgd2hl biByZW5kZXJpbmcgd2l0aCBBaGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDQ2NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTAx LTE0ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtGcmVldHlwZV0gU3VwcG9ydCBmb3IgdGhlIC13ZWJraXQtZm9udC1zbW9vdGhpbmcg Q1NTIHByb3BlcnR5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCmlu ZGV4IGVlZDlhYTZkMTVmMWYzYzllNmQxZTM0ZDBlMzAyNTRmN2Y5YzhjZWYuLjI5NmMxNGE5ZGNl OWMzNzRjZGVjNzAwMmYxNGI3ODllZTc5ODZlOTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9UZXN0RXhwZWN0YXRpb25zCkBAIC0zOTI3LDQyICszOTI3LDEwIEBAIHdlYmtpdC5vcmcvYi8y MDM2Nzcgc3ZnL1czQy1TVkctMS4xL3BhaW50aW5nLWZpbGwtMDUtYi5zdmcgWyBGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi85OTAzNiBwb2ludGVyLWxvY2svbG9ja2VkLWVsZW1lbnQtaWZyYW1lLXJl bW92ZWQtZnJvbS1kb20uaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzk5MDM2IHBvaW50 ZXItbG9jay9wb2ludGVybG9ja2NoYW5nZS1wb2ludGVybG9ja2Vycm9yLWV2ZW50cy5odG1sIFsg RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLW11bHRpY29sL211bHRpY29sLXJ1bGUtZnJhY3Rpb24tMDAzLnhodCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtbXVsdGljb2wvbXVsdGljb2wtcnVsZS1zaG9ydGhhbmQt Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0LWFsaWdu LWVuZC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC90ZXh0LWFsaWduL3Rl eHQtYWxpZ24tZW5kLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQt YWxpZ24vdGV4dC1hbGlnbi1lbmQtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRl eHQvdGV4dC1hbGlnbi90ZXh0LWFsaWduLWVuZC0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tZW5kLTAwNS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1lbmQtMDA2Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0LWFsaWduLWVuZC0wMDcu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24t ZW5kLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4 dC1hbGlnbi1lbmQtMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1h bGlnbi90ZXh0LWFsaWduLWVuZC0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tZW5kLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1lbmQtMDE1Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0LWFsaWduLWVuZC0wMTYuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tZW5kLTAxNy5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1q dXN0aWZ5LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0Njcx IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24v dGV4dC1hbGlnbi1qdXN0aWZ5LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0 L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1qdXN0aWZ5LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1qdXN0aWZ5LTAwNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1qdXN0aWZ5LTAw NS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGln bi1qdXN0aWZ5LTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0 NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxp Z24vdGV4dC1hbGlnbi1zdGFydC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tc3RhcnQtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0LWFsaWduLXN0YXJ0LTAwMy5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1zdGFydC0wMDQuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tc3Rh cnQtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0 LWFsaWduLXN0YXJ0LTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQt YWxpZ24vdGV4dC1hbGlnbi1zdGFydC0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi a2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt dGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tc3RhcnQtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90ZXh0LWFsaWduLXN0YXJ0LTAwOS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3RleHQtYWxpZ24vdGV4dC1hbGlnbi1zdGFydC0wMTAu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24t c3RhcnQtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDQ2NzEg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvdGV4dC1hbGlnbi90 ZXh0LWFsaWduLXN0YXJ0LTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjA0NjcxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3Rl eHQtYWxpZ24vdGV4dC1hbGlnbi1zdGFydC0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIwNDY3MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtdGV4dC90ZXh0LWFsaWduL3RleHQtYWxpZ24tc3RhcnQtMDE3Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMDYyNjQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLW11bHRpY29sL211bHRpY29sLWdhcC1wZXJjZW50YWdlLTAwMS5odG1sIFsg RmFpbHVyZSBdCisKK3dlYmtpdC5vcmcvYi8yMDYyNjUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLW11bHRpY29sL211bHRpY29sLXJ1bGUtZnJhY3Rpb24tMDAzLnhodCBb IEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIwNjI2NSBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtbXVsdGljb2wvbXVsdGljb2wtcnVsZS1zaG9ydGhhbmQt Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzIwNDY3NSBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL29mZnNjcmVlbi1jYW52YXMvY29tcG9zaXRpbmcvMmQu Y29tcG9zaXRlLmdsb2JhbEFscGhhLmNhbnZhc3BhdHRlcm4uaHRtbCBbIEZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIwNDY3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL29mZnNjcmVl bi1jYW52YXMvY29tcG9zaXRpbmcvMmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmNhbnZhc3BhdHRl cm4ud29ya2VyLmh0bWwgWyBGYWlsdXJlIF0K 387956 2020-01-16 14:04:04 -0800 2020-01-17 00:10:43 -0800 Patch bug-204671-20200116230403.patch text/plain 8104 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ2NDAyOGRlYWI3Zjg5 ZjQzYzgyNTM5ZWE4NTQ0ODg2ODdmZjY2ZC4uM2M1ZDdiZTgwMThiYTNjZWQ0MDUzMmIzZTZhOWVm ZDU1YTUyYzM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTAxLTE2ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFR1cm4gb2ZmIGFudGlhbGlhc2luZyB3aGVuIHJlbmRlcmluZyB3aXRoIEFoZW0gKHYyKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NjcxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGxlYWsg Y2F1c2VkIGJ5IHIyNTQ1Njcgd2hlcmUgYSBSZWZQdHIgaXRzIGNyZWF0ZWQgZnJvbSBhIEZjUGF0 dGVybiB3aXRob3V0IGFkb3B0UmVmKCkuCisgICAgICAgIE1lYW53aGlsZSBhdCBpdCwgYWxzbyBj aGFuZ2UgZGVmYXVsdEZvbnRjb25maWdPcHRpb25zKCkgdG8gcmV0dXJuIGEgUmVmUHRyLAorICAg ICAgICBiZWNhdXNlIGFmdGVyIHIyNTQ1Njcgd2UgYWx3YXlzIG1vZGlmeSB0aGUgcGF0dGVybi4K KyAgICAgICAgQ2hhbmdlIGFsc28gdGhlIEZvbnRQbGF0Zm9ybURhdGEoKSBjb25zdHJ1Y3RvciB0 byB0YWtlIGFuIHJ2YWx1ZSByZWZlcmVuY2UsCisgICAgICAgIGFuZCBzb21lIG9mIGl0cyBjYWxs ZXJzIHRvIG1vdmUgdGhlIFJlZlB0ciwgYXZvaWRpbmcgZXh0cmEgbm90IG5lZWRlZAorICAgICAg ICByZWZlcmVuY2UgaW5jcmVtZW50cy9kZWNyZW1lbnRzLgorCisgICAgICAgIENvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZv cm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hl RnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFj a0ZvckNoYXJhY3RlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250 UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250 Q3VzdG9tUGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVmYXVs dEZvbnRjb25maWdPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDdXN0b21QbGF0Zm9y bURhdGE6OmZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG b250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToKKwogMjAyMC0wMS0xNiAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSB0aGUgY2FsbEFzeW5j SmF2YVNjcmlwdEZ1bmN0aW9uIGZ1bmN0aW9uIGFjdHVhbGx5IGJlIGFzeW5jIChzbyBhd2FpdCB3 b3JrcykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 UGxhdGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxh dGZvcm1EYXRhLmgKaW5kZXggMjRiMmM5NjM2MTg4MTE0Y2M3ZmEzODdlZjJkZGMxYTViODg0Njk1 Ni4uZDM4ZDRkZDkxMjBhMDllYWUyM2VjZWI1NjkzODExNWZkNjcwMDc4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAt MTExLDcgKzExMSw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgVVNFKEZSRUVUWVBFKQotICAg IEZvbnRQbGF0Zm9ybURhdGEoY2Fpcm9fZm9udF9mYWNlX3QqLCBGY1BhdHRlcm4qLCBmbG9hdCBz aXplLCBib29sIGZpeGVkV2lkdGgsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNP YmxpcXVlLCBGb250T3JpZW50YXRpb24pOworICAgIEZvbnRQbGF0Zm9ybURhdGEoY2Fpcm9fZm9u dF9mYWNlX3QqLCBSZWZQdHI8RmNQYXR0ZXJuPiYmLCBmbG9hdCBzaXplLCBib29sIGZpeGVkV2lk dGgsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNPYmxpcXVlLCBGb250T3JpZW50 YXRpb24pOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShXSU4pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVl VHlwZS5jcHAKaW5kZXggODU0YTY1YmJmM2NiNmY4ZTViNWUxNGViYWJmZmIzYjVjMWZkMjA3MC4u NDU5MGU2MTNiZmM3MmFlYTI0NjhlNjE4NWI5MDNjMGQ5MjY2MDAyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRD YWNoZUZyZWVUeXBlLmNwcApAQCAtMjcyLDcgKzI3Miw3IEBAIFJlZlB0cjxGb250PiBGb250Q2Fj aGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVycyhjb25zdCBGb250RGVzY3JpcHRpb24mIGRl c2NyCiAgICAgZ2V0Rm9udFByb3BlcnRpZXNGcm9tUGF0dGVybihyZXN1bHRQYXR0ZXJuLmdldCgp LCBkZXNjcmlwdGlvbiwgZml4ZWRXaWR0aCwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZSk7CiAKICAgICBSZWZQdHI8Y2Fpcm9fZm9udF9mYWNlX3Q+IGZvbnRGYWNlID0gYWRvcHRSZWYo Y2Fpcm9fZnRfZm9udF9mYWNlX2NyZWF0ZV9mb3JfcGF0dGVybihyZXN1bHRQYXR0ZXJuLmdldCgp KSk7Ci0gICAgRm9udFBsYXRmb3JtRGF0YSBhbHRlcm5hdGVGb250RGF0YShmb250RmFjZS5nZXQo KSwgcmVzdWx0UGF0dGVybi5nZXQoKSwgZGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwg Zml4ZWRXaWR0aCwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZSwgZGVzY3JpcHRpb24u b3JpZW50YXRpb24oKSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBhbHRlcm5hdGVGb250RGF0YShm b250RmFjZS5nZXQoKSwgV1RGTW92ZShyZXN1bHRQYXR0ZXJuKSwgZGVzY3JpcHRpb24uY29tcHV0 ZWRQaXhlbFNpemUoKSwgZml4ZWRXaWR0aCwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZSwgZGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSk7CiAgICAgcmV0dXJuIGZvbnRGb3JQbGF0Zm9y bURhdGEoYWx0ZXJuYXRlRm9udERhdGEpOwogfQogCkBAIC01NzksNyArNTc5LDcgQEAgc3RkOjp1 bmlxdWVfcHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3Jt RGF0YShjb25zdCBGb250RGUKICAgICAgICAgICAgIEZjUGF0dGVybkFkZFN0cmluZyhyZXN1bHRQ YXR0ZXJuLmdldCgpLCBGQ19GT05UX1ZBUklBVElPTlMsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg RmNDaGFyOCo+KHZhcmlhbnRzLnV0ZjgoKS5kYXRhKCkpKTsKICAgICB9CiAjZW5kaWYKLSAgICBh dXRvIHBsYXRmb3JtRGF0YSA9IG1ha2VVbmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4oZm9udEZhY2Uu Z2V0KCksIHJlc3VsdFBhdHRlcm4uZ2V0KCksIGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVs U2l6ZSgpLCBmaXhlZFdpZHRoLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNPYmxpcXVlLCBmb250 RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSk7CisgICAgYXV0byBwbGF0Zm9ybURhdGEgPSBtYWtl VW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KGZvbnRGYWNlLmdldCgpLCBXVEZNb3ZlKHJlc3VsdFBh dHRlcm4pLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgZml4ZWRXaWR0aCwg c3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0 aW9uKCkpOwogICAgIC8vIFZlcmlmeSB0aGF0IHRoaXMgZm9udCBoYXMgYW4gZW5jb2RpbmcgY29t cGF0aWJsZSB3aXRoIEZvbnRjb25maWcuIEZvbnRjb25maWcgY3VycmVudGx5CiAgICAgLy8gc3Vw cG9ydHMgdGhyZWUgZW5jb2RpbmdzIGluIEZjRnJlZVR5cGVDaGFySW5kZXg6IFVuaWNvZGUsIFN5 bWJvbCBhbmQgQXBwbGVSb21hbi4KICAgICAvLyBJZiB0aGlzIGZvbnQgZG9lc24ndCBoYXZlIG9u ZSBvZiB0aGVzZSB0aHJlZSBlbmNvZGluZ3MsIGRvbid0IHNlbGVjdCBpdC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0b21QbGF0 Zm9ybURhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m cmVldHlwZS9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCmluZGV4IDhjODQxNjMx Y2RjMTY4ZjdmYWQ4NGIwOTczMTE4ZTdiYmViNmE2NTMuLmUyODJjNjUzNWM1N2ExNzZlOGIwY2I1 YTkxMjA2NDhjNTM1ZWQwMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udEN1c3RvbVBsYXRm b3JtRGF0YUZyZWVUeXBlLmNwcApAQCAtNTYsNyArNTYsNyBAQCBGb250Q3VzdG9tUGxhdGZvcm1E YXRhOjpGb250Q3VzdG9tUGxhdGZvcm1EYXRhKEZUX0ZhY2UgZnJlZVR5cGVGYWNlLCBTaGFyZWRC dWZmZQogICAgICAgICByZWludGVycHJldF9jYXN0PGNhaXJvX2Rlc3Ryb3lfZnVuY190PihyZWlu dGVycHJldF9jYXN0PHZvaWQoKikodm9pZCk+KEZUX0RvbmVfRmFjZSkpKTsKIH0KIAotc3RhdGlj IEZjUGF0dGVybiogZGVmYXVsdEZvbnRjb25maWdPcHRpb25zKCkKK3N0YXRpYyBSZWZQdHI8RmNQ YXR0ZXJuPiBkZWZhdWx0Rm9udGNvbmZpZ09wdGlvbnMoKQogewogICAgIC8vIEdldCBzb21lIGdl bmVyaWMgZGVmYXVsdCBzZXR0aW5ncyBmcm9tIGZvbnRjb25maWcgZm9yIHdlYiBmb250cy4gU3Ry YXRlZ3kKICAgICAvLyBmcm9tIEJlaGRhZCBFc2ZhaGJvZCBpbiBodHRwczovL2NvZGUuZ29vZ2xl LmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTczMjA3I2MzNQpAQCAtNzIsMTQgKzcy LDE0IEBAIHN0YXRpYyBGY1BhdHRlcm4qIGRlZmF1bHRGb250Y29uZmlnT3B0aW9ucygpCiAgICAg ICAgIEZjUGF0dGVybkRlbChwYXR0ZXJuLCBGQ19GQU1JTFkpOwogICAgICAgICBGY0NvbmZpZ1N1 YnN0aXR1dGUobnVsbHB0ciwgcGF0dGVybiwgRmNNYXRjaEZvbnQpOwogICAgIH0sIHBhdHRlcm4p OwotICAgIHJldHVybiBwYXR0ZXJuOworICAgIHJldHVybiBSZWZQdHI8RmNQYXR0ZXJuPihhZG9w dFJlZihGY1BhdHRlcm5EdXBsaWNhdGUocGF0dGVybikpKTsKIH0KIAogRm9udFBsYXRmb3JtRGF0 YSBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNj cmlwdGlvbiYgZGVzY3JpcHRpb24sIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIGNvbnN0IEZvbnRG ZWF0dXJlU2V0dGluZ3MmLCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzKQogewog ICAgIGF1dG8qIGZyZWVUeXBlRmFjZSA9IHN0YXRpY19jYXN0PEZUX0ZhY2U+KGNhaXJvX2ZvbnRf ZmFjZV9nZXRfdXNlcl9kYXRhKG1fZm9udEZhY2UuZ2V0KCksICZmcmVlVHlwZUZhY2VLZXkpKTsK ICAgICBBU1NFUlQoZnJlZVR5cGVGYWNlKTsKLSAgICBSZWZQdHI8RmNQYXR0ZXJuPiBwYXR0ZXJu ID0gRmNQYXR0ZXJuRHVwbGljYXRlKGRlZmF1bHRGb250Y29uZmlnT3B0aW9ucygpKTsKKyAgICBS ZWZQdHI8RmNQYXR0ZXJuPiBwYXR0ZXJuID0gZGVmYXVsdEZvbnRjb25maWdPcHRpb25zKCk7CiAg ICAgRmNQYXR0ZXJuQWRkU3RyaW5nKHBhdHRlcm4uZ2V0KCksIEZDX0ZBTUlMWSwgcmVpbnRlcnBy ZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZnJlZVR5cGVGYWNlLT5mYW1pbHlfbmFtZSkpOwogI2lm IEVOQUJMRShWQVJJQVRJT05fRk9OVFMpCiAgICAgYXV0byB2YXJpYW50cyA9IGJ1aWxkVmFyaWF0 aW9uU2V0dGluZ3MoZnJlZVR5cGVGYWNlLCBkZXNjcmlwdGlvbik7CkBAIC04Nyw3ICs4Nyw3IEBA IEZvbnRQbGF0Zm9ybURhdGEgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6Zm9udFBsYXRmb3JtRGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mCiAgICAgICAgIEZjUGF0dGVybkFkZFN0cmluZyhwYXR0 ZXJuLmdldCgpLCBGQ19GT05UX1ZBUklBVElPTlMsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmND aGFyOCo+KHZhcmlhbnRzLnV0ZjgoKS5kYXRhKCkpKTsKICAgICB9CiAjZW5kaWYKLSAgICByZXR1 cm4gRm9udFBsYXRmb3JtRGF0YShtX2ZvbnRGYWNlLmdldCgpLCBwYXR0ZXJuLmdldCgpLCBkZXNj cmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpLCBmcmVlVHlwZUZhY2UtPmZhY2VfZmxhZ3MgJiBG VF9GQUNFX0ZMQUdfRklYRURfV0lEVEgsIGJvbGQsIGl0YWxpYywgZGVzY3JpcHRpb24ub3JpZW50 YXRpb24oKSk7CisgICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGEobV9mb250RmFjZS5nZXQoKSwg V1RGTW92ZShwYXR0ZXJuKSwgZGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgZnJlZVR5 cGVGYWNlLT5mYWNlX2ZsYWdzICYgRlRfRkFDRV9GTEFHX0ZJWEVEX1dJRFRILCBib2xkLCBpdGFs aWMsIGRlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCkpOwogfQogCiBzdGF0aWMgYm9vbCBpbml0aWFs aXplRnJlZVR5cGVMaWJyYXJ5KEZUX0xpYnJhcnkmIGxpYnJhcnkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJl ZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9u dFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAppbmRleCAxNmQ1ZDkzMjgxY2RmYmMzYTIzZDEyN2Vi NWFjOTk5YmM3NmJiZGRkLi40NTBjZGEwMzc3N2E4MmU1NDI1YjhmYTgxZDI4NzBkNWMzYjYwZDFh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9G b250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKQEAgLTExMSwx MCArMTExLDEwIEBAIHN0YXRpYyB2b2lkIHNldENhaXJvRm9udE9wdGlvbnNGcm9tRm9udENvbmZp Z1BhdHRlcm4oY2Fpcm9fZm9udF9vcHRpb25zX3QqIG9wdGlvCiAjZW5kaWYKIH0KIAotRm9udFBs YXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCogZm9udEZhY2Us IEZjUGF0dGVybiogcGF0dGVybiwgZmxvYXQgc2l6ZSwgYm9vbCBmaXhlZFdpZHRoLCBib29sIHN5 bnRoZXRpY0JvbGQsIGJvb2wgc3ludGhldGljT2JsaXF1ZSwgRm9udE9yaWVudGF0aW9uIG9yaWVu dGF0aW9uKQorRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2Zh Y2VfdCogZm9udEZhY2UsIFJlZlB0cjxGY1BhdHRlcm4+JiYgcGF0dGVybiwgZmxvYXQgc2l6ZSwg Ym9vbCBmaXhlZFdpZHRoLCBib29sIHN5bnRoZXRpY0JvbGQsIGJvb2wgc3ludGhldGljT2JsaXF1 ZSwgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogICAgIDogRm9udFBsYXRmb3JtRGF0YShz aXplLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNPYmxpcXVlLCBvcmllbnRhdGlvbikKIHsKLSAg ICBtX3BhdHRlcm4gPSBwYXR0ZXJuOworICAgIG1fcGF0dGVybiA9IFdURk1vdmUocGF0dGVybik7 CiAgICAgbV9maXhlZFdpZHRoID0gZml4ZWRXaWR0aDsKIAogICAgIGJ1aWxkU2NhbGVkRm9udChm b250RmFjZSk7Cg==