236073 2022-02-03 04:05:54 -0800 ch unit fallback size doesn't match the spec 2022-02-04 23:54:37 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 emilio mmaxfield bfulgham esprehn+autocc ews-watchlist glenn gyuyoung.kim heycam koivisto macpherson menard mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1836857 0 emilio 2022-02-03 04:05:54 -0800 See https://bug1753399.bmoattachments.org/attachment.cgi?id=9262064 and the associated bug report (link below). 1ch in that font matches 1em, however it should match 0.5em per spec. It was reported to Firefox as a lack of interop when dealing with ch units on fonts without a "0" glyph, but the spec is pretty clear, see https://bugzilla.mozilla.org/show_bug.cgi?id=1753399#c2 See also https://bugs.chromium.org/p/chromium/issues/detail?id=1293773 1837633 1 webkit-bug-importer 2022-02-04 16:16:25 -0800 <rdar://problem/88513297> 1837664 2 mmaxfield 2022-02-04 17:22:50 -0800 We don't set it to 1em; we set it to the width of .notdef in that case. 1837675 3 450959 mmaxfield 2022-02-04 18:24:49 -0800 Created attachment 450959 WIP 1837676 4 450959 mmaxfield 2022-02-04 18:25:27 -0800 Comment on attachment 450959 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=450959&action=review > Source/WebCore/platform/graphics/Font.cpp:154 > - m_fontMetrics.setZeroWidth(widthForGlyph(zeroGlyph)); > + m_fontMetrics.setZeroWidth(zeroGlyph ? widthForGlyph(zeroGlyph) : platformData().size() / 2); I guess this isn't a great fix because it isn't ch-specific. 1837695 5 450968 mmaxfield 2022-02-04 19:59:15 -0800 Created attachment 450968 Patch 1837706 6 450968 heycam 2022-02-04 21:58:00 -0800 Comment on attachment 450968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450968&action=review > LayoutTests/ChangeLog:9 > + This can't be a WPT test because it uses an SVG font which we're the only browser to support. Is there any reason you can't make this test use a non-SVG font? Also I have a vague memory of writing such a WPT at one point but I might be mistaken. 1837710 7 mmaxfield 2022-02-04 22:10:17 -0800 https://phabricator.services.mozilla.com/D61190 is relevant 1837713 8 mmaxfield 2022-02-04 22:16:09 -0800 I think Jonathan Kew is right - WebKit's behavior isn't great here, because we won't search fallback fonts to find the font used to render the '0' character. This patch at least gets us closer to the spec, but we're probably far enough away that this test probably shouldn't be a WPT test. When I align our behavior with Firefox's, this test will end up being deleted and replaced with another one. 1837715 9 ews-feeder 2022-02-04 22:39:45 -0800 Committed r289151 (246847@main): <https://commits.webkit.org/246847@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450968. 1837723 10 emilio 2022-02-04 23:54:37 -0800 Thanks for fixing so fast! Fwiw there are tests for this in wpt (css/css-values/ch-unit-013-018.html). It seems those are not in the tree though. 450959 2022-02-04 18:24:49 -0800 2022-02-04 19:59:13 -0800 WIP bug-236073-20220204182448.patch text/plain 4164 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJhM2RkMWJkZGM4ZTQy ODBmMWJiZjhmOGYxMzVjYjgyYzk0NDhiZC4uYzA2MjczMjA1OGI5MDYyYTM5NmQxNWNlYWUzNGVk YTBiYmM3YzQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTA0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgY2ggdW5pdCBm YWxsYmFjayBzaXplIGRvZXNuJ3QgbWF0Y2ggdGhlIHNwZWMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjA3MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODg1MTMyOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHNwZWMgKGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdmFsdWVzLTQvI2No KSBzYXlzOgorICAgICAgICA+IEluIHRoZSBjYXNlcyB3aGVyZSBpdCBpcyBpbXBvc3NpYmxlIG9y IGltcHJhY3RpY2FsIHRvIGRldGVybWluZSB0aGUgbWVhc3VyZSBvZiB0aGUg4oCcMOKAnSBnbHlw aCwgaXQgbXVzdCBiZSBhc3N1bWVkIHRvIGJlIDAuNWVtIHdpZGUKKworICAgICAgICBUZXN0OiBm YXN0L3RleHQvY2gtdW5pdC13aXRob3V0LXplcm8tZ2x5cGguaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvRm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpwbGF0Zm9y bUdseXBoSW5pdCk6CisKIDIwMjItMDItMDQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBTY3JlZW5DYXB0dXJlS2l0Q2FwdHVyZVNvdXJj ZSBvbmx5IG91dHB1dHMgb25lIGZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnQuY3BwCmluZGV4IDM0NmM2ZGQ1NWY5ZDNjMGMzMjg0YjY2MmY2OWRiZTM2YzRmZTU1YzQu LmU2YjI3MGZlNWY5MTNiZDMwNTY1YmU5ZGM3YjljYmI3ZDRkMmU3YmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCkBAIC0xNTEsNyArMTUxLDcgQEAgdm9pZCBG b250OjpwbGF0Zm9ybUdseXBoSW5pdCgpCiAgICAgR2x5cGggemVyb0dseXBoID0geyAwIH07CiAg ICAgaWYgKGF1dG8qIHBhZ2UgPSBnbHlwaFBhZ2UoR2x5cGhQYWdlOjpwYWdlTnVtYmVyRm9yQ29k ZVBvaW50KCcwJykpKQogICAgICAgICB6ZXJvR2x5cGggPSBwYWdlLT5nbHlwaERhdGFGb3JDaGFy YWN0ZXIoJzAnKS5nbHlwaDsKLSAgICBtX2ZvbnRNZXRyaWNzLnNldFplcm9XaWR0aCh3aWR0aEZv ckdseXBoKHplcm9HbHlwaCkpOworICAgIG1fZm9udE1ldHJpY3Muc2V0WmVyb1dpZHRoKHplcm9H bHlwaCA/IHdpZHRoRm9yR2x5cGgoemVyb0dseXBoKSA6IHBsYXRmb3JtRGF0YSgpLnNpemUoKSAv IDIpOwogCiAgICAgLy8gVXNlIHRoZSB3aWR0aCBvZiB0aGUgQ0pLIHdhdGVyIGlkZW9ncmFtIChV KzZDMzQpIGFzIHRoZQogICAgIC8vIGFwcHJveGltYXRlZCB3aWR0aCBvZiBpZGVvZ3JhbXMgaW4g dGhlIGZvbnQsIGFzIG1lbnRpb25lZCBpbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDBiNTRiN2Y5OWExMWZkNzc0MTQxM2U3 ZDE1YjkzYzUxMTlhNTYxZWUuLjNhOGUwYjcxMzg1MGUxNWZlNWRmYjNjNTE2YzJlZmYwZjlkOGRk NTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMi0wNCAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIGNoIHVuaXQgZmFsbGJhY2sgc2l6ZSBk b2Vzbid0IG1hdGNoIHRoZSBzcGVjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzYwNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg4NTEzMjk3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90 ZXh0L2NoLXVuaXQtd2l0aG91dC16ZXJvLWdseXBoLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvdGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC5odG1sOiBBZGRlZC4K KwogMjAyMi0wMi0wNCAgQXJjYWR5IEdvbGRtaW50cy1PcmxvdiAgPGFnb2xkbWludHNAaWdhbGlh LmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyODAwNzcpOiBbR1RLXSBJdCBjYXVzZWQgMTU1 IG5ldyB0ZXN0IGZhaWx1cmVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvY2gt dW5pdC13aXRob3V0LXplcm8tZ2x5cGgtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv dGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjJiMTY2NjA2YWFhN2U5ODkzNjNkY2VhMDllMzAxMzQxNGZhYTBjNjAKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvY2gtdW5pdC13aXRob3V0LXplcm8tZ2x5cGgtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhl YWQ+Cis8c3R5bGU+CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogIldlYkZvbnQiOwor ICAgIHNyYzogdXJsKCJyZXNvdXJjZXMvdGlueS1saWdhdHVyZS1mb250LnN2ZyIpIGZvcm1hdCgi c3ZnIik7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3Vy ZSB0aGF0IHRoZSA8Y29kZT5jaDwvY29kZT4gdW5pdCBmYWxscyBiYWNrIHRvIDAuNWVtIG9uIGZv bnRzIHRoYXQgZG9uJ3Qgc3VwcG9ydCB0aGUgMCBjaGFyYWN0ZXIuIFRoZSB0ZXN0IHBhc3NlcyBp ZiB0aGUgZ3JlZW4gYm94IGJlbG93IGhhcyB0aGUgY29ycmVjdCB3aWR0aC4KKzxkaXYgc3R5bGU9 ImZvbnQ6IDQ4cHggJ1dlYkZvbnQnOyB3aWR0aDogY2FsYygxMGVtIC8gMik7IGJhY2tncm91bmQ6 IGdyZWVuOyBjb2xvcjogdHJhbnNwYXJlbnQ7Ij5BQUFBPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvY2gtdW5pdC13aXRob3V0LXplcm8t Z2x5cGguaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1n bHlwaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRiZWE4ZDZlMzA2MGY4MmJkZGZkZmRhODk4ZTdmMjMzNTVj MWRlMjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvY2gtdW5pdC13 aXRob3V0LXplcm8tZ2x5cGguaHRtbApAQCAtMCwwICsxLDE1IEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTog IldlYkZvbnQiOworICAgIHNyYzogdXJsKCJyZXNvdXJjZXMvdGlueS1saWdhdHVyZS1mb250LnN2 ZyIpIGZvcm1hdCgic3ZnIik7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRl c3QgbWFrZXMgc3VyZSB0aGF0IHRoZSA8Y29kZT5jaDwvY29kZT4gdW5pdCBmYWxscyBiYWNrIHRv IDAuNWVtIG9uIGZvbnRzIHRoYXQgZG9uJ3Qgc3VwcG9ydCB0aGUgMCBjaGFyYWN0ZXIuIFRoZSB0 ZXN0IHBhc3NlcyBpZiB0aGUgZ3JlZW4gYm94IGJlbG93IGhhcyB0aGUgY29ycmVjdCB3aWR0aC4K KzxkaXYgc3R5bGU9ImZvbnQ6IDQ4cHggJ1dlYkZvbnQnOyB3aWR0aDogMTBjaDsgYmFja2dyb3Vu ZDogZ3JlZW47IGNvbG9yOiB0cmFuc3BhcmVudDsiPkFBQUE8L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4K 450968 2022-02-04 19:59:15 -0800 2022-02-04 22:39:47 -0800 Patch bug-236073-20220204195914.patch text/plain 7331 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJhM2RkMWJkZGM4ZTQy ODBmMWJiZjhmOGYxMzVjYjgyYzk0NDhiZC4uODhlY2UxM2JkZDQxMTZjY2IxZTVmM2E2ZDkzNjc2 N2MwNzZhMWU2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTA0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgY2ggdW5pdCBm YWxsYmFjayBzaXplIGRvZXNuJ3QgbWF0Y2ggdGhlIHNwZWMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjA3MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODg1MTMyOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHNwZWMgKGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdmFsdWVzLTQvI2No KSBzYXlzOgorICAgICAgICA+IEluIHRoZSBjYXNlcyB3aGVyZSBpdCBpcyBpbXBvc3NpYmxlIG9y IGltcHJhY3RpY2FsIHRvIGRldGVybWluZSB0aGUgbWVhc3VyZSBvZiB0aGUgw6LCgMKcMMOiwoDC nSBnbHlwaCwgaXQgbXVzdCBiZSBhc3N1bWVkIHRvIGJlIDAuNWVtIHdpZGUKKworICAgICAgICBU ZXN0OiBmYXN0L3RleHQvY2gtdW5pdC13aXRob3V0LXplcm8tZ2x5cGguaHRtbAorCisgICAgICAg ICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1p dGl2ZVZhbHVlOjpjb21wdXRlVW56b29tZWROb25DYWxjTGVuZ3RoRG91YmxlKToKKyAgICAgICAg KFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTm9uQ2FsY0xlbmd0aERvdWJsZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGb250OjpwbGF0Zm9ybUdseXBoSW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udE1ldHJpY3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRNZXRyaWNzOjp6ZXJvV2lkdGgg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udE1ldHJpY3M6OnJlc2V0KToKKwogMjAyMi0w Mi0wNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb bWFjT1NdIFNjcmVlbkNhcHR1cmVLaXRDYXB0dXJlU291cmNlIG9ubHkgb3V0cHV0cyBvbmUgZnJh bWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCmluZGV4IDliYTRmM2Rm MTM4OWU3NmNhNzJlYTc1NTQwM2IzZDMzYWZmMzNhMjUuLjcxNmYwYTMxNDE4Y2VjOWJlNmM1Y2Zl NTQ2NmNjMmU5NjllMzdjOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmlt aXRpdmVWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVl LmNwcApAQCAtNzE5LDcgKzcxOSw4IEBAIGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0 ZVVuem9vbWVkTm9uQ2FsY0xlbmd0aERvdWJsZShDU1NVbml0VHlwZSBwcmltaXRpCiAgICAgICAg IHJldHVybiAoKHByb3BlcnR5VG9Db21wdXRlID09IENTU1Byb3BlcnR5Rm9udFNpemUpID8gcm9v dEZvbnREZXNjcmlwdGlvbi0+c3BlY2lmaWVkU2l6ZSgpIDogcm9vdEZvbnREZXNjcmlwdGlvbi0+ Y29tcHV0ZWRTaXplKCkpICogdmFsdWU7CiAgICAgY2FzZSBDU1NVbml0VHlwZTo6Q1NTX0NIUzoK ICAgICAgICAgQVNTRVJUKGZvbnRNZXRyaWNzKTsKLSAgICAgICAgcmV0dXJuIGZvbnRNZXRyaWNz LT56ZXJvV2lkdGgoKSAqIHZhbHVlOworICAgICAgICBBU1NFUlQoZm9udERlc2NyaXB0aW9uKTsK KyAgICAgICAgcmV0dXJuIGZvbnRNZXRyaWNzLT56ZXJvV2lkdGgoKS52YWx1ZV9vcihmb250RGVz Y3JpcHRpb24tPmNvbXB1dGVkU2l6ZSgpIC8gMikgKiB2YWx1ZTsKICAgICBjYXNlIENTU1VuaXRU eXBlOjpDU1NfSUM6CiAgICAgICAgIEFTU0VSVChmb250TWV0cmljcyk7CiAgICAgICAgIHJldHVy biBmb250TWV0cmljcy0+aWRlb2dyYW1XaWR0aCgpICogdmFsdWU7CkBAIC04MjQsNyArODI1LDcg QEAgZG91YmxlIENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTm9uQ2FsY0xlbmd0aERvdWJsZShj b25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb24KICAgICBjYXNlIENTU1VuaXRUeXBlOjpDU1NfQ0hT OgogICAgIGNhc2UgQ1NTVW5pdFR5cGU6OkNTU19JQzoKICAgICAgICAgQVNTRVJUKGNvbnZlcnNp b25EYXRhLnN0eWxlKCkpOwotICAgICAgICB2YWx1ZSA9IGNvbXB1dGVVbnpvb21lZE5vbkNhbGNM ZW5ndGhEb3VibGUocHJpbWl0aXZlVHlwZSwgdmFsdWUsIGNvbnZlcnNpb25EYXRhLnByb3BlcnR5 VG9Db21wdXRlKCksICZjb252ZXJzaW9uRGF0YS5zdHlsZSgpLT5tZXRyaWNzT2ZQcmltYXJ5Rm9u dCgpKTsKKyAgICAgICAgdmFsdWUgPSBjb21wdXRlVW56b29tZWROb25DYWxjTGVuZ3RoRG91Ymxl KHByaW1pdGl2ZVR5cGUsIHZhbHVlLCBjb252ZXJzaW9uRGF0YS5wcm9wZXJ0eVRvQ29tcHV0ZSgp LCAmY29udmVyc2lvbkRhdGEuc3R5bGUoKS0+bWV0cmljc09mUHJpbWFyeUZvbnQoKSwgJmNvbnZl cnNpb25EYXRhLnN0eWxlKCktPmZvbnREZXNjcmlwdGlvbigpKTsKICAgICAgICAgYnJlYWs7CiAK ICAgICBjYXNlIENTU1VuaXRUeXBlOjpDU1NfUFg6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ZvbnQuY3BwCmluZGV4IDM0NmM2ZGQ1NWY5ZDNjMGMzMjg0YjY2MmY2OWRiZTM2YzRm ZTU1YzQuLmRiOTlkNDAxMTg1OTgxMTI3N2QwOWYwY2RjYjQ0NDk1NjQ4Zjc0M2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCkBAIC0xNTEsNyArMTUxLDggQEAg dm9pZCBGb250OjpwbGF0Zm9ybUdseXBoSW5pdCgpCiAgICAgR2x5cGggemVyb0dseXBoID0geyAw IH07CiAgICAgaWYgKGF1dG8qIHBhZ2UgPSBnbHlwaFBhZ2UoR2x5cGhQYWdlOjpwYWdlTnVtYmVy Rm9yQ29kZVBvaW50KCcwJykpKQogICAgICAgICB6ZXJvR2x5cGggPSBwYWdlLT5nbHlwaERhdGFG b3JDaGFyYWN0ZXIoJzAnKS5nbHlwaDsKLSAgICBtX2ZvbnRNZXRyaWNzLnNldFplcm9XaWR0aCh3 aWR0aEZvckdseXBoKHplcm9HbHlwaCkpOworICAgIGlmICh6ZXJvR2x5cGgpCisgICAgICAgIG1f Zm9udE1ldHJpY3Muc2V0WmVyb1dpZHRoKHdpZHRoRm9yR2x5cGgoemVyb0dseXBoKSk7CiAKICAg ICAvLyBVc2UgdGhlIHdpZHRoIG9mIHRoZSBDSksgd2F0ZXIgaWRlb2dyYW0gKFUrNkMzNCkgYXMg dGhlCiAgICAgLy8gYXBwcm94aW1hdGVkIHdpZHRoIG9mIGlkZW9ncmFtcyBpbiB0aGUgZm9udCwg YXMgbWVudGlvbmVkIGluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250TWV0cmljcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dE1ldHJpY3MuaAppbmRleCAwNzY2MzAzZWFiZjY3MjVjM2UyODBhOGNlODVjYWQ5ZmI2ZDI3OWIz Li5mZmFlMDBlMjRjZDg3MWNiZDY0YmE4Y2VkY2ZhZmYzNDVkOGFiYTc1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250TWV0cmljcy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRNZXRyaWNzLmgKQEAgLTExOSw3ICsxMTks NyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhc2NlbnQoKSA9PSBvdGhlci5hc2NlbnQoKSAm JiBkZXNjZW50KCkgPT0gb3RoZXIuZGVzY2VudCgpICYmIGxpbmVHYXAoKSA9PSBvdGhlci5saW5l R2FwKCk7CiAgICAgfQogCi0gICAgZmxvYXQgemVyb1dpZHRoKCkgY29uc3QgeyByZXR1cm4gbV96 ZXJvV2lkdGg7IH0KKyAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiB6ZXJvV2lkdGgoKSBjb25zdCB7 IHJldHVybiBtX3plcm9XaWR0aDsgfQogICAgIHZvaWQgc2V0WmVyb1dpZHRoKGZsb2F0IHplcm9X aWR0aCkgeyBtX3plcm9XaWR0aCA9IHplcm9XaWR0aDsgfQogCiAgICAgZmxvYXQgaWRlb2dyYW1X aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1faWRlb2dyYW1XaWR0aDsgfQpAQCAtMTQ4LDcgKzE0OCw3 IEBAIHByaXZhdGU6CiAgICAgICAgIG1faW50TGluZVNwYWNpbmcgPSAwOwogICAgICAgICBtX2lu dENhcEhlaWdodCA9IDA7CiAgICAgICAgIG1feEhlaWdodCA9IDA7Ci0gICAgICAgIG1femVyb1dp ZHRoID0gMDsKKyAgICAgICAgbV96ZXJvV2lkdGggPSBzdGQ6Om51bGxvcHQ7CiAgICAgICAgIG1f aWRlb2dyYW1XaWR0aCA9IDA7CiAgICAgICAgIG1fdW5kZXJsaW5lUG9zaXRpb24gPSAwOwogICAg ICAgICBtX3VuZGVybGluZVRoaWNrbmVzcyA9IDA7CkBAIC0xNjksNyArMTY5LDcgQEAgcHJpdmF0 ZToKICAgICBpbnQgbV9pbnRMaW5lU3BhY2luZyB7IDAgfTsKICAgICBpbnQgbV9pbnRDYXBIZWln aHQgeyAwIH07CiAKLSAgICBmbG9hdCBtX3plcm9XaWR0aCB7IDAgfTsKKyAgICBzdGQ6Om9wdGlv bmFsPGZsb2F0PiBtX3plcm9XaWR0aDsKICAgICBmbG9hdCBtX2lkZW9ncmFtV2lkdGggeyAwIH07 CiAgICAgZmxvYXQgbV94SGVpZ2h0IHsgMCB9OwogICAgIGZsb2F0IG1fdW5kZXJsaW5lUG9zaXRp b24geyAwIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggMGI1NGI3Zjk5YTExZmQ3NzQxNDEzZTdkMTViOTNjNTExOWE1NjFl ZS4uNjIyYmY2ZTMzZDQ1M2U5ODBkMDkzZTk3N2U5M2FjMzc5ZmYxM2YyNCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDIyLTAyLTA0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CisKKyAgICAgICAgY2ggdW5pdCBmYWxsYmFjayBzaXplIGRvZXNuJ3QgbWF0Y2ggdGhl IHNwZWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NjA3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg1MTMyOTc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjYW4ndCBiZSBhIFdQVCB0ZXN0 IGJlY2F1c2UgaXQgdXNlcyBhbiBTVkcgZm9udCB3aGljaCB3ZSdyZSB0aGUgb25seSBicm93c2Vy IHRvIHN1cHBvcnQuCisKKyAgICAgICAgKiBmYXN0L3RleHQvY2gtdW5pdC13aXRob3V0LXplcm8t Z2x5cGgtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L2NoLXVuaXQt d2l0aG91dC16ZXJvLWdseXBoLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAyLTA0ICBBcmNhZHkgR29s ZG1pbnRzLU9ybG92ICA8YWdvbGRtaW50c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04ocjI4MDA3Nyk6IFtHVEtdIEl0IGNhdXNlZCAxNTUgbmV3IHRlc3QgZmFpbHVyZXMKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2NoLXVuaXQtd2l0aG91dC16ZXJv LWdseXBoLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmIxNjY2MDZhYWE3ZTk4OTM2M2RjZWEw OWUzMDEzNDE0ZmFhMGM2MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4 dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTUg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KK0Bmb250LWZhY2Ug eworICAgIGZvbnQtZmFtaWx5OiAiV2ViRm9udCI7CisgICAgc3JjOiB1cmwoInJlc291cmNlcy90 aW55LWxpZ2F0dXJlLWZvbnQuc3ZnIikgZm9ybWF0KCJzdmciKTsKK30KKzwvc3R5bGU+Cis8L2hl YWQ+Cis8Ym9keT4KK1RoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgdGhlIDxjb2RlPmNoPC9jb2Rl PiB1bml0IGZhbGxzIGJhY2sgdG8gMC41ZW0gb24gZm9udHMgdGhhdCBkb24ndCBzdXBwb3J0IHRo ZSAwIGNoYXJhY3Rlci4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZSBncmVlbiBib3ggYmVsb3cgaGFz IHRoZSBjb3JyZWN0IHdpZHRoLgorPGRpdiBzdHlsZT0iZm9udDogNDhweCAnV2ViRm9udCc7IHdp ZHRoOiBjYWxjKDEwZW0gLyAyKTsgYmFja2dyb3VuZDogZ3JlZW47IGNvbG9yOiB0cmFuc3BhcmVu dDsiPkFBQUE8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvdGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L2NoLXVuaXQtd2l0aG91dC16ZXJvLWdseXBoLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGJl YThkNmUzMDYwZjgyYmRkZmRmZGE4OThlN2YyMzM1NWMxZGUyMAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvdGV4dC9jaC11bml0LXdpdGhvdXQtemVyby1nbHlwaC5odG1sCkBA IC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4K K0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAiV2ViRm9udCI7CisgICAgc3JjOiB1cmwo InJlc291cmNlcy90aW55LWxpZ2F0dXJlLWZvbnQuc3ZnIikgZm9ybWF0KCJzdmciKTsKK30KKzwv c3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KK1RoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgdGhlIDxj b2RlPmNoPC9jb2RlPiB1bml0IGZhbGxzIGJhY2sgdG8gMC41ZW0gb24gZm9udHMgdGhhdCBkb24n dCBzdXBwb3J0IHRoZSAwIGNoYXJhY3Rlci4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZSBncmVlbiBi b3ggYmVsb3cgaGFzIHRoZSBjb3JyZWN0IHdpZHRoLgorPGRpdiBzdHlsZT0iZm9udDogNDhweCAn V2ViRm9udCc7IHdpZHRoOiAxMGNoOyBiYWNrZ3JvdW5kOiBncmVlbjsgY29sb3I6IHRyYW5zcGFy ZW50OyI+QUFBQTwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=