92098 2012-07-24 04:39:35 -0700 [GTK] Bring Harfbuzz-ng support to Gtk 2012-12-11 01:42:32 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 20783 104576 1 d-r mrobinson bashi cdumez dr.khaled.hosny g.czajkowski gustavo jmalonzo joone laszlo.gombos mrobinson philn pnormand xan.lopez oldest_to_newest 676654 0 d-r 2012-07-24 04:39:35 -0700 As a successor the pango backend, let's enable harfbuzz for gtk to get better text shaping support for complex fonts. Work to enable this on EFL is tracked in bug 91853. 702860 1 g.czajkowski 2012-08-23 04:22:23 -0700 This bug removes Pango from WebKit-Gtk spelling implementation (https://bugs.webkit.org/show_bug.cgi?id=94320). 752610 2 mrobinson 2012-10-26 17:22:30 -0700 I've enabled this locally and I notice some differences in pixel output that look a bit like regressions. For instance, the Arabic characters in LayoutTests/platform/efl/fast/text/complex-text-opacity-expected.png are not elided properly. 753149 3 d-r 2012-10-29 01:32:16 -0700 (In reply to comment #2) > I've enabled this locally and I notice some differences in pixel output that look a bit like regressions. For instance, the Arabic characters in LayoutTests/platform/efl/fast/text/complex-text-opacity-expected.png are not elided properly. Does this change depending on the Harfbuzz version? Looking at their mailing list, there's lots of changes going on. 753596 4 mrobinson 2012-10-29 10:41:42 -0700 (In reply to comment #3) > (In reply to comment #2) > > I've enabled this locally and I notice some differences in pixel output that look a bit like regressions. For instance, the Arabic characters in LayoutTests/platform/efl/fast/text/complex-text-opacity-expected.png are not elided properly. > > Does this change depending on the Harfbuzz version? Looking at their mailing list, there's lots of changes going on. I see this with the latest harfbuzz release (0.9.5). 754629 5 mrobinson 2012-10-30 13:34:54 -0700 (In reply to comment #4) > I see this with the latest harfbuzz release (0.9.5). The issue seems to be with the platform harfbuzz code. Instead of splitting complex text into runs and choosing a font appropriately, the behavior I see is that the text uses the default font. For each character of the complex text that is not in the default font we are falling back to FontCache::getFontDataForCharacters. In the end harfbuzz is not combining those glyphs properly, because they are fallback glyphs. I guess we should be choosing the appropriate fallback font earlier in the process. bashi, do you think you can give more information about how this works for Chromium with the HarfbuzzNG path? 754877 6 bashi 2012-10-30 19:08:43 -0700 Adding behdad. (In reply to comment #5) > (In reply to comment #4) > > > I see this with the latest harfbuzz release (0.9.5). > > The issue seems to be with the platform harfbuzz code. Instead of splitting complex text into runs and choosing a font appropriately, the behavior I see is that the text uses the default font. For each character of the complex text that is not in the default font we are falling back to FontCache::getFontDataForCharacters. In the end harfbuzz is not combining those glyphs properly, because they are fallback glyphs. > > I guess we should be choosing the appropriate fallback font earlier in the process. > > bashi, do you think you can give more information about how this works for Chromium with the HarfbuzzNG path? (In reply to comment #5) > (In reply to comment #4) > > > I see this with the latest harfbuzz release (0.9.5). > > The issue seems to be with the platform harfbuzz code. Instead of splitting complex text into runs and choosing a font appropriately, the behavior I see is that the text uses the default font. For each character of the complex text that is not in the default font we are falling back to FontCache::getFontDataForCharacters. In the end harfbuzz is not combining those glyphs properly, because they are fallback glyphs. > > I guess we should be choosing the appropriate fallback font earlier in the process. > > bashi, do you think you can give more information about how this works for Chromium with the HarfbuzzNG path? Are you trying to use HarfBuzzShaper on GTK? If so, HarfBuzzShaper::collectHarfBuzzRuns() doesn't select fonts properly? 755553 7 mrobinson 2012-10-31 12:40:51 -0700 Mystery solved (I hope). When the Fontconfig FontCache returns a fallback font, it returns a different font each time -- even if the Fontconfig pattern returns the same font. This is quite bad, as it means that we're keeping many duplicate copies of fallback fonts in the cache. I've fixed this locally and the results look a lot better. The reason this was causing a problem for Harfbuzz was that HarfBuzzShaper saw each fallback font as a different font and created a separate text run for each character. 755671 8 171729 mrobinson 2012-10-31 15:22:36 -0700 Created attachment 171729 Patch 755672 9 mrobinson 2012-10-31 15:23:03 -0700 I didn't include the new layout test results because the made the patch a bit too big. 755717 10 mrobinson 2012-10-31 16:27:50 -0700 It looks like the bot is missing ICU pkg-config files. 755957 11 pnormand 2012-11-01 00:30:56 -0700 (In reply to comment #10) > It looks like the bot is missing ICU pkg-config files. The bot has libicu-dev 4.8.1.1-9. Seems like the harfbuzz headers are not found instead when building WebCore. Is a clean build required? 755979 12 d-r 2012-11-01 01:29:34 -0700 (In reply to comment #9) > I didn't include the new layout test results because the made the patch a bit too big. Glad you found the reason. You may ping our gardener on IRC once you land this, so that we can take care of the EFL rebaselining. http://trac.webkit.org/wiki/EFLWebKitBuildBots 756134 13 mrobinson 2012-11-01 05:53:50 -0700 (In reply to comment #11) > (In reply to comment #10) > > It looks like the bot is missing ICU pkg-config files. > > The bot has libicu-dev 4.8.1.1-9. Seems like the harfbuzz headers are not found instead when building WebCore. > > Is a clean build required? In Debian, up until very recently, the libicu-dev package did not install pkg-config files. See here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687339 I'm not sure what the best way to resolve this is. Locally I install libicu manually. 759588 14 d-r 2012-11-06 06:11:08 -0800 (In reply to comment #13) > I'm not sure what the best way to resolve this is. I'm proposing http://lists.freedesktop.org/archives/harfbuzz/2012-November/002612.html Since we need to bump the version in bug 101323 as well. 786766 15 171729 gustavo 2012-12-09 04:53:55 -0800 Comment on attachment 171729 Patch LGTM, and I think the bots have all been updated some time ago, haven't they? 787283 16 mrobinson 2012-12-10 06:51:49 -0800 Committed r137146: <http://trac.webkit.org/changeset/137146> 787399 17 cdumez 2012-12-10 09:18:56 -0800 Looks life this patch affected the results for EFL port? About 50 test cases seem to require rebaselining after this patch? Was that expected? 787400 18 cdumez 2012-12-10 09:20:01 -0800 Ok, I see from https://bugs.webkit.org/show_bug.cgi?id=92098#c12 that the rebaseline was expected. I guess I'll take care of it then. 788177 19 mrobinson 2012-12-11 01:36:05 -0800 *** Bug 26741 has been marked as a duplicate of this bug. *** 788182 20 mrobinson 2012-12-11 01:42:32 -0800 *** Bug 20783 has been marked as a duplicate of this bug. *** 171729 2012-10-31 15:22:36 -0700 2012-12-09 04:53:55 -0800 Patch bug-92098-20121031152059.patch text/plain 13270 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODUwZTQ5YmE1NWMxOTIw NThiYTM4NzhlYzAxYzdhZWRlOGZlOTY2YS4uZWFhZTJmOTU3MTFjN2JmOTZhZWJkYTMyNmQyYjE4 ZWJlOTdkZGRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEwLTMxICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBCcmlu ZyBIYXJmYnV6ei1uZyBzdXBwb3J0IHRvIEd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTIwOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFbmFibGUgSGFyZkJ1enogc3VwcG9ydCBieSBkZWZhdWx0LiBX aXRoIHRoZSBGcmVldHlwZSBiYWNrZW5kIHdlIG5vIGxvbmdlcgorICAgICAgICBmYWxsIGJhY2sg dG8gUGFuZ28gZm9yIHJlbmRlcmluZyBjb21wbGV4IHRleHQuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiBUaGlzIGlzIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBHTlVt YWtlZmlsZS5hbTogQWRkIEhhcmZCdXp6IGluY2x1ZGUgZGlyZWN0b3JpZXMgYW5kIGRlZmluZS4K KyAgICAgICAgKiBHTlVtYWtlZmlsZS5saXN0LmFtOiBBZGQgSGFyZkJ1enogZmlsZXMgdG8gc291 cmNlIGxpc3QgYW5kIHJlbW92ZQorICAgICAgICBQYW5nbyBvbmVzLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpvcGVyYXRvcj09KTogVG8gcHJvcGVybHkg cmVuZGVyIGZhbGxiYWNrCisgICAgICAgIGZvbnRzIHZpYSBIYXJmQnV6eiAsIGl0J3MgaW1wb3J0 YW50IHRoYXQgd2UgYWN0dWFsbHkgYXNrIEZvbnRjb25maWcKKyAgICAgICAgd2hldGhlciBvciBu b3QgdHdvIHBhdHRlcm5zIGFyZSB0aGUgc2FtZS4gVGhpcyBlbnN1cmVzIHRoYXQgd2hlbiBwYXR0 ZXJucworICAgICAgICBhcmUganVzdCBjb3BpZXMgb2Ygb25lIGFub3RoZXIgdGhleSBvbmx5IHRh a2UgdXAgb25lIHNsb3QgaW4gdGhlIGZvbnQgY2FjaGUKKyAgICAgICAgYW5kIGFwcGVhciB0byBi ZSB0aGUgc2FtZSBmb250IHRvIEhhcmZCdXp6U2hhcGVyLgorCiAyMDEyLTEwLTI2ICBWaW5jZW50 IFNjaGVpYiAgPHNjaGVpYkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjEzMjY0NC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA5MGFlYjRmMzNkZGM3NTRiZjVm MzZmYzI5NTEyOWY0OTZiYTM0OTNhLi42NzM4M2MzNWFlNzllMTMzMDY3ODU1YWM3ZWIwZmFhMjIx ZjY2ZDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMTAtMzEgIE1h cnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJy aW5nIEhhcmZidXp6LW5nIHN1cHBvcnQgdG8gR3RrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjA5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBIYXJmQnV6eiBkZXBlbmRlbmN5LgorCisgICAgICAg ICogR05VbWFrZWZpbGUuYW06IEFkZCBGcmVlVHlwZS9IYXJmQnV6eiBDRkxBR1MgdG8gdGhlIGxp YnJhcnkuCisKIDIwMTItMTAtMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBhIHN0cmF0ZWd5IGZvciBsb2FkZXIgY3VzdG9taXphdGlvbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCAwYzAyMWYwMGE0MTRmMjRhN2MxZGM3N2E0Y2VkNDczNzc1ODJiZTM3Li4xZjYyNGE1 NWFkNmYzZmUwZGJiMTI2MzIxM2Y1NzQzNmQ4YjQ0OTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTItMTAtMzEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEJyaW5nIEhhcmZidXp6LW5nIHN1cHBvcnQgdG8gR3RrCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjA5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIEhhcmZCdXp6 IGRlcGVuZGVuY3kuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogQWRkIEZyZWVUeXBlL0hh cmZCdXp6IENGTEFHUy9MSUJTIHRvIHRoZSBsaWJyYXJpZXMuCisKIDIwMTItMTAtMjYgIENocmlz dG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZM XVtXSzJdIEdldCByaWQgb2YgQydpc20gaW4gdGV4dCBjaGVja2VyIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmls ZS5hbQppbmRleCAzNjE2YTM4MGE2Y2JkMjk4ODQzMjI2MzAyOTNmMTJmZWU3Y2YwZTE4Li4xNTkz ODI4NmU2YTkxYjVkMzUyOTc2ZWRiMmVmYmVmZTZiMWM2NDQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9HTlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5h bQpAQCAtMTI1LDcgKzEyNSwxMCBAQCB3ZWJjb3JlZ3RrX2NwcGZsYWdzICs9IFwKIGlmIFVTRV9G UkVFVFlQRQogd2ViY29yZWd0a19jcHBmbGFncyArPSBcCiAJLURXVEZfVVNFX0ZSRUVUWVBFPTEg XAotCS1JJChzcmNkaXIpL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBl CisJLURXVEZfVVNFX0hBUkZCVVpaX05HPTEgXAorCS1JJChzcmNkaXIpL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlIFwKKwktSSQoc3JjZGlyKS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6eiBcCisJLUkkKHNyY2RpcikvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovbmcKIGVuZGlmICMgRU5EIFVTRV9GUkVFVFlQ RQogCiAjIC0tLQpAQCAtNjM3LDYgKzY0MCw3IEBAIGxpYldlYkNvcmVfbGFfQ1BQRkxBR1MgPSBc CiAJJChDTFVUVEVSX0NGTEFHUykgXAogCSQoQ09WRVJBR0VfQ0ZMQUdTKSBcCiAJJChFTkNIQU5U X0NGTEFHUykgXAorCSQoRlJFRVRZUEVfQ0ZMQUdTKSBcCiAJJChHQU1FUEFEX0NGTEFHUykgXAog CSQoR0VPQ0xVRV9DRkxBR1MpIFwKIAkkKEdMSUJfQ0ZMQUdTKSBcCkBAIC02OTcsNiArNzAxLDcg QEAgbGliV2ViQ29yZUd0a19sYV9DUFBGTEFHUyA9IFwKIAkkKENPVkVSQUdFX0NGTEFHUykgXAog CSQoRU5DSEFOVF9DRkxBR1MpIFwKIAkkKEZBUlNUUkVBTV9DRkxBR1MpIFwKKwkkKEZSRUVUWVBF X0NGTEFHUykgXAogCSQoR0FJTF9DRkxBR1MpIFwKIAkkKEdBTUVQQURfQ0ZMQUdTKSBcCiAJJChH RU9DTFVFX0NGTEFHUykgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUu bGlzdC5hbSBiL1NvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KaW5kZXggMzllMzdi NmRlYzdjMTNiZGY1NzZkOTkxOTFhOTdjZWNkMDRhOGE3MC4uN2RkZjE0Y2VmNTc3NmMyZWIwYmVl N2FkYTExNTkyZDNhY2Y0MDRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvR05VbWFrZWZp bGUubGlzdC5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCkBAIC02 MTMyLDE0ICs2MTMyLDE4IEBAIGVuZGlmCiAjIC0tLQogaWYgVVNFX0ZSRUVUWVBFCiB3ZWJjb3Jl X3NvdXJjZXMgKz0gXAorCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Zv bnRDYWlyb0hhcmZidXp6TkcuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9mcmVldHlwZS9Gb250Q2FjaGVGcmVlVHlwZS5jcHAgXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAg XAotCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9y bURhdGEuaCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvR2x5 cGhQYWdlVHJlZU5vZGVGcmVlVHlwZS5jcHAgXAotCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCisJU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAg XAorCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hh cGVyQmFzZS5jcHAgXAorCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6 L25nL0hhcmZCdXp6TkdGYWNlLmNwcCBcCisJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvaGFyZmJ1enovbmcvSGFyZkJ1enpOR0ZhY2VDYWlyby5jcHAgXAorCVNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L25nL0hhcmZCdXp6U2hhcGVyLmNwcAogd2ViY29y ZWd0a19zb3VyY2VzICs9IFwKLQlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9wYW5n by9Gb250UGFuZ28uY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVl dHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCisKIGVuZGlmICMgRU5EIFVTRV9GUkVF VFlQRQogCiAjIC0tLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAK aW5kZXggYzk1ZDFiM2I5ODNjODY1NjkxNzMyZTZkNDUwNzIyOGY1NDMxZjA2Ny4uMzdmNWQzNTRj NDBjNDE4MTQyZGNiYmMxZWI5Mjc0MTU3NDYwMzBjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxh dGZvcm1EYXRhRnJlZVR5cGUuY3BwCkBAIC0yNDQsOCArMjQ0LDEzIEBAIGJvb2wgRm9udFBsYXRm b3JtRGF0YTo6aXNGaXhlZFBpdGNoKCkKIAogYm9vbCBGb250UGxhdGZvcm1EYXRhOjpvcGVyYXRv cj09KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIG90aGVyKSBjb25zdAogewotICAgIHJldHVybiBt X3BhdHRlcm4gPT0gb3RoZXIubV9wYXR0ZXJuCi0gICAgICAgICYmIG1fc2NhbGVkRm9udCA9PSBv dGhlci5tX3NjYWxlZEZvbnQKKyAgICAvLyBGY1BhdHRlcm5FcXVhbCBkb2VzIG5vdCBzdXBwb3J0 IG51bGwgcG9pbnRlcnMgYXMgYXJndW1lbnRzLgorICAgIGlmICgobV9wYXR0ZXJuICYmICFvdGhl ci5tX3BhdHRlcm4pCisgICAgICAgIHx8ICghbV9wYXR0ZXJuICYmIG90aGVyLm1fcGF0dGVybikK KyAgICAgICAgfHwgKG1fcGF0dGVybiAhPSBvdGhlci5tX3BhdHRlcm4gJiYgIUZjUGF0dGVybkVx dWFsKG1fcGF0dGVybi5nZXQoKSwgb3RoZXIubV9wYXR0ZXJuLmdldCgpKSkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIHJldHVybiBtX3NjYWxlZEZvbnQgPT0gb3RoZXIubV9zY2FsZWRG b250CiAgICAgICAgICYmIG1fc2l6ZSA9PSBvdGhlci5tX3NpemUKICAgICAgICAgJiYgbV9zeW50 aGV0aWNPYmxpcXVlID09IG90aGVyLm1fc3ludGhldGljT2JsaXF1ZQogICAgICAgICAmJiBtX3N5 bnRoZXRpY0JvbGQgPT0gb3RoZXIubV9zeW50aGV0aWNCb2xkOyAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZp bGUuYW0KaW5kZXggNWJlOWViNTQ4ZWUwMjNkMTQwYTM1ZDE2NjI0MzNkNTgxYmI3MWI4My4uMmY3 NDkwZjA2MDVjZDM5MjBlM2I0ZWJjZDI1MmI4MzhhMTdkNWU1NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFr ZWZpbGUuYW0KQEAgLTU2LDYgKzU2LDcgQEAgbGlid2Via2l0Z3RrX0BXRUJLSVRHVEtfQVBJX01B Sk9SX1ZFUlNJT05AX0BXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05AX2xhX0NQUEYKIAkkKENM VVRURVJfR1RLX0NGTEFHUykgXAogCSQoQ09WRVJBR0VfQ0ZMQUdTKSBcCiAJJChFTkNIQU5UX0NG TEFHUykgXAorCSQoRlJFRVRZUEVfQ0ZMQUdTKSBcCiAJJChHQUlMX0NGTEFHUykgXAogCSQoR0VP Q0xVRV9DRkxBR1MpIFwKIAkkKEdMSUJfQ0ZMQUdTKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4 IGY5NTZkMGVkZGZjMDkzOTc5YzViYzAyNjAzY2U1MTRjMjU3ODE4NmIuLjk0YWM2MDMwNzQ5NTcy YjQ0ZmMyMDVmMDc3NzE1MDM2ZGZjZjQ0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dO VW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC0xMDMs NiArMTAzLDcgQEAgbGlid2Via2l0Mmd0a19AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9A V0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9sYV9DUFAKIAkkKGphdmFzY3JpcHRjb3JlX2Nw cGZsYWdzKSBcCiAJJChDTFVUVEVSX0NGTEFHUykgXAogCSQoQ09WRVJBR0VfQ0ZMQUdTKSBcCisJ JChGUkVFVFlQRV9DRkxBR1MpIFwKIAkkKEdFT0NMVUVfQ0ZMQUdTKSBcCiAJJChHTElCX0NGTEFH UykgXAogCSQoR1RLX0NGTEFHUykgXApAQCAtMTY3LDYgKzE2OCw3IEBAIGxpYndlYmtpdDJndGtf QFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lP TkBfbGFfTElCCiAJJChDTFVUVEVSX0xJQlMpIFwKIAkkKENPVkVSQUdFX0xERkxBR1MpIFwKIAkk KEZBUlNUUkVBTV9MSUJTKSBcCisJJChGUkVFVFlQRV9MSUJTKSBcCiAJJChHQUlMX0xJQlMpIFwK IAkkKEdBTUVQQURfTElCUykgXAogCSQoR0VPQ0xVRV9MSUJTKSBcCkBAIC00MDUsNiArNDA3LDcg QEAgbGliV2ViQ29yZUd0azJfbGFfQ1BQRkxBR1MgPSBcCiAJJChDT1ZFUkFHRV9DRkxBR1MpIFwK IAkkKEVOQ0hBTlRfQ0ZMQUdTKSBcCiAJJChHRU9DTFVFX0NGTEFHUykgXAorCSQoRlJFRVRZUEVf Q0ZMQUdTKSBcCiAJJChGQVJTVFJFQU1fQ0ZMQUdTKSBcCiAJJChHTElCX0NGTEFHUykgXAogCSQo R1NUUkVBTUVSX0NGTEFHUykgXApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IDk4MDFiYmFmMWExMGYwZjdkZDJlM2Q2ZWUwNWFhMDRmY2EzNTZhZjku LmExNTE2ODI1Mzg5MGQzZTVjOTc0ODZmOTlmYWI5ZTViOGU3OTM5ODIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx Mi0xMC0zMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dUS10gQnJpbmcgSGFyZmJ1enotbmcgc3VwcG9ydCB0byBHdGsKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMDk4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEhhcmZCdXp6IGRlcGVuZGVuY3ku CisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogQWRkIEZyZWVUeXBlL0hhcmZCdXp6IENGTEFH UyB0byB0aGUgV2ViQ29yZSBJbnRlcm5hbHMgbGlicmFyeS4KKyAgICAgICAgKiBndGsvamhidWls ZC5tb2R1bGVzOiBBZGQgSGFyZkJ1enogdG8gdGhlIEpIYnVpbGQgYW5kIHJlbW92ZSBQYW5nbywg c2luY2UgaXQKKyAgICAgICAgc2hvdWxkIG5vIGxvbmdlciBhZmZlY3QgbGF5b3V0IHRlc3QgcmVz dWx0cy4KKwogMjAxMi0xMC0yNiAgRGF2aWQgQmFydG9uICA8ZGJhcnRvbkBtYXRoc2NyaWJlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgbXkgSVJDIG5pY2tuYW1lIHRvIGEgcmVn aXN0ZXJlZCBvbmUuCmRpZmYgLS1naXQgYS9Ub29scy9HTlVtYWtlZmlsZS5hbSBiL1Rvb2xzL0dO VW1ha2VmaWxlLmFtCmluZGV4IGE4ZDk0NGRjZjZjNGY0YTMyZmE3ZTYwOGE2ZTI3M2NjNTVkNGVk MmMuLjc4ZjliM2U3MGFiZTAyYWQxNzYyNDE2MDUyZGU2ZGYyMzI5MTM0YmIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0dOVW1ha2VmaWxlLmFtCisrKyBiL1Rvb2xzL0dOVW1ha2VmaWxlLmFtCkBAIC03MSw2 ICs3MSw3IEBAIGxpYldlYkNvcmVJbnRlcm5hbHNfbGFfQ1BQRkxBR1MgPSBcCiAJJCh3ZWJjb3Jl Z3RrX2NwcGZsYWdzKSBcCiAJJChqYXZhc2NyaXB0Y29yZV9jcHBmbGFncykgXAogCSQoQ0FJUk9f Q0ZMQUdTKSBcCisJJChGUkVFVFlQRV9DRkxBR1MpIFwKIAkkKExJQlNPVVBfQ0ZMQUdTKSBcCiAJ JChQQU5HT19DRkxBR1MpIFwKIAktSSQodG9wX2J1aWxkZGlyKS9EZXJpdmVkU291cmNlcyBcCmRp ZmYgLS1naXQgYS9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzIGIvVG9vbHMvZ3RrL2poYnVpbGQu bW9kdWxlcwppbmRleCBmNmU0Njg0MjAxYjYyMWViMWVjZTQ0ZDI1ZmU0OGVhNjExN2EyNjM5Li4w ZGI1NjU3NmFiNThlMDExOGJiZDA3NTU3YWEzNTFhZjAxNDYxODc3IDEwMDY0NAotLS0gYS9Ub29s cy9ndGsvamhidWlsZC5tb2R1bGVzCisrKyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLm1vZHVsZXMKQEAg LTEwLDYgKzEwLDcgQEAKICAgICAgIDxkZXAgcGFja2FnZT0iZm9udHMiLz4KICAgICAgIDxkZXAg cGFja2FnZT0iZm9udGNvbmZpZyIvPgogICAgICAgPGRlcCBwYWNrYWdlPSJmcmVldHlwZTYiLz4K KyAgICAgIDxkZXAgcGFja2FnZT0iaGFyZmJ1enoiLz4KICAgICAgIDxkZXAgcGFja2FnZT0ibGli eG1sMiIvPgogICAgICAgPGRlcCBwYWNrYWdlPSJnZGstcGl4YnVmIi8+CiAgICAgICA8ZGVwIHBh Y2thZ2U9Imd0aysiLz4KQEAgLTg1LDYgKzg2LDE0IEBACiAgICAgICAgICAgICBtZDVzdW09IjY0 N2VlOGVkMjY2ZjlhNDExN2M4ZDBhNDg1NWIzZDNlIi8+CiAgIDwvdGFyYmFsbD4KIAorIDxhdXRv dG9vbHMgaWQ9ImhhcmZidXp6IiBhdXRvZ2VuLXNoPSJjb25maWd1cmUiPgorICAgPGJyYW5jaCBt b2R1bGU9InNvZnR3YXJlL2hhcmZidXp6L3JlbGVhc2UvaGFyZmJ1enotMC45LjUudGFyLmJ6MiIg dmVyc2lvbj0iMC45LjUiCisgICAgICAgICAgIGNoZWNrb3V0ZGlyPSJoYXJmYnV6ei0wLjkuNSIK KyAgICAgICAgICAgcmVwbz0iZnJlZWRlc2t0b3Aub3JnIgorICAgICAgICAgICBoYXNoPSJzaGEy NTY6NTdhYTY0NTYwNmI3MjIwZmEyMDI4NzFiMmFjZDkwNjIyNDNhNWMyMTJhMmI1NWFiNjQ5M2Vl YWFjYTFjNmE3YSI+CisgICA8L2JyYW5jaD4KKyA8L2F1dG90b29scz4KKwogICA8YXV0b3Rvb2xz IGlkPSJsaWJmZmkiIGF1dG9nZW4tc2g9ImNvbmZpZ3VyZSI+CiAgICAgPGJyYW5jaCBtb2R1bGU9 Ii9wdWIvbGliZmZpL2xpYmZmaS0zLjAuMTAudGFyLmd6IiB2ZXJzaW9uPSIzLjAuMTAiCiAgICAg ICAgICAgICAgcmVwbz0ic291cmNld2FyZS5vcmciCkBAIC0xMTQsMjUgKzEyMywxMSBAQAogICAg ICAgICAgICAgbWQ1c3VtPSI4OWQ0ODNmMzBhN2M3NzI0NWI3ZWUwMmZhYWVhNWE1YSIvPgogICA8 L2F1dG90b29scz4KIAotICA8YXV0b3Rvb2xzIGlkPSJwYW5nbyIKLSAgICAgICAgICAgICBhdXRv Z2VuYXJncz0iLS1kaXNhYmxlLWludHJvc3BlY3Rpb24iPgotICAgIDxkZXBlbmRlbmNpZXM+Ci0g ICAgICA8ZGVwIHBhY2thZ2U9ImdsaWIiLz4KLSAgICAgIDxkZXAgcGFja2FnZT0iZnJlZXR5cGU2 Ii8+Ci0gICAgICA8ZGVwIHBhY2thZ2U9ImNhaXJvIi8+Ci0gICAgPC9kZXBlbmRlbmNpZXM+Ci0g ICAgPGJyYW5jaCBtb2R1bGU9Ii9wdWIvR05PTUUvc291cmNlcy9wYW5nby8xLjMwL3BhbmdvLTEu MzAuMC50YXIueHoiIHZlcnNpb249IjEuMzAuMCIKLSAgICAgICAgICAgIHJlcG89ImZ0cC5nbm9t ZS5vcmciCi0gICAgICAgICAgICBoYXNoPSJzaGEyNTY6N2M2ZDJhYjAyNGFmZmFlZDBlOTQyZjky NzliODE4MjM1ZjljNmEzNmQ5ZmM1MDY4OGY0OGQzODdmNDEwMmRmZiIKLSAgICAgICAgICAgIG1k NXN1bT0iMmE3MDYyN2ZmZDlmNDNjNTJjMDRjYzBiMDVmZTM1OWYiLz4KLSAgPC9hdXRvdG9vbHM+ Ci0KICAgPGF1dG90b29scyBpZD0iZ3RrKyIgYXV0b2dlbi1zaD0iY29uZmlndXJlIgogICAgICAg ICAgICAgIGF1dG9nZW5hcmdzPSItLWRpc2FibGUtaW50cm9zcGVjdGlvbiI+CiAgICAgPGRlcGVu ZGVuY2llcz4KICAgICAgIDxkZXAgcGFja2FnZT0iZ2xpYiIvPgogICAgICAgPGRlcCBwYWNrYWdl PSJjYWlybyIvPgotICAgICAgPGRlcCBwYWNrYWdlPSJwYW5nbyIvPgogICAgICAgPGRlcCBwYWNr YWdlPSJnZGstcGl4YnVmIi8+CiAgICAgPC9kZXBlbmRlbmNpZXM+CiAgICAgPGJyYW5jaCBtb2R1 bGU9Ii9wdWIvR05PTUUvc291cmNlcy9ndGsrLzMuNC9ndGsrLTMuNC4yLnRhci54eiIgdmVyc2lv bj0iMy40LjIiCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNzVkOGVlZGFiNTFlMDg0MDg2MjM0ODYzZTkyOGE0YzIxZTA0NDY0 NS4uZmI0NDU3ZTMyZGM3ZjQzMDJkMmE2NDhiYmYzNmY0ODg5NTdiZTI5NyAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTEwLTMxICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBCcmluZyBIYXJmYnV6ei1uZyBzdXBwb3J0IHRvIEd0awor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTIwOTgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGVz dHMgcmVzdWx0cyB0aGF0IGhhdmUgY2hhbmdlZCBkdWUgdG8gdGhlIHN3aXRjaCB0byBIYXJmQnV6 ei4KKyAgICAgICAgSW4gZ2VuZXJhbCwgdGhlc2UgYXJlIHByb2dyZXNzaW9ucyBvciBoYXJtbGVz cyBtZXRyaWNzIGRpZmZlcmVuY2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrOiBVcGRhdGUg dGVzdCByZXN1bHRzIHRoYXQgaGF2ZSBjaGFuZ2VkLgorCiAyMDEyLTEwLTI2ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGNvbXBvc2l0aW5nL3RpbGlu Zy9odWdlLWxheWVyKiBmbGFrZXkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwpp bmRleCBmYzFjYzkxMDY3MjI4MDBhNTNjMjEzNzhkOTRmOWM0OTU0NGI0OThkLi4xNjEwNmJmMTcw ZTQyYjc5ZGMzZmQ2MzYxZThlNGQwMzEyMGVmZmJhIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysr IGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMTAtMzEgIE1hcnRpbiBSb2JpbnNv biAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJyaW5nIEhhcmZidXp6 LW5nIHN1cHBvcnQgdG8gR3RrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MjA5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBkZXRlY3RpbmcgSGFyZkJ1enogZHVyaW5nIGNvbmZp Z3VyYXRpb24gcGhhc2UuIEFkZCB0aGVzZQorICAgICAgICBmbGFncyB0byB0aGUgRnJlZVR5cGUg b25lcyBzaW5jZSBIYXJmQnV6eiBzdXBwb3J0IGlzIHBhcnQgb2YgdGhlIEZyZWVUeXBlCisgICAg ICAgIGJhY2tlbmQuCisKKyAgICAgICAgKiBjb25maWd1cmUuYWM6IERldGVjdCBIYXJmQnV6ei4K KwogMjAxMi0xMC0yNiAgUmVnaW5hIENodW5nICA8aGVlamluLnIuY2h1bmdAc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgW0VGTF1bV0syXSBFbmFibGUgV2ViR0wKZGlmZiAtLWdpdCBhL2NvbmZpZ3Vy ZS5hYyBiL2NvbmZpZ3VyZS5hYwppbmRleCA4YjljZWEwMzE5YTNkNzk2Yzc2YzU2NDE2ZmY1NDY1 NWY2NjgxZDM4Li4yYWY3MzBlMWQ5MjViYTQ5ZTE1YmE2NjdiMGRlODNiMzQ4ZWQ2MmJhIDEwMDY0 NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC05NTgsMTIgKzk1OCwx NCBAQCBpZiB0ZXN0ICIkd2l0aF9mb250X2JhY2tlbmQiID0gImZyZWV0eXBlIjsgdGhlbgogICAg aWYgdGVzdCAiJHdpdGhfdGFyZ2V0IiA9ICJkaXJlY3RmYiI7IHRoZW4KICAgIFBLR19DSEVDS19N T0RVTEVTKFtGUkVFVFlQRV0sCiAgICAgICAgICAgICAgICAgICAgICBbZm9udGNvbmZpZyA+PSAk Rk9OVENPTkZJR19SRVFVSVJFRF9WRVJTSU9OCi0gICAgICAgICAgICAgICAgICAgICBmcmVldHlw ZTIgPj0gJEZSRUVUWVBFMl9SRVFVSVJFRF9WRVJTSU9OXSkKKyAgICAgICAgICAgICAgICAgICAg IGZyZWV0eXBlMiA+PSAkRlJFRVRZUEUyX1JFUVVJUkVEX1ZFUlNJT04KKyAgICAgICAgICAgICAg ICAgICAgIGhhcmZidXp6XSkKICAgIGVsc2UKICAgIFBLR19DSEVDS19NT0RVTEVTKFtGUkVFVFlQ RV0sCiAgICAgICAgICAgICAgICAgICAgICBbY2Fpcm8tZnQKICAgICAgICAgICAgICAgICAgICAg IGZvbnRjb25maWcgPj0gJEZPTlRDT05GSUdfUkVRVUlSRURfVkVSU0lPTgotICAgICAgICAgICAg ICAgICAgICAgZnJlZXR5cGUyID49ICRGUkVFVFlQRTJfUkVRVUlSRURfVkVSU0lPTl0pCisgICAg ICAgICAgICAgICAgICAgICBmcmVldHlwZTIgPj0gJEZSRUVUWVBFMl9SRVFVSVJFRF9WRVJTSU9O CisgICAgICAgICAgICAgICAgICAgICBoYXJmYnV6el0pCiAgICBmaQogICAgQUNfU1VCU1QoW0ZS RUVUWVBFX0NGTEFHU10pCiAgICBBQ19TVUJTVChbRlJFRVRZUEVfTElCU10pCg==