183246 2018-03-01 08:12:45 -0800 REGRESSION(r222843): [HarfBuzz] Combining enclosed keycap not correctly handled 2018-03-01 22:44:28 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply ews-watchlist mcatanzaro mmaxfield webkit-bug-importer oldest_to_newest 1402894 0 cgarcia 2018-03-01 08:12:45 -0800 While working on bug #183155 I realized that the first emojis shown in http://www.fileformat.info/info/emoji/browsertest.htm were not working. This is because we are not correctly handling the combining enclosed keycap since we switched to use ComplexTextController. 1402896 1 334817 cgarcia 2018-03-01 08:32:21 -0800 Created attachment 334817 Patch 1402897 2 334818 cgarcia 2018-03-01 08:36:27 -0800 Created attachment 334818 Patch 1402983 3 334818 mcatanzaro 2018-03-01 12:15:57 -0800 Comment on attachment 334818 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334818&action=review > LayoutTests/platform/gtk/fast/text/combining-enclosing-keycap-expected.txt:1 > +Vector smash protection is enabled. This shouldn't be in the expected results. Why is this in the expected results? WTF? 1403148 4 cgarcia 2018-03-01 22:33:06 -0800 (In reply to Michael Catanzaro from comment #3) > Comment on attachment 334818 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=334818&action=review > > > LayoutTests/platform/gtk/fast/text/combining-enclosing-keycap-expected.txt:1 > > +Vector smash protection is enabled. > > This shouldn't be in the expected results. Why is this in the expected > results? WTF? Oh! This is because of resource load stats always enabled in tests. It queries the plugins data and stupid flash plugin spits that to stdout when loaded, making all my non-ref tests to fail, btw. 1403151 5 cgarcia 2018-03-01 22:43:27 -0800 Committed r229165: <https://trac.webkit.org/changeset/229165> 1403152 6 webkit-bug-importer 2018-03-01 22:44:28 -0800 <rdar://problem/38056723> 334817 2018-03-01 08:32:21 -0800 2018-03-01 08:36:27 -0800 Patch wcore-hf-combining-enclosing-keycap.diff text/plain 11419 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiODJkMDEwM2Y5Mi4uY2EzMWZjMzJhNzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOC0wMy0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTihyMjIyODQzKTogW0hhcmZCdXp6XSBDb21iaW5pbmcgZW5jbG9z ZWQga2V5Y2FwIG5vdCBjb3JyZWN0bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMjQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1r ZXljYXAtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvY29tYmluaW5n LWVuY2xvc2luZy1rZXljYXAuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Rl c3RFeHBlY3RhdGlvbnM6CisKIDIwMTgtMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGcmVlVHlwZV0gUmVtb3ZlIEZvbnRQbGF0Zm9y bURhdGEgZmFsbGJhY2tzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvY29tYmlu aW5nLWVuY2xvc2luZy1rZXljYXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2NvbWJpbmluZy1lbmNsb3Npbmcta2V5Y2FwLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMC4uOTdiMjE1N2M3YTcKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1rZXljYXAtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNjAgQEAKK1ZlY3RvciBzbWFzaCBwcm90ZWN0aW9uIGlzIGVuYWJsZWQu CitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXpl IDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDM0CisgIFJlbmRlckJsb2NrIHtIVE1M fSBhdCAoMCwwKSBzaXplIDgwMHgzNAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNp emUgNzg0eDE4CisgICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDApIHNpemUgMTB4MTcK KyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAxMDogIiNceHsyMEUzfSIKKyAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMTAsMCkgc2l6ZSA0eDE3CisgICAgICAgIHRleHQgcnVuIGF0ICgxMCww KSB3aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAx MHgxNworICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDE0LDApIHNpemUgMTB4MTcKKyAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMTQsMCkgd2lkdGggMTA6ICIwXHh7MjBFM30iCisgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDI0LDApIHNpemUgNHgxNworICAgICAgICB0ZXh0IHJ1biBh dCAoMjQsMCkgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDAp IHNpemUgMTB4MTcKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgyOCwwKSBzaXplIDEw eDE3CisgICAgICAgICAgdGV4dCBydW4gYXQgKDI4LDApIHdpZHRoIDEwOiAiMVx4ezIwRTN9Igor ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgzOCwwKSBzaXplIDR4MTcKKyAgICAgICAgdGV4 dCBydW4gYXQgKDM4LDApIHdpZHRoIDQ6ICIgIgorICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBh dCAoMCwwKSBzaXplIDEweDE3CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNDIsMCkg c2l6ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICg0MiwwKSB3aWR0aCAxMDogIjJceHsy MEUzfSIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNTIsMCkgc2l6ZSA0eDE3CisgICAg ICAgIHRleHQgcnVuIGF0ICg1MiwwKSB3aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlcklubGluZSB7 U1BBTn0gYXQgKDAsMCkgc2l6ZSAxMHgxNworICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQg KDU2LDApIHNpemUgMTB4MTcKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNTYsMCkgd2lkdGggMTA6 ICIzXHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDY2LDApIHNpemUgNHgx NworICAgICAgICB0ZXh0IHJ1biBhdCAoNjYsMCkgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJJ bmxpbmUge1NQQU59IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICg3MCwwKSBzaXplIDEweDE3CisgICAgICAgICAgdGV4dCBydW4gYXQgKDcwLDApIHdp ZHRoIDEwOiAiNFx4ezIwRTN9IgorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg4MCwwKSBz aXplIDR4MTcKKyAgICAgICAgdGV4dCBydW4gYXQgKDgwLDApIHdpZHRoIDQ6ICIgIgorICAgICAg UmVuZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBzaXplIDEweDE3CisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoODQsMCkgc2l6ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICg4 NCwwKSB3aWR0aCAxMDogIjVceHsyMEUzfSIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo OTQsMCkgc2l6ZSA0eDE3CisgICAgICAgIHRleHQgcnVuIGF0ICg5NCwwKSB3aWR0aCA0OiAiICIK KyAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAxMHgxNworICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDk4LDApIHNpemUgMTB4MTcKKyAgICAgICAgICB0ZXh0IHJ1 biBhdCAoOTgsMCkgd2lkdGggMTA6ICI2XHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDEwOCwwKSBzaXplIDR4MTcKKyAgICAgICAgdGV4dCBydW4gYXQgKDEwOCwwKSB3aWR0 aCA0OiAiICIKKyAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAxMHgxNwor ICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDExMiwwKSBzaXplIDEweDE3CisgICAgICAg ICAgdGV4dCBydW4gYXQgKDExMiwwKSB3aWR0aCAxMDogIjdceHsyMEUzfSIKKyAgICAgIFJlbmRl clRleHQgeyN0ZXh0fSBhdCAoMTIyLDApIHNpemUgNHgxNworICAgICAgICB0ZXh0IHJ1biBhdCAo MTIyLDApIHdpZHRoIDQ6ICIgIgorICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBz aXplIDEweDE3CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMTI2LDApIHNpemUgMTB4 MTcKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTI2LDApIHdpZHRoIDEwOiAiOFx4ezIwRTN9Igor ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxMzYsMCkgc2l6ZSA0eDE3CisgICAgICAgIHRl eHQgcnVuIGF0ICgxMzYsMCkgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJJbmxpbmUge1NQQU59 IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxNDAs MCkgc2l6ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICgxNDAsMCkgd2lkdGggMTA6ICI5 XHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9jb21iaW5pbmctZW5jbG9zaW5nLWtleWNh cC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2NvbWJpbmluZy1lbmNsb3Npbmcta2V5Y2Fw Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjc4NTFjZmRiYmU0 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2NvbWJpbmluZy1lbmNs b3Npbmcta2V5Y2FwLmh0bWwKQEAgLTAsMCArMSwxOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8c3Bhbj4jJiN4MjBFMzs8L3NwYW4+Cis8c3Bh bj4wJiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj4xJiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj4yJiN4MjBF Mzs8L3NwYW4+Cis8c3Bhbj4zJiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj40JiN4MjBFMzs8L3NwYW4+ Cis8c3Bhbj41JiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj42JiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj43 JiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj44JiN4MjBFMzs8L3NwYW4+Cis8c3Bhbj45JiN4MjBFMzs8 L3NwYW4+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhw ZWN0YXRpb25zCmluZGV4IGY0ZmQxYWE3MmM3Li5mMDVhNTM4MzNkNSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTMzOTAsMjIgKzMzOTAsNiBAQCBmYXN0 L3Njcm9sbGluZy9ydGwtc2Nyb2xsYmFycy1hbHRlcm5hdGUtYm9keS1kaXItYXR0ci1kb2VzLW5v dC11cGRhdGUtc2Nyb2xsYmFyLQogZmFzdC9zY3JvbGxpbmcvcnRsLXNjcm9sbGJhcnMtYWx0ZXJu YXRlLWlmcmFtZS1ib2R5LWRpci1hdHRyLWRvZXMtbm90LXVwZGF0ZS1zY3JvbGxiYXItcGxhY2Vt ZW50Lmh0bWwgWyBQYXNzIF0KIHdlYmtpdC5vcmcvYi8xNTY0MzcgZmFzdC9zY3JvbGxpbmcvcnRs LXNjcm9sbGJhcnMtbGlzdGJveC1zY3JvbGwuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBd CiAKLSMgV2UgZG9uJ3Qgc3VwcG9ydCBlbW9qaSBnZW5kZXJzLCBidXQgaGFsZiB0aGUgcmVmdGVz dHMgcGFzcyBhbnl3YXkuCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLTItMy5odG1sIFsgUGFzcyBd Ci1mYXN0L3RleHQvZW1vamktZ2VuZGVyLTItNC5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1v amktZ2VuZGVyLTItNS5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLTItNi5o dG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLTItNy5odG1sIFsgUGFzcyBdCi1m YXN0L3RleHQvZW1vamktZ2VuZGVyLTItOC5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamkt Z2VuZGVyLTItOS5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLWZlMGYtMy5o dG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLWZlMGYtNC5odG1sIFsgUGFzcyBd Ci1mYXN0L3RleHQvZW1vamktZ2VuZGVyLWZlMGYtNS5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQv ZW1vamktZ2VuZGVyLWZlMGYtNi5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVy LWZlMGYtNy5odG1sIFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLWZlMGYtOC5odG1s IFsgUGFzcyBdCi1mYXN0L3RleHQvZW1vamktZ2VuZGVyLWZlMGYtOS5odG1sIFsgUGFzcyBdCi0K IHRyYW5zaXRpb25zL3N2Zy10ZXh0LXNoYWRvdy10cmFuc2l0aW9uLmh0bWwgWyBQYXNzIF0KIAog d2Via2l0Lm9yZy9iLzE1NTEzMiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBv bGljeS92aWRlby13aXRoLWh0dHBzLXVybC1hbGxvd2VkLWJ5LWNzcC1tZWRpYS1zcmMtc3Rhci5o dG1sIFsgUGFzcyBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQyZDQ1ZjBiMTMuLjYzZGY5NTRlZjlmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTgtMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjIyMjg0Myk6IFtI YXJmQnV6el0gQ29tYmluaW5nIGVuY2xvc2VkIGtleWNhcCBub3QgY29ycmVjdGx5IGhhbmRsZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzI0Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFyZSBu b3QgY29ycmVjdGx5IGhhbmRsaW5nIHRoZSBjb21iaW5pbmcgZW5jbG9zZWQga2V5Y2FwIHNpbmNl IHdlIHN3aXRjaGVkIHRvIHVzZQorICAgICAgICBDb21wbGV4VGV4dENvbnRyb2xsZXIuIFRoaXMg aXMgYmVjYXVzZSBmb250Rm9yQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoKSBhbHdheXMgcmV0 dXJucyB0aGUgZm9udCBvZiB0aGUgZmlyc3QKKyAgICAgICAgY2hhcmFjdGVyLCB3aXRob3V0IGNo ZWNraW5nIGlmIHRoYXQgZm9udCBjYW4gcmVuZGVyIHRoZSB3aG9sZSBzZXF1ZW5jZSBvciBub3Qu IEJlZm9yZSAyMjI4NDMsIHRoZSBzaGFwZXIgZGlkCisgICAgICAgIHRoYXQgY2hlY2sgd2hlbiBj cmVhdGluZyB0aGUgdGV4dCBydW5zLiBJbiB0aGlzIGNhc2UgdGhlIHNlcXVlbmNlIHdhcyBzcGxp dCBhbmQgYSBkaWZmZXJlbnQgZm9udCB3YXMgdXNlZCBmb3IgdGhlCisgICAgICAgIHRleHQgYW5k IHRoZSBtYXJrLiBUaGlzIHBhdGNoIG1ha2VzIGZvbnRGb3JDb21iaW5pbmdDaGFyYWN0ZXJTZXF1 ZW5jZSgpIHRyeSB0byBmaW5kIGEgc3VpdGFibGUgZm9udCBmb3IgdGhlCisgICAgICAgIHdob2xl IHNlcXVlbmNlLCBmaXJzdCBsb29raW5nIGF0IHRoZSBDU1MgZmFsbGJhY2tzIGFuZCBmaW5hbGx5 IGF0IHN5c3RlbSBvbmVzLiBUaGUgcmVzdWx0IGlzIG11Y2ggYmV0dGVyIHRoYW4KKyAgICAgICAg dGhlIG9sZCBvbmUsIGJlY2F1c2Ugd2UgdXNlIHRoZSBzYW1lIGZvbnQgZm9yIGJvdGggdGhlIHRl eHQgYW5kIHRoZSBtYXJrLiBJZiB0aGVyZSBpc24ndCBhbnkgZm9udCB0byByZW5kZXIgdGhlCisg ICAgICAgIG1hcmssIHRoZW4gd2UgZmFsbGJhY2sgdG8gdXNlIHRoZSBmaXJzdCBjaGFyYWN0ZXIg Zm9udCwgc2luY2Ugd2Ugd2lsbCBlbmQgdXAgcmVuZGVyaW5nIHRoZSBtaXNzaW5nIGdseXBoCisg ICAgICAgIGNoYXJhY3RlciwgaXQncyBiZXR0ZXIgdG8gdXNlIHRoZSBzYW1lIGZvbnQgdGhhbiB0 aGUgZmlyc3QgY2hhcmFjdGVyIG9uZS4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvY29tYmlu aW5nLWVuY2xvc2luZy1rZXljYXAuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vRm9udENhaXJvSGFyZmJ1enpORy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2Fz Y2FkZTo6Zm9udEZvckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlIGNvbnN0KTogQ2hlY2sgaWYg dGhlIGZpcnN0IGNoYXJhdGNlciBmb250IGNhbiByZW5kZXIKKyAgICAgICAgdGhlIHdob2xlIHNl cXVlbmNlLCB0cnlpbmcgd2l0aCBmYWxsYmFja3Mgb3RoZXJ3aXNlLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Rm9udDo6Y2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UgY29u c3QpOiBDaGVjayBpZiB0aGUgZm9udCBmYWNlIGhhcyBnbHlwaHMgZm9yIHRoZSB3aG9sZQorICAg ICAgICBzZXF1ZW5jZSBub3QganVzdCB0aGUgZmlyc3QgY2hhcmFjdGVyLgorCiAyMDE4LTAzLTAx ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb RnJlZVR5cGVdIFJlbW92ZSBGb250UGxhdGZvcm1EYXRhIGZhbGxiYWNrcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvSGFyZmJ1enpO Ry5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm9I YXJmYnV6ek5HLmNwcAppbmRleCAxMWMxYzk1ZWRhNC4uYThhNzhjN2JkYTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyb0hhcmZidXp6 TkcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRD YWlyb0hhcmZidXp6TkcuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAKICNpZiBVU0UoQ0FJUk8pCiAK KyNpbmNsdWRlICJGb250Q2FjaGUuaCIKICNpbmNsdWRlICJTdXJyb2dhdGVQYWlyQXdhcmVUZXh0 SXRlcmF0b3IuaCIKICNpbmNsdWRlIDx1bmljb2RlL25vcm1senIuaD4KIApAQCAtNTgsNyArNTks MjUgQEAgY29uc3QgRm9udCogRm9udENhc2NhZGU6OmZvbnRGb3JDb21iaW5pbmdDaGFyYWN0ZXJT ZXF1ZW5jZShjb25zdCBVQ2hhciogY2hhcmFjdGUKICAgICBpZiAoIWl0ZXJhdG9yLmNvbnN1bWUo Y2hhcmFjdGVyLCBjbHVzdGVyTGVuZ3RoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAg ICByZXR1cm4gZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgZmFsc2UsIE5vcm1hbFZh cmlhbnQpLmZvbnQ7CisgICAgY29uc3QgRm9udCogYmFzZUZvbnQgPSBnbHlwaERhdGFGb3JDaGFy YWN0ZXIoY2hhcmFjdGVyLCBmYWxzZSwgTm9ybWFsVmFyaWFudCkuZm9udDsKKyAgICBpZiAoYmFz ZUZvbnQgJiYgKHN0YXRpY19jYXN0PGludDMyX3Q+KGNsdXN0ZXJMZW5ndGgpID09IG5vcm1hbGl6 ZWRMZW5ndGggfHwgYmFzZUZvbnQtPmNhblJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNl KGNoYXJhY3RlcnMsIGxlbmd0aCkpKQorICAgICAgICByZXR1cm4gYmFzZUZvbnQ7CisKKyAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyAhZmFsbGJhY2tSYW5nZXNBdChpKS5pc051bGwoKTsgKytpKSB7 CisgICAgICAgIGNvbnN0IEZvbnQqIGZhbGxiYWNrRm9udCA9IGZhbGxiYWNrUmFuZ2VzQXQoaSku Zm9udEZvckNoYXJhY3RlcihjaGFyYWN0ZXIpOworICAgICAgICBpZiAoIWZhbGxiYWNrRm9udCB8 fCBmYWxsYmFja0ZvbnQgPT0gYmFzZUZvbnQpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAg ICAgICBpZiAoZmFsbGJhY2tGb250LT5jYW5SZW5kZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5j ZShjaGFyYWN0ZXJzLCBsZW5ndGgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbGxiYWNrRm9udDsK KyAgICB9CisKKyAgICBpZiAoYXV0byBzeXN0ZW1GYWxsYmFjayA9IEZvbnRDYWNoZTo6c2luZ2xl dG9uKCkuc3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKG1fZm9udERlc2NyaXB0aW9uLCBiYXNl Rm9udCwgZmFsc2UsIGNoYXJhY3RlcnMsIGxlbmd0aCkpIHsKKyAgICAgICAgaWYgKHN5c3RlbUZh bGxiYWNrLT5jYW5SZW5kZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjaGFyYWN0ZXJzLCBs ZW5ndGgpKQorICAgICAgICAgICAgcmV0dXJuIHN5c3RlbUZhbGxiYWNrLmdldCgpOworICAgIH0K KworICAgIHJldHVybiBiYXNlRm9udDsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxl Rm9udERhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m cmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAppbmRleCBhNDk5NjFhOGYxMS4uNmEw YzMyMTA1YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCkBAIC00 Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAiR2x5cGhCdWZmZXIuaCIKICNpbmNsdWRlICJPcGVuVHlw ZVR5cGVzLmgiCiAjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKKyNpbmNsdWRlICJTdXJyb2dhdGVQ YWlyQXdhcmVUZXh0SXRlcmF0b3IuaCIKICNpbmNsdWRlICJVVEYxNlVDaGFyMzJJdGVyYXRvci5o IgogI2luY2x1ZGUgPGNhaXJvLWZ0Lmg+CiAjaW5jbHVkZSA8Y2Fpcm8uaD4KQEAgLTE5OSw4ICsy MDAsNyBAQCBib29sIEZvbnQ6OmNhblJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKGNv bnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbAogICAgIFVFcnJvckNvZGUgZXJyb3IgPSBV X1pFUk9fRVJST1I7CiAgICAgVmVjdG9yPFVDaGFyLCA0PiBub3JtYWxpemVkQ2hhcmFjdGVycyhs ZW5ndGgpOwogICAgIGludDMyX3Qgbm9ybWFsaXplZExlbmd0aCA9IHVub3JtX25vcm1hbGl6ZShj aGFyYWN0ZXJzLCBsZW5ndGgsIFVOT1JNX05GQywgVU5PUk1fVU5JQ09ERV8zXzIsICZub3JtYWxp emVkQ2hhcmFjdGVyc1swXSwgbGVuZ3RoLCAmZXJyb3IpOwotICAgIC8vIENhbid0IHJlbmRlciBp ZiB3ZSBoYXZlIGFuIGVycm9yIG9yIG5vIGNvbXBvc2l0aW9uIG9jY3VycmVkLgotICAgIGlmIChV X0ZBSUxVUkUoZXJyb3IpIHx8IChzdGF0aWNfY2FzdDxzaXplX3Q+KG5vcm1hbGl6ZWRMZW5ndGgp ID09IGxlbmd0aCkpCisgICAgaWYgKFVfRkFJTFVSRShlcnJvcikpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIENhaXJvRnRGYWNlTG9ja2VyIGNhaXJvRnRGYWNlTG9ja2VyKG1fcGxhdGZv cm1EYXRhLnNjYWxlZEZvbnQoKSk7CkBAIC0yMDgsMTAgKzIwOCwxNiBAQCBib29sIEZvbnQ6OmNh blJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJz LCBzaXplX3QgbAogICAgIGlmICghZmFjZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg aWYgKEZjRnJlZVR5cGVDaGFySW5kZXgoZmFjZSwgbm9ybWFsaXplZENoYXJhY3RlcnNbMF0pKQot ICAgICAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gdHJ1ZTsKKyAgICBVQ2hhcjMyIGNo YXJhY3RlcjsKKyAgICB1bnNpZ25lZCBjbHVzdGVyTGVuZ3RoID0gMDsKKyAgICBTdXJyb2dhdGVQ YWlyQXdhcmVUZXh0SXRlcmF0b3IgaXRlcmF0b3Iobm9ybWFsaXplZENoYXJhY3RlcnMuZGF0YSgp LCAwLCBub3JtYWxpemVkTGVuZ3RoLCBub3JtYWxpemVkTGVuZ3RoKTsKKyAgICBmb3IgKGl0ZXJh dG9yLmFkdmFuY2UoY2x1c3Rlckxlbmd0aCk7IGl0ZXJhdG9yLmNvbnN1bWUoY2hhcmFjdGVyLCBj bHVzdGVyTGVuZ3RoKTsgaXRlcmF0b3IuYWR2YW5jZShjbHVzdGVyTGVuZ3RoKSkgeworICAgICAg ICBpZiAoIUZjRnJlZVR5cGVDaGFySW5kZXgoZmFjZSwgY2hhcmFjdGVyKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CiAKLSAgICByZXR1cm4gYWRkUmVzdWx0Lml0ZXJhdG9yLT52 YWx1ZTsKKyAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gdHJ1ZTsKKyAgICByZXR1cm4g dHJ1ZTsKIH0KICNlbmRpZgogCg== 334818 2018-03-01 08:36:27 -0800 2018-03-01 12:15:57 -0800 Patch wcore-hf-combining-enclosing-keycap.diff text/plain 11471 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiODJkMDEwM2Y5Mi4uMWFmNWZiNzZjNTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOC0wMy0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTihyMjIyODQzKTogW0hhcmZCdXp6XSBDb21iaW5pbmcgZW5jbG9z ZWQga2V5Y2FwIG5vdCBjb3JyZWN0bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMjQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1r ZXljYXAtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZmFzdC90 ZXh0L2NvbWJpbmluZy1lbmNsb3Npbmcta2V5Y2FwLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE4LTAzLTAxICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRnJlZVR5cGVdIFJlbW92 ZSBGb250UGxhdGZvcm1EYXRhIGZhbGxiYWNrcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2NvbWJpbmluZy1lbmNsb3Npbmcta2V5Y2FwLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1rZXljYXAuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMC4uNzg1MWNmZGJiZTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1rZXljYXAuaHRtbApAQCAtMCww ICsxLDE4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKzxzcGFuPiMmI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjAmI3gyMEUzOzwvc3Bhbj4KKzxzcGFu PjEmI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjImI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjMmI3gyMEUz Ozwvc3Bhbj4KKzxzcGFuPjQmI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjUmI3gyMEUzOzwvc3Bhbj4K KzxzcGFuPjYmI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjcmI3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjgm I3gyMEUzOzwvc3Bhbj4KKzxzcGFuPjkmI3gyMEUzOzwvc3Bhbj4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZjRmZDFhYTcy YzcuLmYwNWE1MzgzM2Q1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtMzM5MCwyMiArMzM5MCw2IEBAIGZhc3Qvc2Nyb2xsaW5nL3J0bC1zY3JvbGxiYXJz LWFsdGVybmF0ZS1ib2R5LWRpci1hdHRyLWRvZXMtbm90LXVwZGF0ZS1zY3JvbGxiYXItCiBmYXN0 L3Njcm9sbGluZy9ydGwtc2Nyb2xsYmFycy1hbHRlcm5hdGUtaWZyYW1lLWJvZHktZGlyLWF0dHIt ZG9lcy1ub3QtdXBkYXRlLXNjcm9sbGJhci1wbGFjZW1lbnQuaHRtbCBbIFBhc3MgXQogd2Via2l0 Lm9yZy9iLzE1NjQzNyBmYXN0L3Njcm9sbGluZy9ydGwtc2Nyb2xsYmFycy1saXN0Ym94LXNjcm9s bC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KIAotIyBXZSBkb24ndCBzdXBwb3J0IGVt b2ppIGdlbmRlcnMsIGJ1dCBoYWxmIHRoZSByZWZ0ZXN0cyBwYXNzIGFueXdheS4KLWZhc3QvdGV4 dC9lbW9qaS1nZW5kZXItMi0zLmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXIt Mi00Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItMi01Lmh0bWwgWyBQYXNz IF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItMi02Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9l bW9qaS1nZW5kZXItMi03Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItMi04 Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItMi05Lmh0bWwgWyBQYXNzIF0K LWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItZmUwZi0zLmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9l bW9qaS1nZW5kZXItZmUwZi00Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXIt ZmUwZi01Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItZmUwZi02Lmh0bWwg WyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9qaS1nZW5kZXItZmUwZi03Lmh0bWwgWyBQYXNzIF0KLWZh c3QvdGV4dC9lbW9qaS1nZW5kZXItZmUwZi04Lmh0bWwgWyBQYXNzIF0KLWZhc3QvdGV4dC9lbW9q aS1nZW5kZXItZmUwZi05Lmh0bWwgWyBQYXNzIF0KLQogdHJhbnNpdGlvbnMvc3ZnLXRleHQtc2hh ZG93LXRyYW5zaXRpb24uaHRtbCBbIFBhc3MgXQogCiB3ZWJraXQub3JnL2IvMTU1MTMyIGh0dHAv dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3ZpZGVvLXdpdGgtaHR0cHMtdXJs LWFsbG93ZWQtYnktY3NwLW1lZGlhLXNyYy1zdGFyLmh0bWwgWyBQYXNzIF0KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L3RleHQvY29tYmluaW5nLWVuY2xvc2luZy1r ZXljYXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvdGV4dC9j b21iaW5pbmctZW5jbG9zaW5nLWtleWNhcC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLjk3YjIxNTdjN2E3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvdGV4dC9jb21iaW5pbmctZW5jbG9zaW5nLWtleWNh cC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2MCBAQAorVmVjdG9yIHNtYXNoIHByb3RlY3Rpb24g aXMgZW5hYmxlZC4KK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0 ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4MzQKKyAgUmVuZGVy QmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDM0CisgICAgUmVuZGVyQm9keSB7Qk9EWX0g YXQgKDgsOCkgc2l6ZSA3ODR4MTgKKyAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkg c2l6ZSAxMHgxNworICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAxMHgx NworICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDEwOiAiI1x4ezIwRTN9IgorICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxMCwwKSBzaXplIDR4MTcKKyAgICAgICAgdGV4dCBy dW4gYXQgKDEwLDApIHdpZHRoIDQ6ICIgIgorICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBhdCAo MCwwKSBzaXplIDEweDE3CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMTQsMCkgc2l6 ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICgxNCwwKSB3aWR0aCAxMDogIjBceHsyMEUz fSIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMjQsMCkgc2l6ZSA0eDE3CisgICAgICAg IHRleHQgcnVuIGF0ICgyNCwwKSB3aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlcklubGluZSB7U1BB Tn0gYXQgKDAsMCkgc2l6ZSAxMHgxNworICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDI4 LDApIHNpemUgMTB4MTcKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMjgsMCkgd2lkdGggMTA6ICIx XHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDM4LDApIHNpemUgNHgxNwor ICAgICAgICB0ZXh0IHJ1biBhdCAoMzgsMCkgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJJbmxp bmUge1NQQU59IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9 IGF0ICg0MiwwKSBzaXplIDEweDE3CisgICAgICAgICAgdGV4dCBydW4gYXQgKDQyLDApIHdpZHRo IDEwOiAiMlx4ezIwRTN9IgorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg1MiwwKSBzaXpl IDR4MTcKKyAgICAgICAgdGV4dCBydW4gYXQgKDUyLDApIHdpZHRoIDQ6ICIgIgorICAgICAgUmVu ZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBzaXplIDEweDE3CisgICAgICAgIFJlbmRlclRleHQg eyN0ZXh0fSBhdCAoNTYsMCkgc2l6ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICg1Niww KSB3aWR0aCAxMDogIjNceHsyMEUzfSIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNjYs MCkgc2l6ZSA0eDE3CisgICAgICAgIHRleHQgcnVuIGF0ICg2NiwwKSB3aWR0aCA0OiAiICIKKyAg ICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAxMHgxNworICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDcwLDApIHNpemUgMTB4MTcKKyAgICAgICAgICB0ZXh0IHJ1biBh dCAoNzAsMCkgd2lkdGggMTA6ICI0XHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDgwLDApIHNpemUgNHgxNworICAgICAgICB0ZXh0IHJ1biBhdCAoODAsMCkgd2lkdGggNDog IiAiCisgICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg4NCwwKSBzaXplIDEweDE3CisgICAgICAgICAgdGV4 dCBydW4gYXQgKDg0LDApIHdpZHRoIDEwOiAiNVx4ezIwRTN9IgorICAgICAgUmVuZGVyVGV4dCB7 I3RleHR9IGF0ICg5NCwwKSBzaXplIDR4MTcKKyAgICAgICAgdGV4dCBydW4gYXQgKDk0LDApIHdp ZHRoIDQ6ICIgIgorICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBzaXplIDEweDE3 CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoOTgsMCkgc2l6ZSAxMHgxNworICAgICAg ICAgIHRleHQgcnVuIGF0ICg5OCwwKSB3aWR0aCAxMDogIjZceHsyMEUzfSIKKyAgICAgIFJlbmRl clRleHQgeyN0ZXh0fSBhdCAoMTA4LDApIHNpemUgNHgxNworICAgICAgICB0ZXh0IHJ1biBhdCAo MTA4LDApIHdpZHRoIDQ6ICIgIgorICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBz aXplIDEweDE3CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMTEyLDApIHNpemUgMTB4 MTcKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTEyLDApIHdpZHRoIDEwOiAiN1x4ezIwRTN9Igor ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxMjIsMCkgc2l6ZSA0eDE3CisgICAgICAgIHRl eHQgcnVuIGF0ICgxMjIsMCkgd2lkdGggNDogIiAiCisgICAgICBSZW5kZXJJbmxpbmUge1NQQU59 IGF0ICgwLDApIHNpemUgMTB4MTcKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxMjYs MCkgc2l6ZSAxMHgxNworICAgICAgICAgIHRleHQgcnVuIGF0ICgxMjYsMCkgd2lkdGggMTA6ICI4 XHh7MjBFM30iCisgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDEzNiwwKSBzaXplIDR4MTcK KyAgICAgICAgdGV4dCBydW4gYXQgKDEzNiwwKSB3aWR0aCA0OiAiICIKKyAgICAgIFJlbmRlcklu bGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAxMHgxNworICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDE0MCwwKSBzaXplIDEweDE3CisgICAgICAgICAgdGV4dCBydW4gYXQgKDE0MCwwKSB3 aWR0aCAxMDogIjlceHsyMEUzfSIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBz aXplIDB4MApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGU0MmQ0NWYwYjEzLi42M2RmOTU0ZWY5ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAzLTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyMjI4NDMpOiBbSGFyZkJ1 enpdIENvbWJpbmluZyBlbmNsb3NlZCBrZXljYXAgbm90IGNvcnJlY3RseSBoYW5kbGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMyNDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgbm90IGNv cnJlY3RseSBoYW5kbGluZyB0aGUgY29tYmluaW5nIGVuY2xvc2VkIGtleWNhcCBzaW5jZSB3ZSBz d2l0Y2hlZCB0byB1c2UKKyAgICAgICAgQ29tcGxleFRleHRDb250cm9sbGVyLiBUaGlzIGlzIGJl Y2F1c2UgZm9udEZvckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKCkgYWx3YXlzIHJldHVybnMg dGhlIGZvbnQgb2YgdGhlIGZpcnN0CisgICAgICAgIGNoYXJhY3Rlciwgd2l0aG91dCBjaGVja2lu ZyBpZiB0aGF0IGZvbnQgY2FuIHJlbmRlciB0aGUgd2hvbGUgc2VxdWVuY2Ugb3Igbm90LiBCZWZv cmUgMjIyODQzLCB0aGUgc2hhcGVyIGRpZAorICAgICAgICB0aGF0IGNoZWNrIHdoZW4gY3JlYXRp bmcgdGhlIHRleHQgcnVucy4gSW4gdGhpcyBjYXNlIHRoZSBzZXF1ZW5jZSB3YXMgc3BsaXQgYW5k IGEgZGlmZmVyZW50IGZvbnQgd2FzIHVzZWQgZm9yIHRoZQorICAgICAgICB0ZXh0IGFuZCB0aGUg bWFyay4gVGhpcyBwYXRjaCBtYWtlcyBmb250Rm9yQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2Uo KSB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIGZvbnQgZm9yIHRoZQorICAgICAgICB3aG9sZSBzZXF1 ZW5jZSwgZmlyc3QgbG9va2luZyBhdCB0aGUgQ1NTIGZhbGxiYWNrcyBhbmQgZmluYWxseSBhdCBz eXN0ZW0gb25lcy4gVGhlIHJlc3VsdCBpcyBtdWNoIGJldHRlciB0aGFuCisgICAgICAgIHRoZSBv bGQgb25lLCBiZWNhdXNlIHdlIHVzZSB0aGUgc2FtZSBmb250IGZvciBib3RoIHRoZSB0ZXh0IGFu ZCB0aGUgbWFyay4gSWYgdGhlcmUgaXNuJ3QgYW55IGZvbnQgdG8gcmVuZGVyIHRoZQorICAgICAg ICBtYXJrLCB0aGVuIHdlIGZhbGxiYWNrIHRvIHVzZSB0aGUgZmlyc3QgY2hhcmFjdGVyIGZvbnQs IHNpbmNlIHdlIHdpbGwgZW5kIHVwIHJlbmRlcmluZyB0aGUgbWlzc2luZyBnbHlwaAorICAgICAg ICBjaGFyYWN0ZXIsIGl0J3MgYmV0dGVyIHRvIHVzZSB0aGUgc2FtZSBmb250IHRoYW4gdGhlIGZp cnN0IGNoYXJhY3RlciBvbmUuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2NvbWJpbmluZy1l bmNsb3Npbmcta2V5Y2FwLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ZvbnRDYWlyb0hhcmZidXp6TkcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6 OmZvbnRGb3JDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZSBjb25zdCk6IENoZWNrIGlmIHRoZSBm aXJzdCBjaGFyYXRjZXIgZm9udCBjYW4gcmVuZGVyCisgICAgICAgIHRoZSB3aG9sZSBzZXF1ZW5j ZSwgdHJ5aW5nIHdpdGggZmFsbGJhY2tzIG90aGVyd2lzZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnQ6OmNhblJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlIGNvbnN0KTog Q2hlY2sgaWYgdGhlIGZvbnQgZmFjZSBoYXMgZ2x5cGhzIGZvciB0aGUgd2hvbGUKKyAgICAgICAg c2VxdWVuY2Ugbm90IGp1c3QgdGhlIGZpcnN0IGNoYXJhY3Rlci4KKwogMjAxOC0wMy0wMSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZyZWVU eXBlXSBSZW1vdmUgRm9udFBsYXRmb3JtRGF0YSBmYWxsYmFja3MKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyb0hhcmZidXp6TkcuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvSGFyZmJ1 enpORy5jcHAKaW5kZXggMTFjMWM5NWVkYTQuLmE4YTc4YzdiZGExIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm9IYXJmYnV6ek5HLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm9I YXJmYnV6ek5HLmNwcApAQCAtMjksNiArMjksNyBAQAogCiAjaWYgVVNFKENBSVJPKQogCisjaW5j bHVkZSAiRm9udENhY2hlLmgiCiAjaW5jbHVkZSAiU3Vycm9nYXRlUGFpckF3YXJlVGV4dEl0ZXJh dG9yLmgiCiAjaW5jbHVkZSA8dW5pY29kZS9ub3JtbHpyLmg+CiAKQEAgLTU4LDcgKzU5LDI1IEBA IGNvbnN0IEZvbnQqIEZvbnRDYXNjYWRlOjpmb250Rm9yQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVu Y2UoY29uc3QgVUNoYXIqIGNoYXJhY3RlCiAgICAgaWYgKCFpdGVyYXRvci5jb25zdW1lKGNoYXJh Y3RlciwgY2x1c3Rlckxlbmd0aCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0 dXJuIGdseXBoRGF0YUZvckNoYXJhY3RlcihjaGFyYWN0ZXIsIGZhbHNlLCBOb3JtYWxWYXJpYW50 KS5mb250OworICAgIGNvbnN0IEZvbnQqIGJhc2VGb250ID0gZ2x5cGhEYXRhRm9yQ2hhcmFjdGVy KGNoYXJhY3RlciwgZmFsc2UsIE5vcm1hbFZhcmlhbnQpLmZvbnQ7CisgICAgaWYgKGJhc2VGb250 ICYmIChzdGF0aWNfY2FzdDxpbnQzMl90PihjbHVzdGVyTGVuZ3RoKSA9PSBub3JtYWxpemVkTGVu Z3RoIHx8IGJhc2VGb250LT5jYW5SZW5kZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjaGFy YWN0ZXJzLCBsZW5ndGgpKSkKKyAgICAgICAgcmV0dXJuIGJhc2VGb250OworCisgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgIWZhbGxiYWNrUmFuZ2VzQXQoaSkuaXNOdWxsKCk7ICsraSkgeworICAg ICAgICBjb25zdCBGb250KiBmYWxsYmFja0ZvbnQgPSBmYWxsYmFja1Jhbmdlc0F0KGkpLmZvbnRG b3JDaGFyYWN0ZXIoY2hhcmFjdGVyKTsKKyAgICAgICAgaWYgKCFmYWxsYmFja0ZvbnQgfHwgZmFs bGJhY2tGb250ID09IGJhc2VGb250KQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAg aWYgKGZhbGxiYWNrRm9udC0+Y2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoY2hh cmFjdGVycywgbGVuZ3RoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxsYmFja0ZvbnQ7CisgICAg fQorCisgICAgaWYgKGF1dG8gc3lzdGVtRmFsbGJhY2sgPSBGb250Q2FjaGU6OnNpbmdsZXRvbigp LnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVycyhtX2ZvbnREZXNjcmlwdGlvbiwgYmFzZUZvbnQs IGZhbHNlLCBjaGFyYWN0ZXJzLCBsZW5ndGgpKSB7CisgICAgICAgIGlmIChzeXN0ZW1GYWxsYmFj ay0+Y2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoY2hhcmFjdGVycywgbGVuZ3Ro KSkKKyAgICAgICAgICAgIHJldHVybiBzeXN0ZW1GYWxsYmFjay5nZXQoKTsKKyAgICB9CisKKyAg ICByZXR1cm4gYmFzZUZvbnQ7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnRE YXRhRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5 cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAKaW5kZXggYTQ5OTYxYThmMTEuLjZhMGMzMjEw NWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlw ZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcApAQCAtNDIsNiAr NDIsNyBAQAogI2luY2x1ZGUgIkdseXBoQnVmZmVyLmgiCiAjaW5jbHVkZSAiT3BlblR5cGVUeXBl cy5oIgogI2luY2x1ZGUgIlJlZlB0ckNhaXJvLmgiCisjaW5jbHVkZSAiU3Vycm9nYXRlUGFpckF3 YXJlVGV4dEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiVVRGMTZVQ2hhcjMySXRlcmF0b3IuaCIKICNp bmNsdWRlIDxjYWlyby1mdC5oPgogI2luY2x1ZGUgPGNhaXJvLmg+CkBAIC0xOTksOCArMjAwLDcg QEAgYm9vbCBGb250OjpjYW5SZW5kZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjb25zdCBV Q2hhciogY2hhcmFjdGVycywgc2l6ZV90IGwKICAgICBVRXJyb3JDb2RlIGVycm9yID0gVV9aRVJP X0VSUk9SOwogICAgIFZlY3RvcjxVQ2hhciwgND4gbm9ybWFsaXplZENoYXJhY3RlcnMobGVuZ3Ro KTsKICAgICBpbnQzMl90IG5vcm1hbGl6ZWRMZW5ndGggPSB1bm9ybV9ub3JtYWxpemUoY2hhcmFj dGVycywgbGVuZ3RoLCBVTk9STV9ORkMsIFVOT1JNX1VOSUNPREVfM18yLCAmbm9ybWFsaXplZENo YXJhY3RlcnNbMF0sIGxlbmd0aCwgJmVycm9yKTsKLSAgICAvLyBDYW4ndCByZW5kZXIgaWYgd2Ug aGF2ZSBhbiBlcnJvciBvciBubyBjb21wb3NpdGlvbiBvY2N1cnJlZC4KLSAgICBpZiAoVV9GQUlM VVJFKGVycm9yKSB8fCAoc3RhdGljX2Nhc3Q8c2l6ZV90Pihub3JtYWxpemVkTGVuZ3RoKSA9PSBs ZW5ndGgpKQorICAgIGlmIChVX0ZBSUxVUkUoZXJyb3IpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBDYWlyb0Z0RmFjZUxvY2tlciBjYWlyb0Z0RmFjZUxvY2tlcihtX3BsYXRmb3JtRGF0 YS5zY2FsZWRGb250KCkpOwpAQCAtMjA4LDEwICsyMDgsMTYgQEAgYm9vbCBGb250OjpjYW5SZW5k ZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6 ZV90IGwKICAgICBpZiAoIWZhY2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChG Y0ZyZWVUeXBlQ2hhckluZGV4KGZhY2UsIG5vcm1hbGl6ZWRDaGFyYWN0ZXJzWzBdKSkKLSAgICAg ICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHRydWU7CisgICAgVUNoYXIzMiBjaGFyYWN0 ZXI7CisgICAgdW5zaWduZWQgY2x1c3Rlckxlbmd0aCA9IDA7CisgICAgU3Vycm9nYXRlUGFpckF3 YXJlVGV4dEl0ZXJhdG9yIGl0ZXJhdG9yKG5vcm1hbGl6ZWRDaGFyYWN0ZXJzLmRhdGEoKSwgMCwg bm9ybWFsaXplZExlbmd0aCwgbm9ybWFsaXplZExlbmd0aCk7CisgICAgZm9yIChpdGVyYXRvci5h ZHZhbmNlKGNsdXN0ZXJMZW5ndGgpOyBpdGVyYXRvci5jb25zdW1lKGNoYXJhY3RlciwgY2x1c3Rl ckxlbmd0aCk7IGl0ZXJhdG9yLmFkdmFuY2UoY2x1c3Rlckxlbmd0aCkpIHsKKyAgICAgICAgaWYg KCFGY0ZyZWVUeXBlQ2hhckluZGV4KGZhY2UsIGNoYXJhY3RlcikpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQogCi0gICAgcmV0dXJuIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWU7 CisgICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHRydWU7CisgICAgcmV0dXJuIHRydWU7 CiB9CiAjZW5kaWYKIAo=