178624 2017-10-21 10:27:57 -0700 [GTK] Support CSS4 generic "system-ui" font family 2023-08-24 09:26:06 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified ASSIGNED https://bugs.webkit.org/show_bug.cgi?id=221445 P2 Normal --- 177755 1 aperez aperez bugs-noreply buildbot calvin.walton cgarcia clopez dvpdiner2 mcatanzaro mmaxfield oldest_to_newest 1363046 0 aperez 2017-10-21 10:27:57 -0700 This was implemented for “-webkit-system-font” and “-webkit-system-ui” in bug #177755 but support for the (unprefixed) “system-ui” font family was left out. We should support this as well because it's specified as part of CSS4, see https://www.w3.org/TR/css-fonts-4/#system-ui-def 1363050 1 324503 aperez 2017-10-21 12:51:17 -0700 Created attachment 324503 Patch 1363079 2 324503 aperez 2017-10-21 14:59:49 -0700 Comment on attachment 324503 Patch The layout test is not passing, I'll check why is that. 1363176 3 aperez 2017-10-22 15:16:10 -0700 After adding some debug-prints, it turns out that instead of “system-ui”, the string “system-uie” is being received, which of course is wrong: operator(): family 'system-uie' fontRangesForFamily: family 'system-uie' resolveGenericFamily: family 'system-uie' getFamilyNameStringFromFamily: 'system-uie' The first two log lines are already in the WebCore CSS code, so it looks like I'll have to go deeper in there to find out what is going on here with this fishy value for the font family name. 1844200 4 452730 aperez 2022-02-21 07:43:22 -0800 Created attachment 452730 Patch Working patch, with added handling of a few more cases. 1844210 5 452730 mcatanzaro 2022-02-21 07:54:45 -0800 Comment on attachment 452730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452730&action=review > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:335 > + // TODO: Add support for ui-serif, ui-monospace, and ui-rounded. I would remove this TODO, because I don't think we can actually do it. > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:341 > + || equalLettersIgnoringASCIICase(family, "ui-sans-serif")) I would remove this line. There is no guarantee that the default GTK font will be Cantarell or sans serif. We should stick to implementing the font names that really make sense with our platform. E.g. WPE has no concept of UI fonts distinct from Fontconfig's defaults, so we simply don't implement system fonts there. GNOME does have a UI monospace font (it's currently Source Code Pro) distinct from the Fontconfig defaults, but not sans or serif, while GTK has no such distinctions at all. Since there are no corresponding UI fonts, implementing them here doesn't make a ton of sense. We *could* choose to map these names to Fontconfig defaults, but then there would be no difference between e.g. "ui-sans-serif" vs. normal "sans," so I do not see much point in doing so. 1844216 6 aperez 2022-02-21 08:15:29 -0800 (In reply to Michael Catanzaro from comment #5) > Comment on attachment 452730 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452730&action=review > > > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:335 > > + // TODO: Add support for ui-serif, ui-monospace, and ui-rounded. > > I would remove this TODO, because I don't think we can actually do it. For ui-monospace we could try to get the monospace font set system wide for GNOME, if possible. I have left that out of this patch because it would need some changes in GtkSettingsManager so I would rather do that in a separate patch. > > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:341 > > + || equalLettersIgnoringASCIICase(family, "ui-sans-serif")) > > I would remove this line. There is no guarantee that the default GTK font > will be Cantarell or sans serif. We should stick to implementing the font > names that really make sense with our platform. E.g. WPE has no concept of > UI fonts distinct from Fontconfig's defaults, so we simply don't implement > system fonts there. GNOME does have a UI monospace font (it's currently > Source Code Pro) distinct from the Fontconfig defaults, but not sans or > serif, while GTK has no such distinctions at all. Since there are no > corresponding UI fonts, implementing them here doesn't make a ton of sense. Yes, I was myself doubting whether to include ui-sans-serif here or not, and in the end went for it while reworking the patch a couple of days ago as the default is typically some sans serif one. Re-reading the CSS spec today (and being a bit more rested) it looks like it's probably better. Quoting the spec: “Note: ui-serif is not expected to map to any font on platforms without an appropriate system font.” (And the same note is attached to all the ui-* fonts.) > We *could* choose to map these names to Fontconfig defaults, but then there > would be no difference between e.g. "ui-sans-serif" vs. normal "sans," so I > do not see much point in doing so. At least one would get a sans font when the site designer intended to have some sans font, and so on, but given the note in the spec about better not mapping to any font when a suitable one is not available in the platform, the responsibility for planning a fallback is in the hands of the people writing the CSS (i.e. “font-family: ui-sans-serif, sans-serif;”). I'll reupload with ui-sans-serif removed from the list of matches. 1844218 7 452737 aperez 2022-02-21 08:18:43 -0800 Created attachment 452737 Patch Working patch, with match on ui-sans-serif removed. 1844220 8 452738 aperez 2022-02-21 08:36:03 -0800 Created attachment 452738 Patch Now it also builds, after adding the missing closing paren 8-) 1844389 9 452738 mcatanzaro 2022-02-21 14:34:15 -0800 Comment on attachment 452738 Patch OK, but note this breaks some tests. You'll need to investigate before landing. 1845639 10 aperez 2022-02-24 09:24:10 -0800 (In reply to Michael Catanzaro from comment #9) > Comment on attachment 452738 [details] > Patch > > OK, but note this breaks some tests. You'll need to investigate before > landing. I think most (if not all) the tests with pixel differences need a rebaseline: before this patch they would pick a serif font (which I think was the last resort fallback) before getting to pick a sans serif, but I am not 100% sure. I'll have to take a look and understand well if my changes are (partially?) to blame, I suspect doing “return family;” instead of “return "";” as last thing in the modified function could be the reason for some of the failures. But I am not sure if returning an empty string there is the best we can do, because I think that's what causes the serif font to be picked. I'll take a look at what Cocoa does, to have a “second opinion“ on this matter, too. 324503 2017-10-21 12:51:17 -0700 2022-02-21 07:43:17 -0800 Patch bug-178624-20171021225116.patch text/plain 4777 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdkZGVkZjVmOTFmNjYy NTAxOTg3YmE3MGUyNDc1YTI3ZDkzOTdiMi4uYjViNzM5NmZlNzMxYjU4ODg5NjhlNGEzNmZmZWQx ZTJlNWUyZWJkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEwLTIxICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g U3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBmYW1pbHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBhbHNvIHRoZSAic3lz dGVtLXVpIiBnZW5lcmljIGZvbnQgbmFtZSwgb24gdG9wIG9mIHRoZSBwcmVmaXhlZCB2ZXJzaW9u cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Z2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1pbHkpOgorICAgICAgICAoV2ViQ29yZTo6aXND b21tb25seVVzZWRHZW5lcmljRmFtaWx5KToKKwogMjAxNy0xMC0yMSAgQW50b2luZSBRdWludCAg PGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWIgQW5pbWF0aW9uc10gQWRkIGJpbmRp bmdzIHRvIHVuaWZpZWQgc291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCmluZGV4 IGFlMTZkMjQyNGFmNzUxZDk1YWE3Mjc2MjQ2YWU5N2UzMjIwYmY2YjAuLjBiYTAzMzZlZWY5MjZl YzgwNDA3NmMxYTg1ZjZmNjlmZWM3NTM1NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5j cHAKQEAgLTE2Myw3ICsxNjMsNyBAQCBzdGF0aWMgU3RyaW5nIGdldEZhbWlseU5hbWVTdHJpbmdG cm9tRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KQogICAgICAgICByZXR1cm4gImZh bnRhc3kiOwogCiAjaWYgUExBVEZPUk0oR1RLKQotICAgIGlmIChmYW1pbHkgPT0gc3lzdGVtVWlG YW1pbHkgfHwgZmFtaWx5ID09ICItd2Via2l0LXN5c3RlbS1mb250IikKKyAgICBpZiAoZmFtaWx5 ID09ICJzeXN0ZW0tdWkiIHx8IGZhbWlseSA9PSBzeXN0ZW1VaUZhbWlseSB8fCBmYW1pbHkgPT0g Ii13ZWJraXQtc3lzdGVtLWZvbnQiKQogICAgICAgICByZXR1cm4gZGVmYXVsdEd0a1N5c3RlbUZv bnQoKTsKICNlbmRpZgogCkBAIC0zMjcsNiArMzI3LDcgQEAgc3RhdGljIGlubGluZSBib29sIGlz Q29tbW9ubHlVc2VkR2VuZXJpY0ZhbWlseShjb25zdCBTdHJpbmcmIGZhbWlseU5hbWVTdHJpbmcp CiAgICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJp bmcsICJtb25vc3BhY2UiKQogICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2Fz ZShmYW1pbHlOYW1lU3RyaW5nLCAiZmFudGFzeSIpCiAjaWYgUExBVEZPUk0oR1RLKQorICAgICAg ICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAic3lz dGVtLXVpIikKICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5 TmFtZVN0cmluZywgIi13ZWJraXQtc3lzdGVtLWZvbnQiKQogICAgICAgICB8fCBlcXVhbExldHRl cnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLXdlYmtpdC1zeXN0ZW0tdWki KQogI2VuZGlmCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYmM5ZGI3YjBjNTIyMmZhMzg0YzZkNDJmZDBmMThiNmFhNGFkZjM3 Ny4uYzgzNGUxMGFiMDA1NzM4YmY0YWRiNTA0MjcyZTJmODUxNjk2ZDU0MCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE1IEBACisyMDE3LTEwLTIxICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gU3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11 aSIgZm9udCBmYW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODYyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1vZGlmeSB0aGUgdGVzdCB0byBhbHNvIGhhbmRsZSB0aGUgInN5c3RlbS11aSIgZ2Vu ZXJpYyBmb250IG5hbWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9u dC1leHBlY3RlZC5odG1sOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250 Lmh0bWw6CisKIDIwMTctMTAtMjEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFN1cHBvcnQgOjpiZWZvcmUvOjphZnRlciBwc2V1ZG8gZWxlbWVudHMgd2l0aCBk aXNwbGF5OmNvbnRlbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9u dHMvc3lzdGVtRm9udC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zv bnRzL3N5c3RlbUZvbnQtZXhwZWN0ZWQuaHRtbAppbmRleCA4MzNkYTQ1NDJkYWJkODhlMDZkNjUx ZjkwMDJiMDU3NjQ3ZDcyZjE1Li45NjQ1NzJiYzViNzUzNDNlNjU4YjQ4MWI1N2IwZWIwODBmOWQw ODNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9u dC1leHBlY3RlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9zeXN0 ZW1Gb250LWV4cGVjdGVkLmh0bWwKQEAgLTE4LDYgKzE4LDExIEBACiAJCTxwPjxiPkJvbGQgc3lz dGVtIGZvbnQ8L2I+PC9wPgogCQk8cD48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48 L2k+PC9wPgogCisJCTxwPlN5c3RlbSBmb250PC9wPgorCQk8cD48aT5JdGFsaWMgc3lzdGVtIGZv bnQ8L2k+PC9wPgorCQk8cD48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHA+PGk+PGI+ Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKwogCQk8cCBzdHlsZT0iZm9udC1z aXplOiAyNHB4Ij5TeXN0ZW0gZm9udDwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogMTJwdCI+ PGk+SXRhbGljIHN5c3RlbSBmb250PC9pPjwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogc21h bGwiPjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9mb250cy9zeXN0ZW1Gb250Lmh0bWwKaW5kZXggODAzMjhlNDE3ZDllY2E3OGZjNzVjYzJj NWM2NjAzYjQ1MDdkZjAwMC4uZTRhYWVhMjc3NTVjOTNjMGJhZTUxNWU4MmZlZDRhNTljMzQ0YTYw ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC5odG1s CkBAIC02LDYgKzYsNyBAQAogCQk8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgogCQlwLnN5c3RlbS1m b250IHsgZm9udC1mYW1pbHk6IC13ZWJraXQtc3lzdGVtLWZvbnQgfQogCQlwLnN5c3RlbS11aSB7 IGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5c3RlbS11aSB9CisJCXAuc3lzdGVtLXVpLW5vcHJlZml4 IHsgZm9udC1mYW1pbHk6IHN5c3RlbS11aSB9CiAJCTwvc3R5bGU+CiAJPC9oZWFkPgogCTxib2R5 PgpAQCAtMTksNiArMjAsMTEgQEAKIAkJPHAgY2xhc3M9InN5c3RlbS11aSI+PGI+Qm9sZCBzeXN0 ZW0gZm9udDwvYj48L3A+CiAJCTxwIGNsYXNzPSJzeXN0ZW0tdWkiPjxpPjxiPkJvbGQgaXRhbGlj IHN5c3RlbSBmb250PC9iPjwvaT48L3A+CiAKKwkJPHAgY2xhc3M9InN5c3RlbS11aS1ub3ByZWZp eCI+U3lzdGVtIGZvbnQ8L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxpPkl0 YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgi PjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgorCQk8cCBjbGFzcz0ic3lzdGVtLXVpLW5vcHJl Zml4Ij48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCiAJCTxwIGNs YXNzPSJzeXN0ZW0tZm9udCIgc3R5bGU9ImZvbnQtc2l6ZTogMjRweCI+U3lzdGVtIGZvbnQ8L3A+ CiAJCTxwIGNsYXNzPSJzeXN0ZW0tZm9udCIgc3R5bGU9ImZvbnQtc2l6ZTogMTJwdCI+PGk+SXRh bGljIHN5c3RlbSBmb250PC9pPjwvcD4KIAkJPHAgY2xhc3M9InN5c3RlbS1mb250IiBzdHlsZT0i Zm9udC1zaXplOiBzbWFsbCI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+Cg== 452730 2022-02-21 07:43:22 -0800 2022-02-21 08:18:38 -0800 Patch bug-178624-20220221174321.patch text/plain 7631 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNkZTcwNmE2MzZlNGE5 NWUzMzc3ZTFlN2I4Y2EwODFkNmI5MTBkYS4uZGEyMWYwM2Y2MWE3YWE0YTg1MDhkNWZmNmY2Mzli MzhiOWY1NGVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTIxICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g U3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBmYW1pbHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgLWFwcGxlLXN5c3RlbSwg LWFwcGxlLXN5c3RlbS1mb250LCBzeXN0ZW0tdWksIGFuZCB1aS1zYW5zLXNlcmlmIHJlc3VsdCBp biB1c2luZyB0aGUKKyAgICAgICAgZGVmYXVsdCBHVEsgc3lzdGVtIGZvbnQuIFRoZSAtYXBwbGUg cHJlZml4ZWQgdmVyc2lvbnMgYXJlIGFkZGVkIGR1ZSB0byB0aGVtIGJlaW5nIHVzZWQgaW4KKyAg ICAgICAgc29tZSBwb3B1bGFyIHNpdGVzIChlLmcuIEdpdEh1Yikgd2hpY2ggaGF2ZSBub3QgeWV0 IGFkb3B0ZWQgc3lzdGVtLXVpIG9yIHVpLXNhbnMtc2VyaWYuIFRoZQorICAgICAgICByZWFzb24g dG8gaGFuZGxlIHVpLXNhbnMtc2VyaWYgYXMgc3lzdGVtLXVpIGlzIGJlY2F1c2UgaW4gR1RLL0dO T01FIHN5c3RlbXMgdGhlIGRlZmF1bHQgZm9udAorICAgICAgICBmYW1pbHkgaXMgc2FucyBzZXJp Zi4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC1leHBlY3Rl ZC5odG1sIG1vZGlmaWVkIHRvIGNvdmVyIHRoZSBuZXcgY2FzZXMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpnZXRGYW1pbHlOYW1lU3RyaW5nRnJvbUZhbWlseSk6CisgICAgICAgIChXZWJDb3Jl Ojppc0NvbW1vbmx5VXNlZEdlbmVyaWNGYW1pbHkpOgorCiAyMDIyLTAyLTE4ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjg4MjAxKTog QVNTRVJUSU9OIEZBSUxFRDogIWFsbFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRzTWFwKCkuY29udGFp bnMobV9pZGVudGlmaWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCmluZGV4IDY2MWRl ZDc0ZjliOTg3NzZmYjJmOGNlMjhmNzZlZDMxZDBjM2FkODcuLjlkNzA4NzRiMjRiMWFmN2M4OTRk MzgwNDEyMzM1ZTc4MjMwNjQxOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAKQEAg LTMzMSwxMCArMzMxLDE2IEBAIFZlY3RvcjxGb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzPiBGb250 Q2FjaGU6OmdldEZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXNJbkZhbWlsCiAKIHN0YXRpYyBTdHJp bmcgZ2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1pbHkoY29uc3QgU3RyaW5nJiBmYW1pbHkpCiB7 Ci0gICAgLy8gSWYgd2UncmUgY3JlYXRpbmcgYSBmYWxsYmFjayBmb250IChlLmcuICItd2Via2l0 LW1vbm9zcGFjZSIpLCBjb252ZXJ0IHRoZSBuYW1lIGludG8KLSAgICAvLyB0aGUgZmFsbGJhY2sg bmFtZSAobGlrZSAibW9ub3NwYWNlIikgdGhhdCBmb250Y29uZmlnIHVuZGVyc3RhbmRzLgotICAg IGlmIChmYW1pbHkubGVuZ3RoKCkgJiYgIWZhbWlseS5zdGFydHNXaXRoKCItd2Via2l0LSIpKQot ICAgICAgICByZXR1cm4gZmFtaWx5OworI2lmIFBMQVRGT1JNKEdUSykKKyAgICAvLyBUT0RPOiBB ZGQgc3VwcG9ydCBmb3IgdWktc2VyaWYsIHVpLW1vbm9zcGFjZSwgYW5kIHVpLXJvdW5kZWQuCisg ICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseSwgIi1hcHBsZS1zeXN0 ZW0iKQorICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHksICIt YXBwbGUtc3lzdGVtLWZvbnQiKQorICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJ Q2FzZShmYW1pbHksICItd2Via2l0LXN5c3RlbS1mb250IikKKyAgICAgICAgfHwgZXF1YWxMZXR0 ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAiLXdlYmtpdC1zeXN0ZW0tdWkiKQorICAgICAg ICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHksICJzeXN0ZW0tdWkiKQor ICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHksICJ1aS1zYW5z LXNlcmlmIikpCisgICAgICAgIHJldHVybiBkZWZhdWx0R3RrU3lzdGVtRm9udCgpOworI2VuZGlm CiAKICAgICBpZiAoZmFtaWx5ID09IGZhbWlseU5hbWVzRGF0YS0+YXQoRmFtaWx5TmFtZXNJbmRl eDo6U3RhbmRhcmRGYW1pbHkpIHx8IGZhbWlseSA9PSBmYW1pbHlOYW1lc0RhdGEtPmF0KEZhbWls eU5hbWVzSW5kZXg6OlNlcmlmRmFtaWx5KSkKICAgICAgICAgcmV0dXJuICJzZXJpZiI7CkBAIC0z NDcsMTIgKzM1Myw3IEBAIHN0YXRpYyBTdHJpbmcgZ2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1p bHkoY29uc3QgU3RyaW5nJiBmYW1pbHkpCiAgICAgaWYgKGZhbWlseSA9PSBmYW1pbHlOYW1lc0Rh dGEtPmF0KEZhbWlseU5hbWVzSW5kZXg6OkZhbnRhc3lGYW1pbHkpKQogICAgICAgICByZXR1cm4g ImZhbnRhc3kiOwogCi0jaWYgUExBVEZPUk0oR1RLKQotICAgIGlmIChmYW1pbHkgPT0gZmFtaWx5 TmFtZXNEYXRhLT5hdChGYW1pbHlOYW1lc0luZGV4OjpTeXN0ZW1VaUZhbWlseSkgfHwgZmFtaWx5 ID09ICItd2Via2l0LXN5c3RlbS1mb250IikKLSAgICAgICAgcmV0dXJuIGRlZmF1bHRHdGtTeXN0 ZW1Gb250KCk7Ci0jZW5kaWYKLQotICAgIHJldHVybiAiIjsKKyAgICByZXR1cm4gZmFtaWx5Owog fQogCiAjaWYgRkNfVkVSU0lPTiA8IDIxMzk1CkBAIC00OTIsOCArNDkzLDEyIEBAIHN0YXRpYyBp bmxpbmUgYm9vbCBpc0NvbW1vbmx5VXNlZEdlbmVyaWNGYW1pbHkoY29uc3QgU3RyaW5nJiBmYW1p bHlOYW1lU3RyaW5nKQogICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShm YW1pbHlOYW1lU3RyaW5nLCAibW9ub3NwYWNlIikKICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdu b3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZVN0cmluZywgImZhbnRhc3kiKQogI2lmIFBMQVRGT1JN KEdUSykKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFt ZVN0cmluZywgIi1hcHBsZS1zeXN0ZW0iKQorICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmlu Z0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLWFwcGxlLXN5c3RlbS1mb250IikKICAgICAg ICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZVN0cmluZywgIi13 ZWJraXQtc3lzdGVtLWZvbnQiKQogICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJ Q2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLXdlYmtpdC1zeXN0ZW0tdWkiKQorICAgICAgICB8fCBl cXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAic3lzdGVtLXVp IikKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZVN0 cmluZywgInVpLXNhbnMtc2VyaWYiKQogI2VuZGlmCiAgICAgICAgIHx8IGVxdWFsTGV0dGVyc0ln bm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJpbmcsICJjdXJzaXZlIik7CiB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg YzBkNzVjOTA2NTMwY2E0ZmI0OGJiNTUzODk2ZDdkZTc5ZTcwODhmMS4uMGU4YWU3NDUwZmZhZGJk MTJlNTNiZmY4MGFjMTRiNmM3ZDBiNGJkMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAy LTIxICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dUS10gU3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBmYW1pbHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYyNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4aXN0aW5nIHRl c3QgbW9kaWZpZWQgdG8gY292ZXIgdGhlIG5ldyBjYXNlcy4KKworICAgICAgICAqIHBsYXRmb3Jt L2d0ay9mb250cy9zeXN0ZW1Gb250LWV4cGVjdGVkLmh0bWw6CisgICAgICAgICogcGxhdGZvcm0v Z3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbDoKKwogMjAyMi0wMi0xOCAgSm9uIExlZSAgPGpvbmxl ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI4OTk5MCk6IFtpT1NdIGZhc3Qv YmFja2dyb3VuZHMvZ3JhZGllbnQtYmFja2dyb3VuZC1zaGFkb3cuaHRtbCBpcyBjb25zaXN0ZW50 bHkgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5 c3RlbUZvbnQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9z eXN0ZW1Gb250LWV4cGVjdGVkLmh0bWwKaW5kZXggODMzZGE0NTQyZGFiZDg4ZTA2ZDY1MWY5MDAy YjA1NzY0N2Q3MmYxNS4uZDQ1NzViZDFjNzNkNTJiZGQzNzVkM2ZkYWJhNzBmODNlZDM3MmQ5MSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQtZXhw ZWN0ZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9u dC1leHBlY3RlZC5odG1sCkBAIC0xOCw2ICsxOCwyMSBAQAogCQk8cD48Yj5Cb2xkIHN5c3RlbSBm b250PC9iPjwvcD4KIAkJPHA+PGk+PGI+Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwv cD4KIAorCQk8cD5TeXN0ZW0gZm9udDwvcD4KKwkJPHA+PGk+SXRhbGljIHN5c3RlbSBmb250PC9p PjwvcD4KKwkJPHA+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+CisJCTxwPjxpPjxiPkJvbGQg aXRhbGljIHN5c3RlbSBmb250PC9iPjwvaT48L3A+CisKKwkJPHA+U3lzdGVtIGZvbnQ8L3A+CisJ CTxwPjxpPkl0YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxwPjxiPkJvbGQgc3lzdGVtIGZv bnQ8L2I+PC9wPgorCQk8cD48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9w PgorCisJCTxwPlN5c3RlbSBmb250PC9wPgorCQk8cD48aT5JdGFsaWMgc3lzdGVtIGZvbnQ8L2k+ PC9wPgorCQk8cD48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHA+PGk+PGI+Qm9sZCBp dGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKwogCQk8cCBzdHlsZT0iZm9udC1zaXplOiAy NHB4Ij5TeXN0ZW0gZm9udDwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogMTJwdCI+PGk+SXRh bGljIHN5c3RlbSBmb250PC9pPjwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogc21hbGwiPjxi PkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9m b250cy9zeXN0ZW1Gb250Lmh0bWwKaW5kZXggODAzMjhlNDE3ZDllY2E3OGZjNzVjYzJjNWM2NjAz YjQ1MDdkZjAwMC4uMGQ2ZjU4OGEwNGFmMGQzNjkyOGViNWM1NTY4Y2Q0YjY0MDRlYTBkZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC5odG1sCkBAIC02 LDYgKzYsOSBAQAogCQk8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgogCQlwLnN5c3RlbS1mb250IHsg Zm9udC1mYW1pbHk6IC13ZWJraXQtc3lzdGVtLWZvbnQgfQogCQlwLnN5c3RlbS11aSB7IGZvbnQt ZmFtaWx5OiAtd2Via2l0LXN5c3RlbS11aSB9CisJCXAuc3lzdGVtLXVpLW5vcHJlZml4IHsgZm9u dC1mYW1pbHk6IHN5c3RlbS11aSB9CisJCXAuYXBwbGUtc3lzdGVtIHsgZm9udC1mYW1pbHk6IC1h cHBsZS1zeXN0ZW0gfQorCQlwLmFwcGxlLXN5c3RlbS1mb250IHsgZm9udC1mYW1pbHk6IC1hcHBs ZS1zeXN0ZW0tZm9udCB9CiAJCTwvc3R5bGU+CiAJPC9oZWFkPgogCTxib2R5PgpAQCAtMTksNiAr MjIsMjEgQEAKIAkJPHAgY2xhc3M9InN5c3RlbS11aSI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48 L3A+CiAJCTxwIGNsYXNzPSJzeXN0ZW0tdWkiPjxpPjxiPkJvbGQgaXRhbGljIHN5c3RlbSBmb250 PC9iPjwvaT48L3A+CiAKKwkJPHAgY2xhc3M9InN5c3RlbS11aS1ub3ByZWZpeCI+U3lzdGVtIGZv bnQ8L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxpPkl0YWxpYyBzeXN0ZW0g Zm9udDwvaT48L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxiPkJvbGQgc3lz dGVtIGZvbnQ8L2I+PC9wPgorCQk8cCBjbGFzcz0ic3lzdGVtLXVpLW5vcHJlZml4Ij48aT48Yj5C b2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCisJCTxwIGNsYXNzPSJhcHBsZS1z eXN0ZW0iPlN5c3RlbSBmb250PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtIj48aT5JdGFs aWMgc3lzdGVtIGZvbnQ8L2k+PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtIj48Yj5Cb2xk IHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHAgY2xhc3M9ImFwcGxlLXN5c3RlbSI+PGk+PGI+Qm9s ZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKworCQk8cCBjbGFzcz0iYXBwbGUtc3lz dGVtLWZvbnQiPlN5c3RlbSBmb250PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtLWZvbnQi PjxpPkl0YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0t Zm9udCI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0 ZW0tZm9udCI+PGk+PGI+Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKwogCQk8 cCBjbGFzcz0ic3lzdGVtLWZvbnQiIHN0eWxlPSJmb250LXNpemU6IDI0cHgiPlN5c3RlbSBmb250 PC9wPgogCQk8cCBjbGFzcz0ic3lzdGVtLWZvbnQiIHN0eWxlPSJmb250LXNpemU6IDEycHQiPjxp Pkl0YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CiAJCTxwIGNsYXNzPSJzeXN0ZW0tZm9udCIgc3R5 bGU9ImZvbnQtc2l6ZTogc21hbGwiPjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgo= 452737 2022-02-21 08:18:43 -0800 2022-02-21 09:36:43 -0800 Patch bug-178624-20220221181842.patch text/plain 7279 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRhMzc3MmNkM2E2MjI1 MDZkMTY5NzY0Y2VjNDNjZjJhZjE3Yzc4Yi4uMTE2YWUzNzg2NGY4ZGMxODZhZDJkMTYxNTYwNWI3 NDNlMzk0Y2FjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g U3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBmYW1pbHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgLWFwcGxlLXN5c3RlbSwg LWFwcGxlLXN5c3RlbS1mb250LCBhbmQgc3lzdGVtLXVpcmVzdWx0IGluIHVzaW5nIHRoZSBkZWZh dWx0IEdUSworICAgICAgICBzeXN0ZW0gZm9udC4gVGhlIC1hcHBsZSBwcmVmaXhlZCB2ZXJzaW9u cyBhcmUgYWRkZWQgZHVlIHRvIHRoZW0gYmVpbmcgdXNlZCBpbiBzb21lCisgICAgICAgIHBvcHVs YXIgc2l0ZXMgKGUuZy4gR2l0SHViKSB3aGljaCBoYXZlIG5vdCB5ZXQgYWRvcHRlZCBzeXN0ZW0t dWkuIFRoZSByZWFzb24gdG8gaGFuZGxlCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vZ3RrL2Zv bnRzL3N5c3RlbUZvbnQtZXhwZWN0ZWQuaHRtbCBtb2RpZmllZCB0byBjb3ZlciB0aGUgbmV3IGNh c2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJl ZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1p bHkpOgorICAgICAgICAoV2ViQ29yZTo6aXNDb21tb25seVVzZWRHZW5lcmljRmFtaWx5KToKKwog MjAyMi0wMi0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0lG Q11bSW50ZWdyYXRpb25dIFRha2UgdmVydGljYWwtcmwgd3JpdGluZyBtb2RlIHZhbHVlIGludG8g YWNjb3VudCB3aGVuIGNvbnZlcnRpbmcgdmlzdWFsIG1hcmdpbi9ib3JkZXIvcGFkZGluZyB2YWx1 ZSB0byBsb2dpY2FsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAKaW5kZXggNjYxZGVkNzRm OWI5ODc3NmZiMmY4Y2UyOGY3NmVkMzFkMGMzYWQ4Ny4uMDIzZDQwZjNhNTdiMGU0ZTY0NjFlY2Zl YmM3N2ZjODcxYmVmMDYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcApAQCAtMzMx LDEwICszMzEsMTQgQEAgVmVjdG9yPEZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXM+IEZvbnRDYWNo ZTo6Z2V0Rm9udFNlbGVjdGlvbkNhcGFiaWxpdGllc0luRmFtaWwKIAogc3RhdGljIFN0cmluZyBn ZXRGYW1pbHlOYW1lU3RyaW5nRnJvbUZhbWlseShjb25zdCBTdHJpbmcmIGZhbWlseSkKIHsKLSAg ICAvLyBJZiB3ZSdyZSBjcmVhdGluZyBhIGZhbGxiYWNrIGZvbnQgKGUuZy4gIi13ZWJraXQtbW9u b3NwYWNlIiksIGNvbnZlcnQgdGhlIG5hbWUgaW50bwotICAgIC8vIHRoZSBmYWxsYmFjayBuYW1l IChsaWtlICJtb25vc3BhY2UiKSB0aGF0IGZvbnRjb25maWcgdW5kZXJzdGFuZHMuCi0gICAgaWYg KGZhbWlseS5sZW5ndGgoKSAmJiAhZmFtaWx5LnN0YXJ0c1dpdGgoIi13ZWJraXQtIikpCi0gICAg ICAgIHJldHVybiBmYW1pbHk7CisjaWYgUExBVEZPUk0oR1RLKQorICAgIGlmIChlcXVhbExldHRl cnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHksICItYXBwbGUtc3lzdGVtIikKKyAgICAgICAgfHwg ZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAiLWFwcGxlLXN5c3RlbS1mb250 IikKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAiLXdl YmtpdC1zeXN0ZW0tZm9udCIpCisgICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlD YXNlKGZhbWlseSwgIi13ZWJraXQtc3lzdGVtLXVpIikKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJz SWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAic3lzdGVtLXVpIikKKyAgICAgICAgcmV0dXJuIGRl ZmF1bHRHdGtTeXN0ZW1Gb250KCk7CisjZW5kaWYKIAogICAgIGlmIChmYW1pbHkgPT0gZmFtaWx5 TmFtZXNEYXRhLT5hdChGYW1pbHlOYW1lc0luZGV4OjpTdGFuZGFyZEZhbWlseSkgfHwgZmFtaWx5 ID09IGZhbWlseU5hbWVzRGF0YS0+YXQoRmFtaWx5TmFtZXNJbmRleDo6U2VyaWZGYW1pbHkpKQog ICAgICAgICByZXR1cm4gInNlcmlmIjsKQEAgLTM0NywxMiArMzUxLDcgQEAgc3RhdGljIFN0cmlu ZyBnZXRGYW1pbHlOYW1lU3RyaW5nRnJvbUZhbWlseShjb25zdCBTdHJpbmcmIGZhbWlseSkKICAg ICBpZiAoZmFtaWx5ID09IGZhbWlseU5hbWVzRGF0YS0+YXQoRmFtaWx5TmFtZXNJbmRleDo6RmFu dGFzeUZhbWlseSkpCiAgICAgICAgIHJldHVybiAiZmFudGFzeSI7CiAKLSNpZiBQTEFURk9STShH VEspCi0gICAgaWYgKGZhbWlseSA9PSBmYW1pbHlOYW1lc0RhdGEtPmF0KEZhbWlseU5hbWVzSW5k ZXg6OlN5c3RlbVVpRmFtaWx5KSB8fCBmYW1pbHkgPT0gIi13ZWJraXQtc3lzdGVtLWZvbnQiKQot ICAgICAgICByZXR1cm4gZGVmYXVsdEd0a1N5c3RlbUZvbnQoKTsKLSNlbmRpZgotCi0gICAgcmV0 dXJuICIiOworICAgIHJldHVybiBmYW1pbHk7CiB9CiAKICNpZiBGQ19WRVJTSU9OIDwgMjEzOTUK QEAgLTQ5Miw4ICs0OTEsMTEgQEAgc3RhdGljIGlubGluZSBib29sIGlzQ29tbW9ubHlVc2VkR2Vu ZXJpY0ZhbWlseShjb25zdCBTdHJpbmcmIGZhbWlseU5hbWVTdHJpbmcpCiAgICAgICAgIHx8IGVx dWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJpbmcsICJtb25vc3BhY2Ui KQogICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3Ry aW5nLCAiZmFudGFzeSIpCiAjaWYgUExBVEZPUk0oR1RLKQorICAgICAgICB8fCBlcXVhbExldHRl cnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLWFwcGxlLXN5c3RlbSIpCisg ICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJpbmcs ICItYXBwbGUtc3lzdGVtLWZvbnQiKQogICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FT Q0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLXdlYmtpdC1zeXN0ZW0tZm9udCIpCiAgICAgICAg IHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJpbmcsICItd2Vi a2l0LXN5c3RlbS11aSIpCisgICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNl KGZhbWlseU5hbWVTdHJpbmcsICJzeXN0ZW0tdWkiKQogI2VuZGlmCiAgICAgICAgIHx8IGVxdWFs TGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGZhbWlseU5hbWVTdHJpbmcsICJjdXJzaXZlIik7CiB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggODk1NDUwOTBmNDVmMTAxODllZjEzN2RiMzYxZDQ1ZjhkNWIyYmFkNi4uYzAwY2U5 N2JiODBhYjMwN2E3ZjA2NDMzMjcwMjhkZGM3ZDY5ODdiMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDIyLTAyLTIxICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS10gU3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBm YW1pbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODYyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4 aXN0aW5nIHRlc3QgbW9kaWZpZWQgdG8gY292ZXIgdGhlIG5ldyBjYXNlcy4KKworICAgICAgICAq IHBsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250LWV4cGVjdGVkLmh0bWw6CisgICAgICAgICog cGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbDoKKwogMjAyMi0wMi0yMSAgVHlsZXIg V2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBBZGQgdGVzdCBmb3Ig cjI5MDEzMCAoaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI5MDEzMC93ZWJraXQp CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQt ZXhwZWN0ZWQuaHRtbAppbmRleCA4MzNkYTQ1NDJkYWJkODhlMDZkNjUxZjkwMDJiMDU3NjQ3ZDcy ZjE1Li5kNDU3NWJkMWM3M2Q1MmJkZDM3NWQzZmRhYmE3MGY4M2VkMzcyZDkxIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC1leHBlY3RlZC5odG1s CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250LWV4cGVjdGVk Lmh0bWwKQEAgLTE4LDYgKzE4LDIxIEBACiAJCTxwPjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9w PgogCQk8cD48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgogCisJCTxw PlN5c3RlbSBmb250PC9wPgorCQk8cD48aT5JdGFsaWMgc3lzdGVtIGZvbnQ8L2k+PC9wPgorCQk8 cD48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHA+PGk+PGI+Qm9sZCBpdGFsaWMgc3lz dGVtIGZvbnQ8L2I+PC9pPjwvcD4KKworCQk8cD5TeXN0ZW0gZm9udDwvcD4KKwkJPHA+PGk+SXRh bGljIHN5c3RlbSBmb250PC9pPjwvcD4KKwkJPHA+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+ CisJCTxwPjxpPjxiPkJvbGQgaXRhbGljIHN5c3RlbSBmb250PC9iPjwvaT48L3A+CisKKwkJPHA+ U3lzdGVtIGZvbnQ8L3A+CisJCTxwPjxpPkl0YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxw PjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgorCQk8cD48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0 ZW0gZm9udDwvYj48L2k+PC9wPgorCiAJCTxwIHN0eWxlPSJmb250LXNpemU6IDI0cHgiPlN5c3Rl bSBmb250PC9wPgogCQk8cCBzdHlsZT0iZm9udC1zaXplOiAxMnB0Ij48aT5JdGFsaWMgc3lzdGVt IGZvbnQ8L2k+PC9wPgogCQk8cCBzdHlsZT0iZm9udC1zaXplOiBzbWFsbCI+PGI+Qm9sZCBzeXN0 ZW0gZm9udDwvYj48L3A+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9u dHMvc3lzdGVtRm9udC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3Rl bUZvbnQuaHRtbAppbmRleCA4MDMyOGU0MTdkOWVjYTc4ZmM3NWNjMmM1YzY2MDNiNDUwN2RmMDAw Li4wZDZmNTg4YTA0YWYwZDM2OTI4ZWI1YzU1NjhjZDRiNjQwNGVhMGRkIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC5odG1sCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250Lmh0bWwKQEAgLTYsNiArNiw5IEBA CiAJCTxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CiAJCXAuc3lzdGVtLWZvbnQgeyBmb250LWZhbWls eTogLXdlYmtpdC1zeXN0ZW0tZm9udCB9CiAJCXAuc3lzdGVtLXVpIHsgZm9udC1mYW1pbHk6IC13 ZWJraXQtc3lzdGVtLXVpIH0KKwkJcC5zeXN0ZW0tdWktbm9wcmVmaXggeyBmb250LWZhbWlseTog c3lzdGVtLXVpIH0KKwkJcC5hcHBsZS1zeXN0ZW0geyBmb250LWZhbWlseTogLWFwcGxlLXN5c3Rl bSB9CisJCXAuYXBwbGUtc3lzdGVtLWZvbnQgeyBmb250LWZhbWlseTogLWFwcGxlLXN5c3RlbS1m b250IH0KIAkJPC9zdHlsZT4KIAk8L2hlYWQ+CiAJPGJvZHk+CkBAIC0xOSw2ICsyMiwyMSBAQAog CQk8cCBjbGFzcz0ic3lzdGVtLXVpIj48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwvcD4KIAkJPHAg Y2xhc3M9InN5c3RlbS11aSI+PGk+PGI+Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwv cD4KIAorCQk8cCBjbGFzcz0ic3lzdGVtLXVpLW5vcHJlZml4Ij5TeXN0ZW0gZm9udDwvcD4KKwkJ PHAgY2xhc3M9InN5c3RlbS11aS1ub3ByZWZpeCI+PGk+SXRhbGljIHN5c3RlbSBmb250PC9pPjwv cD4KKwkJPHAgY2xhc3M9InN5c3RlbS11aS1ub3ByZWZpeCI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwv Yj48L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxpPjxiPkJvbGQgaXRhbGlj IHN5c3RlbSBmb250PC9iPjwvaT48L3A+CisKKwkJPHAgY2xhc3M9ImFwcGxlLXN5c3RlbSI+U3lz dGVtIGZvbnQ8L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0iPjxpPkl0YWxpYyBzeXN0ZW0g Zm9udDwvaT48L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0iPjxiPkJvbGQgc3lzdGVtIGZv bnQ8L2I+PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtIj48aT48Yj5Cb2xkIGl0YWxpYyBz eXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0tZm9udCI+ U3lzdGVtIGZvbnQ8L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0tZm9udCI+PGk+SXRhbGlj IHN5c3RlbSBmb250PC9pPjwvcD4KKwkJPHAgY2xhc3M9ImFwcGxlLXN5c3RlbS1mb250Ij48Yj5C b2xkIHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHAgY2xhc3M9ImFwcGxlLXN5c3RlbS1mb250Ij48 aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCiAJCTxwIGNsYXNzPSJz eXN0ZW0tZm9udCIgc3R5bGU9ImZvbnQtc2l6ZTogMjRweCI+U3lzdGVtIGZvbnQ8L3A+CiAJCTxw IGNsYXNzPSJzeXN0ZW0tZm9udCIgc3R5bGU9ImZvbnQtc2l6ZTogMTJwdCI+PGk+SXRhbGljIHN5 c3RlbSBmb250PC9pPjwvcD4KIAkJPHAgY2xhc3M9InN5c3RlbS1mb250IiBzdHlsZT0iZm9udC1z aXplOiBzbWFsbCI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+Cg== 452738 2022-02-21 08:36:03 -0800 2022-02-21 14:34:15 -0800 Patch bug-178624-20220221183602.patch text/plain 7280 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRhMzc3MmNkM2E2MjI1 MDZkMTY5NzY0Y2VjNDNjZjJhZjE3Yzc4Yi4uMTE2YWUzNzg2NGY4ZGMxODZhZDJkMTYxNTYwNWI3 NDNlMzk0Y2FjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g U3VwcG9ydCBDU1M0IGdlbmVyaWMgInN5c3RlbS11aSIgZm9udCBmYW1pbHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgLWFwcGxlLXN5c3RlbSwg LWFwcGxlLXN5c3RlbS1mb250LCBhbmQgc3lzdGVtLXVpcmVzdWx0IGluIHVzaW5nIHRoZSBkZWZh dWx0IEdUSworICAgICAgICBzeXN0ZW0gZm9udC4gVGhlIC1hcHBsZSBwcmVmaXhlZCB2ZXJzaW9u cyBhcmUgYWRkZWQgZHVlIHRvIHRoZW0gYmVpbmcgdXNlZCBpbiBzb21lCisgICAgICAgIHBvcHVs YXIgc2l0ZXMgKGUuZy4gR2l0SHViKSB3aGljaCBoYXZlIG5vdCB5ZXQgYWRvcHRlZCBzeXN0ZW0t dWkuIFRoZSByZWFzb24gdG8gaGFuZGxlCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vZ3RrL2Zv bnRzL3N5c3RlbUZvbnQtZXhwZWN0ZWQuaHRtbCBtb2RpZmllZCB0byBjb3ZlciB0aGUgbmV3IGNh c2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJl ZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1p bHkpOgorICAgICAgICAoV2ViQ29yZTo6aXNDb21tb25seVVzZWRHZW5lcmljRmFtaWx5KToKKwog MjAyMi0wMi0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0lG Q11bSW50ZWdyYXRpb25dIFRha2UgdmVydGljYWwtcmwgd3JpdGluZyBtb2RlIHZhbHVlIGludG8g YWNjb3VudCB3aGVuIGNvbnZlcnRpbmcgdmlzdWFsIG1hcmdpbi9ib3JkZXIvcGFkZGluZyB2YWx1 ZSB0byBsb2dpY2FsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAKaW5kZXggNjYxZGVkNzRm OWI5ODc3NmZiMmY4Y2UyOGY3NmVkMzFkMGMzYWQ4Ny4uMjQzNzYxOWFmNjA1MWY2ZWQ5ZGVlMmFk MDlmZjZlMWFmNjdlNDU4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcApAQCAtMzMx LDEwICszMzEsMTQgQEAgVmVjdG9yPEZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXM+IEZvbnRDYWNo ZTo6Z2V0Rm9udFNlbGVjdGlvbkNhcGFiaWxpdGllc0luRmFtaWwKIAogc3RhdGljIFN0cmluZyBn ZXRGYW1pbHlOYW1lU3RyaW5nRnJvbUZhbWlseShjb25zdCBTdHJpbmcmIGZhbWlseSkKIHsKLSAg ICAvLyBJZiB3ZSdyZSBjcmVhdGluZyBhIGZhbGxiYWNrIGZvbnQgKGUuZy4gIi13ZWJraXQtbW9u b3NwYWNlIiksIGNvbnZlcnQgdGhlIG5hbWUgaW50bwotICAgIC8vIHRoZSBmYWxsYmFjayBuYW1l IChsaWtlICJtb25vc3BhY2UiKSB0aGF0IGZvbnRjb25maWcgdW5kZXJzdGFuZHMuCi0gICAgaWYg KGZhbWlseS5sZW5ndGgoKSAmJiAhZmFtaWx5LnN0YXJ0c1dpdGgoIi13ZWJraXQtIikpCi0gICAg ICAgIHJldHVybiBmYW1pbHk7CisjaWYgUExBVEZPUk0oR1RLKQorICAgIGlmIChlcXVhbExldHRl cnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHksICItYXBwbGUtc3lzdGVtIikKKyAgICAgICAgfHwg ZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAiLWFwcGxlLXN5c3RlbS1mb250 IikKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAiLXdl YmtpdC1zeXN0ZW0tZm9udCIpCisgICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlD YXNlKGZhbWlseSwgIi13ZWJraXQtc3lzdGVtLXVpIikKKyAgICAgICAgfHwgZXF1YWxMZXR0ZXJz SWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5LCAic3lzdGVtLXVpIikpCisgICAgICAgIHJldHVybiBk ZWZhdWx0R3RrU3lzdGVtRm9udCgpOworI2VuZGlmCiAKICAgICBpZiAoZmFtaWx5ID09IGZhbWls eU5hbWVzRGF0YS0+YXQoRmFtaWx5TmFtZXNJbmRleDo6U3RhbmRhcmRGYW1pbHkpIHx8IGZhbWls eSA9PSBmYW1pbHlOYW1lc0RhdGEtPmF0KEZhbWlseU5hbWVzSW5kZXg6OlNlcmlmRmFtaWx5KSkK ICAgICAgICAgcmV0dXJuICJzZXJpZiI7CkBAIC0zNDcsMTIgKzM1MSw3IEBAIHN0YXRpYyBTdHJp bmcgZ2V0RmFtaWx5TmFtZVN0cmluZ0Zyb21GYW1pbHkoY29uc3QgU3RyaW5nJiBmYW1pbHkpCiAg ICAgaWYgKGZhbWlseSA9PSBmYW1pbHlOYW1lc0RhdGEtPmF0KEZhbWlseU5hbWVzSW5kZXg6OkZh bnRhc3lGYW1pbHkpKQogICAgICAgICByZXR1cm4gImZhbnRhc3kiOwogCi0jaWYgUExBVEZPUk0o R1RLKQotICAgIGlmIChmYW1pbHkgPT0gZmFtaWx5TmFtZXNEYXRhLT5hdChGYW1pbHlOYW1lc0lu ZGV4OjpTeXN0ZW1VaUZhbWlseSkgfHwgZmFtaWx5ID09ICItd2Via2l0LXN5c3RlbS1mb250IikK LSAgICAgICAgcmV0dXJuIGRlZmF1bHRHdGtTeXN0ZW1Gb250KCk7Ci0jZW5kaWYKLQotICAgIHJl dHVybiAiIjsKKyAgICByZXR1cm4gZmFtaWx5OwogfQogCiAjaWYgRkNfVkVSU0lPTiA8IDIxMzk1 CkBAIC00OTIsOCArNDkxLDExIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0NvbW1vbmx5VXNlZEdl bmVyaWNGYW1pbHkoY29uc3QgU3RyaW5nJiBmYW1pbHlOYW1lU3RyaW5nKQogICAgICAgICB8fCBl cXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAibW9ub3NwYWNl IikKICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZVN0 cmluZywgImZhbnRhc3kiKQogI2lmIFBMQVRGT1JNKEdUSykKKyAgICAgICAgfHwgZXF1YWxMZXR0 ZXJzSWdub3JpbmdBU0NJSUNhc2UoZmFtaWx5TmFtZVN0cmluZywgIi1hcHBsZS1zeXN0ZW0iKQor ICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5n LCAiLWFwcGxlLXN5c3RlbS1mb250IikKICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdB U0NJSUNhc2UoZmFtaWx5TmFtZVN0cmluZywgIi13ZWJraXQtc3lzdGVtLWZvbnQiKQogICAgICAg ICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiLXdl YmtpdC1zeXN0ZW0tdWkiKQorICAgICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2Fz ZShmYW1pbHlOYW1lU3RyaW5nLCAic3lzdGVtLXVpIikKICNlbmRpZgogICAgICAgICB8fCBlcXVh bExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShmYW1pbHlOYW1lU3RyaW5nLCAiY3Vyc2l2ZSIpOwog fQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDg5NTQ1MDkwZjQ1ZjEwMTg5ZWYxMzdkYjM2MWQ0NWY4ZDViMmJhZDYuLmMwMGNl OTdiYjgwYWIzMDdhN2YwNjQzMzI3MDI4ZGRjN2Q2OTg3YjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAyMi0wMi0yMSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFN1cHBvcnQgQ1NTNCBnZW5lcmljICJzeXN0ZW0tdWkiIGZvbnQg ZmFtaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Nzg2MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBF eGlzdGluZyB0ZXN0IG1vZGlmaWVkIHRvIGNvdmVyIHRoZSBuZXcgY2FzZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC1leHBlY3RlZC5odG1sOgorICAgICAgICAq IHBsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250Lmh0bWw6CisKIDIwMjItMDItMjEgIFR5bGVy IFdpbGNvY2sgIDx0eWxlcl93QGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogQWRkIHRlc3QgZm9y IHIyOTAxMzAgKGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yOTAxMzAvd2Via2l0 KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQt ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9zeXN0ZW1Gb250 LWV4cGVjdGVkLmh0bWwKaW5kZXggODMzZGE0NTQyZGFiZDg4ZTA2ZDY1MWY5MDAyYjA1NzY0N2Q3 MmYxNS4uZDQ1NzViZDFjNzNkNTJiZGQzNzVkM2ZkYWJhNzBmODNlZDM3MmQ5MSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQtZXhwZWN0ZWQuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC1leHBlY3Rl ZC5odG1sCkBAIC0xOCw2ICsxOCwyMSBAQAogCQk8cD48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwv cD4KIAkJPHA+PGk+PGI+Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KIAorCQk8 cD5TeXN0ZW0gZm9udDwvcD4KKwkJPHA+PGk+SXRhbGljIHN5c3RlbSBmb250PC9pPjwvcD4KKwkJ PHA+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+CisJCTxwPjxpPjxiPkJvbGQgaXRhbGljIHN5 c3RlbSBmb250PC9iPjwvaT48L3A+CisKKwkJPHA+U3lzdGVtIGZvbnQ8L3A+CisJCTxwPjxpPkl0 YWxpYyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxwPjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9w PgorCQk8cD48aT48Yj5Cb2xkIGl0YWxpYyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCisJCTxw PlN5c3RlbSBmb250PC9wPgorCQk8cD48aT5JdGFsaWMgc3lzdGVtIGZvbnQ8L2k+PC9wPgorCQk8 cD48Yj5Cb2xkIHN5c3RlbSBmb250PC9iPjwvcD4KKwkJPHA+PGk+PGI+Qm9sZCBpdGFsaWMgc3lz dGVtIGZvbnQ8L2I+PC9pPjwvcD4KKwogCQk8cCBzdHlsZT0iZm9udC1zaXplOiAyNHB4Ij5TeXN0 ZW0gZm9udDwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogMTJwdCI+PGk+SXRhbGljIHN5c3Rl bSBmb250PC9pPjwvcD4KIAkJPHAgc3R5bGU9ImZvbnQtc2l6ZTogc21hbGwiPjxiPkJvbGQgc3lz dGVtIGZvbnQ8L2I+PC9wPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zv bnRzL3N5c3RlbUZvbnQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mb250cy9zeXN0 ZW1Gb250Lmh0bWwKaW5kZXggODAzMjhlNDE3ZDllY2E3OGZjNzVjYzJjNWM2NjAzYjQ1MDdkZjAw MC4uMGQ2ZjU4OGEwNGFmMGQzNjkyOGViNWM1NTY4Y2Q0YjY0MDRlYTBkZCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2ZvbnRzL3N5c3RlbUZvbnQuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvZm9udHMvc3lzdGVtRm9udC5odG1sCkBAIC02LDYgKzYsOSBA QAogCQk8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgogCQlwLnN5c3RlbS1mb250IHsgZm9udC1mYW1p bHk6IC13ZWJraXQtc3lzdGVtLWZvbnQgfQogCQlwLnN5c3RlbS11aSB7IGZvbnQtZmFtaWx5OiAt d2Via2l0LXN5c3RlbS11aSB9CisJCXAuc3lzdGVtLXVpLW5vcHJlZml4IHsgZm9udC1mYW1pbHk6 IHN5c3RlbS11aSB9CisJCXAuYXBwbGUtc3lzdGVtIHsgZm9udC1mYW1pbHk6IC1hcHBsZS1zeXN0 ZW0gfQorCQlwLmFwcGxlLXN5c3RlbS1mb250IHsgZm9udC1mYW1pbHk6IC1hcHBsZS1zeXN0ZW0t Zm9udCB9CiAJCTwvc3R5bGU+CiAJPC9oZWFkPgogCTxib2R5PgpAQCAtMTksNiArMjIsMjEgQEAK IAkJPHAgY2xhc3M9InN5c3RlbS11aSI+PGI+Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+CiAJCTxw IGNsYXNzPSJzeXN0ZW0tdWkiPjxpPjxiPkJvbGQgaXRhbGljIHN5c3RlbSBmb250PC9iPjwvaT48 L3A+CiAKKwkJPHAgY2xhc3M9InN5c3RlbS11aS1ub3ByZWZpeCI+U3lzdGVtIGZvbnQ8L3A+CisJ CTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxpPkl0YWxpYyBzeXN0ZW0gZm9udDwvaT48 L3A+CisJCTxwIGNsYXNzPSJzeXN0ZW0tdWktbm9wcmVmaXgiPjxiPkJvbGQgc3lzdGVtIGZvbnQ8 L2I+PC9wPgorCQk8cCBjbGFzcz0ic3lzdGVtLXVpLW5vcHJlZml4Ij48aT48Yj5Cb2xkIGl0YWxp YyBzeXN0ZW0gZm9udDwvYj48L2k+PC9wPgorCisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0iPlN5 c3RlbSBmb250PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtIj48aT5JdGFsaWMgc3lzdGVt IGZvbnQ8L2k+PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtIj48Yj5Cb2xkIHN5c3RlbSBm b250PC9iPjwvcD4KKwkJPHAgY2xhc3M9ImFwcGxlLXN5c3RlbSI+PGk+PGI+Qm9sZCBpdGFsaWMg c3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKworCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtLWZvbnQi PlN5c3RlbSBmb250PC9wPgorCQk8cCBjbGFzcz0iYXBwbGUtc3lzdGVtLWZvbnQiPjxpPkl0YWxp YyBzeXN0ZW0gZm9udDwvaT48L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0tZm9udCI+PGI+ Qm9sZCBzeXN0ZW0gZm9udDwvYj48L3A+CisJCTxwIGNsYXNzPSJhcHBsZS1zeXN0ZW0tZm9udCI+ PGk+PGI+Qm9sZCBpdGFsaWMgc3lzdGVtIGZvbnQ8L2I+PC9pPjwvcD4KKwogCQk8cCBjbGFzcz0i c3lzdGVtLWZvbnQiIHN0eWxlPSJmb250LXNpemU6IDI0cHgiPlN5c3RlbSBmb250PC9wPgogCQk8 cCBjbGFzcz0ic3lzdGVtLWZvbnQiIHN0eWxlPSJmb250LXNpemU6IDEycHQiPjxpPkl0YWxpYyBz eXN0ZW0gZm9udDwvaT48L3A+CiAJCTxwIGNsYXNzPSJzeXN0ZW0tZm9udCIgc3R5bGU9ImZvbnQt c2l6ZTogc21hbGwiPjxiPkJvbGQgc3lzdGVtIGZvbnQ8L2I+PC9wPgo=