249688 2022-12-20 17:02:21 -0800 AX: Expose bold and italic font styling as text attributes for macOS 2022-12-21 13:31:50 -0800 1 1 1 Unclassified WebKit Accessibility Safari 16 All All RESOLVED FIXED InRadar P2 Normal --- 1 thomas_mchugh webkit-unassigned aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1920947 0 thomas_mchugh 2022-12-20 17:02:21 -0800 Right now we expose bold and italic font styling for iOS but not macOS which prevents VoiceOver from knowing if some web-based fonts are bold or italic. 1920948 1 webkit-bug-importer 2022-12-20 17:02:33 -0800 <rdar://problem/103577386> 1920953 2 464129 thomas_mchugh 2022-12-20 17:12:11 -0800 Created attachment 464129 Patch 1920954 3 464129 cfleizach 2022-12-20 17:24:00 -0800 Comment on attachment 464129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=464129&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:658 > + [fontAttributes setValue:@YES forKey:@"AXFontBold"]; do we not have keys for these already? does iOS not use AXAttributedStringSetFont ? 1920956 4 thomas_mchugh 2022-12-20 17:33:23 -0800 (In reply to chris fleizach from comment #3) > do we not have keys for these already? > does iOS not use AXAttributedStringSetFont ? iOS does use AXttributedStringSetFont and uses UIAccessibilityTokenBold/Italic. MacOS doesn't have an existing key so we could either add one like this patch currently does that follows macOS attribute naming style or we could just untarget the iOS code so that it compiles for macOS and iOS and expose the iOS keys as those are defined in this file for all platforms. 1921007 5 cfleizach 2022-12-20 21:58:53 -0800 (In reply to Tommy McHugh from comment #4) > (In reply to chris fleizach from comment #3) > > do we not have keys for these already? > > does iOS not use AXAttributedStringSetFont ? > iOS does use AXttributedStringSetFont and uses > UIAccessibilityTokenBold/Italic. MacOS doesn't have an existing key so we > could either add one like this patch currently does that follows macOS > attribute naming style or we could just untarget the iOS code so that it > compiles for macOS and iOS and expose the iOS keys as those are defined in > this file for all platforms. On macOS, it looks like the proper way to get bold status is use the font text attributes [attributedString addAttribute:NSAccessibilityFontTextAttribute value:fontAttributes.get() range:range]; and then recreate your font to get the bold status CTFontRef fontRef = _copyFontRefForFontAttributes(fontAttributes); if (fontRef != NULL) { CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(fontRef); bold = (fontTraits & kCTFontBoldTrait); 1921008 6 cfleizach 2022-12-20 22:05:27 -0800 new test failure +++ /Volumes/Data/worker/macOS-BigSur-Release-WK2-Tests-EWS/build/layout-test-results/accessibility/content-editable-as-textarea-actual.txt @@ -19,6 +19,7 @@ }worl{ AXBackgroundColor = " [ (kCGColorSpaceICCBased; kCGColorSpaceModelRGB; sRGB IEC61966-2.1)] ( 0 0 0 0 )"; AXFont = { + AXFontBold = 1; AXFontFamily = Times; AXFontName = "Times-Bold"; AXFontSize = 16; 1921010 7 464143 thomas_mchugh 2022-12-20 22:23:07 -0800 Created attachment 464143 Patch 1921177 8 thomas_mchugh 2022-12-21 12:14:57 -0800 All the tests are now passing. Chris, if you think this is ready, could you please cq+? 1921199 9 ews-feeder 2022-12-21 13:31:48 -0800 Committed 258212@main (9a11844523ca): <https://commits.webkit.org/258212@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464143. 464129 2022-12-20 17:12:11 -0800 2022-12-20 22:23:05 -0800 Patch bug-249688-20221220171210.patch text/plain 6396 thomas_mchugh RnJvbSBkMmI4YzJlZTU1NjBjYTU3MWRhYjQ5N2ViMDQ5MjUyYjhjYjJhM2FjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb21teSBNY0h1Z2ggPHRob21hc19tY2h1Z2hAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDIwIERlYyAyMDIyIDE2OjU3OjMzIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEV4cG9zZSBib2xkIGFuZCBpdGFsaWMgZm9udCBzdHlsaW5nIGFzIHRleHQgYXR0cmlidXRl cwogZm9yIG1hY09TIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk2 ODgKIHJkYXI6Ly9wcm9ibGVtLzEwMzU3NzM4NgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgpDdXJyZW50bHkgV2ViS2l0IG9ubHkgZXhwb3NlcyBib2xkIGFuZCBpdGFsaWMgcHJvcGVydGll cyBvZiBmb250IHN0eWxpbmcgZm9yIGlPUy4KVGhpcyBwYXRjaCBhZGRzIGJvbGQgYW5kIGl0YWxp YyBmb250IHN0eWxpbmcgaW5mb3JtYXRpb24gdG8gYWNjZXNzaWJpbGl0eSBmb3IgbWFjT1MKYnkg Y2hlY2tpbmcgdGhlIGJvbGQgYW5kIGl0YWxpYyBzeW1ib2xpYyBmb250IHRyYWl0cyBpbiBBWEF0 dHJpYnV0ZWRTdHJpbmdTZXRGb250IGFuZAphZGRpbmcgdGhlaXIgcmVzdWx0IGFzIEFYRm9udEJv bGQgYW5kIEFYRm9udEl0YWxpYyBmb250IGF0dHJpYnV0ZXMuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5 bGluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFj L2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy5odG1sOiBB ZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UubW06CihBWEF0dHJpYnV0ZWRTdHJpbmdTZXRGb250KToKLS0tCiAu Li4vbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbSAgfCAgNSArKysKIC4u LnR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5nLWV4cGVjdGVkLnR4dCB8IDE5ICsrKysrKysr KysKIC4uLi9hdHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbCAgICAgICB8IDM4ICsr KysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNjIgaW5zZXJ0aW9ucygrKQogY3Jl YXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQt c3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy1leHBlY3RlZC50eHQKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0 cmluZy9hdHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbAoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCA4N2I4NGE5NWE1N2EuLmM3OGY0MjI3NWU2 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQpAQCAtNjUzLDYg KzY1MywxMSBAQCB2b2lkIEFYQXR0cmlidXRlZFN0cmluZ1NldEZvbnQoTlNNdXRhYmxlQXR0cmli dXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZywgQ1RGbwogICAgIGF1dG8gZGlzcGxheU5hbWUg PSBhZG9wdENGKENURm9udENvcHlEaXNwbGF5TmFtZShmb250KSk7CiAgICAgaWYgKGRpc3BsYXlO YW1lKQogICAgICAgICBbZm9udEF0dHJpYnV0ZXMgc2V0VmFsdWU6YnJpZGdlX2Nhc3QoZGlzcGxh eU5hbWUuZ2V0KCkpIGZvcktleTpOU0FjY2Vzc2liaWxpdHlWaXNpYmxlTmFtZUtleV07CisgICAg YXV0byB0cmFpdHMgPSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KTsKKyAgICBpZiAodHJh aXRzICYga0NURm9udFRyYWl0Qm9sZCkKKyAgICAgICAgW2ZvbnRBdHRyaWJ1dGVzIHNldFZhbHVl OkBZRVMgZm9yS2V5OkAiQVhGb250Qm9sZCJdOworICAgIGlmICh0cmFpdHMgJiBrQ1RGb250VHJh aXRJdGFsaWMpCisgICAgICAgIFtmb250QXR0cmlidXRlcyBzZXRWYWx1ZTpAWUVTIGZvcktleTpA IkFYRm9udEl0YWxpYyJdOwogCiAgICAgW2F0dHJpYnV0ZWRTdHJpbmcgYWRkQXR0cmlidXRlOk5T QWNjZXNzaWJpbGl0eUZvbnRUZXh0QXR0cmlidXRlIHZhbHVlOmZvbnRBdHRyaWJ1dGVzLmdldCgp IHJhbmdlOnJhbmdlXTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9tYWMvYXR0cmlidXRlZC1zdHJpbmcvYXR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5n LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQt c3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lMzUxZWI3YWNhYzIKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmlu Zy9hdHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTkgQEAKK1RoaXMgdGVzdCBlbnN1cmVzIHRoYXQgYXR0cmlidXRlZCBzdHJpbmcgZm9yIHRleHQg bWFya2VyIHJhbmdlIGluY2x1ZGVzIHRleHQgc3R5bGluZyBpbmZvcm1hdGlvbi4KKworT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgdGV4dFBsYWluLmF0dHJpYnV0ZWRTdHJpbmdG b3JUZXh0TWFya2VyUmFuZ2UodGV4dFBsYWluUmFuZ2UpIGlzIHRleHRQbGFpbkF0dHJpYnV0ZXMK K1BBU1MgdGV4dEJvbGQuYXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9s ZFJhbmdlKSBpcyB0ZXh0Qm9sZEF0dHJpYnV0ZXMKK1BBU1MgdGV4dEl0YWxpYy5hdHRyaWJ1dGVk U3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRJdGFsaWNSYW5nZSkgaXMgdGV4dEl0YWxpY0F0 dHJpYnV0ZXMKK1BBU1MgdGV4dEJvbGRJdGFsaWMuYXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJr ZXJSYW5nZSh0ZXh0Qm9sZEl0YWxpY1JhbmdlKSBpcyB0ZXh0Qm9sZEl0YWxpY0F0dHJpYnV0ZXMK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorVGhlCisK K0ZveAorCitKdW1wZWQKKworT3ZlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9tYWMvYXR0cmlidXRlZC1zdHJpbmcvYXR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5n Lmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy9h dHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAuLmQ2M2E0YzY5MTZiMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3Ry aW5nLXRleHQtc3R5bGluZy5odG1sCkBAIC0wLDAgKzEsMzggQEAKKzwhRE9DVFlQRSBIVE1MIFBV QkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNy Yz0iLi4vLi4vLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4K KzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJ0ZXh0LXBsYWluIj5UaGU8L3A+Cis8cCBpZD0idGV4dC1i b2xkIiBzdHlsZT0iZm9udC13ZWlnaHQ6IGJvbGQiPkZveDwvcD4KKzxwIGlkPSJ0ZXh0LWl0YWxp YyIgc3R5bGU9ImZvbnQtc3R5bGU6IGl0YWxpYyI+SnVtcGVkPC9wPgorPHAgaWQ9InRleHQtYm9s ZC1pdGFsaWMiIHN0eWxlPSJmb250LXN0eWxlOiBpdGFsaWM7IGZvbnQtd2VpZ2h0OiBib2xkOyI+ T3ZlcjwvcD4KKworPHNjcmlwdD4KKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0IGVuc3VyZXMg dGhhdCBhdHRyaWJ1dGVkIHN0cmluZyBmb3IgdGV4dCBtYXJrZXIgcmFuZ2UgaW5jbHVkZXMgdGV4 dCBzdHlsaW5nIGluZm9ybWF0aW9uLiIpOyAgICAgICAgCisgICAgaWYgKHdpbmRvdy5hY2Nlc3Np YmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICB2YXIgdGV4dFBsYWluID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0LXBsYWluIik7CisgICAgICAg IHZhciB0ZXh0UGxhaW5SYW5nZSA9IHRleHRQbGFpbi50ZXh0TWFya2VyUmFuZ2VGb3JFbGVtZW50 KHRleHRQbGFpbik7CisgICAgICAgIHZhciB0ZXh0UGxhaW5BdHRyaWJ1dGVzID0gIkFYRm9udCAt IHtcbiAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztcbiAgICBBWEZvbnROYW1lID0gXCJUaW1lcy1S b21hblwiO1xuICAgIEFYRm9udFNpemUgPSAxNjtcbiAgICBBWFZpc2libGVOYW1lID0gXCJUaW1l cyBSb21hblwiO1xufSwgVGhlIjsKKyAgICAgICAgc2hvdWxkQmUoInRleHRQbGFpbi5hdHRyaWJ1 dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRQbGFpblJhbmdlKSIsICJ0ZXh0UGxhaW5B dHRyaWJ1dGVzIik7CisKKyAgICAgICAgdmFyIHRleHRCb2xkID0gYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0LWJvbGQiKTsKKyAgICAgICAgdmFyIHRl eHRCb2xkUmFuZ2UgPSB0ZXh0Qm9sZC50ZXh0TWFya2VyUmFuZ2VGb3JFbGVtZW50KHRleHRCb2xk KTsKKyAgICAgICAgdmFyIHRleHRCb2xkQXR0cmlidXRlcyA9ICJBWEZvbnQgLSB7XG4gICAgQVhG b250Qm9sZCA9IDE7XG4gICAgQVhGb250RmFtaWx5ID0gVGltZXM7XG4gICAgQVhGb250TmFtZSA9 IFwiVGltZXMtQm9sZFwiO1xuICAgIEFYRm9udFNpemUgPSAxNjtcbiAgICBBWFZpc2libGVOYW1l ID0gXCJUaW1lcyBCb2xkXCI7XG59LCBGb3giOworICAgICAgICBzaG91bGRCZSgidGV4dEJvbGQu YXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9sZFJhbmdlKSIsICJ0ZXh0 Qm9sZEF0dHJpYnV0ZXMiKTsKKworICAgICAgICB2YXIgdGV4dEl0YWxpYyA9IGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidGV4dC1pdGFsaWMiKTsKKyAgICAg ICAgdmFyIHRleHRJdGFsaWNSYW5nZSA9IHRleHRJdGFsaWMudGV4dE1hcmtlclJhbmdlRm9yRWxl bWVudCh0ZXh0SXRhbGljKTsKKyAgICAgICAgdmFyIHRleHRJdGFsaWNBdHRyaWJ1dGVzID0gIkFY Rm9udCAtIHtcbiAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztcbiAgICBBWEZvbnRJdGFsaWMgPSAx O1xuICAgIEFYRm9udE5hbWUgPSBcIlRpbWVzLUl0YWxpY1wiO1xuICAgIEFYRm9udFNpemUgPSAx NjtcbiAgICBBWFZpc2libGVOYW1lID0gXCJUaW1lcyBJdGFsaWNcIjtcbn0sIEp1bXBlZCI7Cisg ICAgICAgIHNob3VsZEJlKCJ0ZXh0SXRhbGljLmF0dHJpYnV0ZWRTdHJpbmdGb3JUZXh0TWFya2Vy UmFuZ2UodGV4dEl0YWxpY1JhbmdlKSIsICJ0ZXh0SXRhbGljQXR0cmlidXRlcyIpOworCisgICAg ICAgIHZhciB0ZXh0Qm9sZEl0YWxpYyA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgidGV4dC1ib2xkLWl0YWxpYyIpOworICAgICAgICB2YXIgdGV4dEJvbGRJ dGFsaWNSYW5nZSA9IHRleHRCb2xkSXRhbGljLnRleHRNYXJrZXJSYW5nZUZvckVsZW1lbnQodGV4 dEJvbGRJdGFsaWMpOworICAgICAgICB2YXIgdGV4dEJvbGRJdGFsaWNBdHRyaWJ1dGVzID0gIkFY Rm9udCAtIHtcbiAgICBBWEZvbnRCb2xkID0gMTtcbiAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztc biAgICBBWEZvbnRJdGFsaWMgPSAxO1xuICAgIEFYRm9udE5hbWUgPSBcIlRpbWVzLUJvbGRJdGFs aWNcIjtcbiAgICBBWEZvbnRTaXplID0gMTY7XG4gICAgQVhWaXNpYmxlTmFtZSA9IFwiVGltZXMg Qm9sZCBJdGFsaWNcIjtcbn0sIE92ZXIiOworICAgICAgICBzaG91bGRCZSgidGV4dEJvbGRJdGFs aWMuYXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9sZEl0YWxpY1Jhbmdl KSIsICJ0ZXh0Qm9sZEl0YWxpY0F0dHJpYnV0ZXMiKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4K 464143 2022-12-20 22:23:07 -0800 2022-12-21 13:31:49 -0800 Patch bug-249688-20221220222306.patch text/plain 7150 thomas_mchugh RnJvbSBmZGNmZjAyMzhkYThjNTEwMTBkZDAxZjQ1YWM1ZmY3NzgwOTZlMWEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb21teSBNY0h1Z2ggPHRob21hc19tY2h1Z2hAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDIwIERlYyAyMDIyIDE2OjU3OjMzIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEV4cG9zZSBib2xkIGFuZCBpdGFsaWMgZm9udCBzdHlsaW5nIGFzIHRleHQgYXR0cmlidXRl cwogZm9yIG1hY09TIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk2 ODgKIHJkYXI6Ly9wcm9ibGVtLzEwMzU3NzM4NgoKUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2gu CgpDdXJyZW50bHkgV2ViS2l0IG9ubHkgZXhwb3NlcyBib2xkIGFuZCBpdGFsaWMgcHJvcGVydGll cyBvZiBmb250IHN0eWxpbmcgZm9yIGlPUy4KVGhpcyBwYXRjaCBhZGRzIGJvbGQgYW5kIGl0YWxp YyBmb250IHN0eWxpbmcgaW5mb3JtYXRpb24gdG8gYWNjZXNzaWJpbGl0eSBmb3IgbWFjT1MKYnkg Y2hlY2tpbmcgdGhlIGJvbGQgYW5kIGl0YWxpYyBzeW1ib2xpYyBmb250IHRyYWl0cyBpbiBBWEF0 dHJpYnV0ZWRTdHJpbmdTZXRGb250IGFuZAphZGRpbmcgdGhlaXIgcmVzdWx0IGFzIEFYRm9udEJv bGQgYW5kIEFYRm9udEl0YWxpYyBmb250IGF0dHJpYnV0ZXMuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5 bGluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFj L2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy5odG1sOiBB ZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UubW06CihBWEF0dHJpYnV0ZWRTdHJpbmdTZXRGb250KToKLS0tCiAu Li4vbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbSAgfCAgNSArKysKIC4u LnR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5nLWV4cGVjdGVkLnR4dCB8IDE5ICsrKysrKysr KysKIC4uLi9hdHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbCAgICAgICB8IDM4ICsr KysrKysrKysrKysrKysrKysKIC4uLi9jb250ZW50LWVkaXRhYmxlLWFzLXRleHRhcmVhLWV4cGVj dGVkLnR4dCB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKQogY3JlYXRl IG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3Ry aW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy1leHBlY3RlZC50eHQKIGNyZWF0ZSBt b2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmlu Zy9hdHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbAoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy QmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCA4N2I4NGE5NWE1N2EuLmM3OGY0MjI3NWU2NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQpAQCAtNjUzLDYgKzY1 MywxMSBAQCB2b2lkIEFYQXR0cmlidXRlZFN0cmluZ1NldEZvbnQoTlNNdXRhYmxlQXR0cmlidXRl ZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZywgQ1RGbwogICAgIGF1dG8gZGlzcGxheU5hbWUgPSBh ZG9wdENGKENURm9udENvcHlEaXNwbGF5TmFtZShmb250KSk7CiAgICAgaWYgKGRpc3BsYXlOYW1l KQogICAgICAgICBbZm9udEF0dHJpYnV0ZXMgc2V0VmFsdWU6YnJpZGdlX2Nhc3QoZGlzcGxheU5h bWUuZ2V0KCkpIGZvcktleTpOU0FjY2Vzc2liaWxpdHlWaXNpYmxlTmFtZUtleV07CisgICAgYXV0 byB0cmFpdHMgPSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KTsKKyAgICBpZiAodHJhaXRz ICYga0NURm9udFRyYWl0Qm9sZCkKKyAgICAgICAgW2ZvbnRBdHRyaWJ1dGVzIHNldFZhbHVlOkBZ RVMgZm9yS2V5OkAiQVhGb250Qm9sZCJdOworICAgIGlmICh0cmFpdHMgJiBrQ1RGb250VHJhaXRJ dGFsaWMpCisgICAgICAgIFtmb250QXR0cmlidXRlcyBzZXRWYWx1ZTpAWUVTIGZvcktleTpAIkFY Rm9udEl0YWxpYyJdOwogCiAgICAgW2F0dHJpYnV0ZWRTdHJpbmcgYWRkQXR0cmlidXRlOk5TQWNj ZXNzaWJpbGl0eUZvbnRUZXh0QXR0cmlidXRlIHZhbHVlOmZvbnRBdHRyaWJ1dGVzLmdldCgpIHJh bmdlOnJhbmdlXTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9tYWMvYXR0cmlidXRlZC1zdHJpbmcvYXR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5nLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3Ry aW5nL2F0dHJpYnV0ZWQtc3RyaW5nLXRleHQtc3R5bGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lMzUxZWI3YWNhYzIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy9h dHRyaWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTkg QEAKK1RoaXMgdGVzdCBlbnN1cmVzIHRoYXQgYXR0cmlidXRlZCBzdHJpbmcgZm9yIHRleHQgbWFy a2VyIHJhbmdlIGluY2x1ZGVzIHRleHQgc3R5bGluZyBpbmZvcm1hdGlvbi4KKworT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgdGV4dFBsYWluLmF0dHJpYnV0ZWRTdHJpbmdGb3JU ZXh0TWFya2VyUmFuZ2UodGV4dFBsYWluUmFuZ2UpIGlzIHRleHRQbGFpbkF0dHJpYnV0ZXMKK1BB U1MgdGV4dEJvbGQuYXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9sZFJh bmdlKSBpcyB0ZXh0Qm9sZEF0dHJpYnV0ZXMKK1BBU1MgdGV4dEl0YWxpYy5hdHRyaWJ1dGVkU3Ry aW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRJdGFsaWNSYW5nZSkgaXMgdGV4dEl0YWxpY0F0dHJp YnV0ZXMKK1BBU1MgdGV4dEJvbGRJdGFsaWMuYXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJS YW5nZSh0ZXh0Qm9sZEl0YWxpY1JhbmdlKSBpcyB0ZXh0Qm9sZEl0YWxpY0F0dHJpYnV0ZXMKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorVGhlCisKK0Zv eAorCitKdW1wZWQKKworT3ZlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9tYWMvYXR0cmlidXRlZC1zdHJpbmcvYXR0cmlidXRlZC1zdHJpbmctdGV4dC1zdHlsaW5nLmh0 bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy9hdHRy aWJ1dGVkLXN0cmluZy10ZXh0LXN0eWxpbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAuLmQ2M2E0YzY5MTZiMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5n LXRleHQtc3R5bGluZy5odG1sCkBAIC0wLDAgKzEsMzggQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJ QyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0i Li4vLi4vLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8L2hl YWQ+Cis8Ym9keT4KKzxwIGlkPSJ0ZXh0LXBsYWluIj5UaGU8L3A+Cis8cCBpZD0idGV4dC1ib2xk IiBzdHlsZT0iZm9udC13ZWlnaHQ6IGJvbGQiPkZveDwvcD4KKzxwIGlkPSJ0ZXh0LWl0YWxpYyIg c3R5bGU9ImZvbnQtc3R5bGU6IGl0YWxpYyI+SnVtcGVkPC9wPgorPHAgaWQ9InRleHQtYm9sZC1p dGFsaWMiIHN0eWxlPSJmb250LXN0eWxlOiBpdGFsaWM7IGZvbnQtd2VpZ2h0OiBib2xkOyI+T3Zl cjwvcD4KKworPHNjcmlwdD4KKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0IGVuc3VyZXMgdGhh dCBhdHRyaWJ1dGVkIHN0cmluZyBmb3IgdGV4dCBtYXJrZXIgcmFuZ2UgaW5jbHVkZXMgdGV4dCBz dHlsaW5nIGluZm9ybWF0aW9uLiIpOyAgICAgICAgCisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmls aXR5Q29udHJvbGxlcikgeworICAgICAgICB2YXIgdGV4dFBsYWluID0gYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0LXBsYWluIik7CisgICAgICAgIHZh ciB0ZXh0UGxhaW5SYW5nZSA9IHRleHRQbGFpbi50ZXh0TWFya2VyUmFuZ2VGb3JFbGVtZW50KHRl eHRQbGFpbik7CisgICAgICAgIHZhciB0ZXh0UGxhaW5BdHRyaWJ1dGVzID0gIkFYRm9udCAtIHtc biAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztcbiAgICBBWEZvbnROYW1lID0gXCJUaW1lcy1Sb21h blwiO1xuICAgIEFYRm9udFNpemUgPSAxNjtcbiAgICBBWFZpc2libGVOYW1lID0gXCJUaW1lcyBS b21hblwiO1xufSwgVGhlIjsKKyAgICAgICAgc2hvdWxkQmUoInRleHRQbGFpbi5hdHRyaWJ1dGVk U3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRQbGFpblJhbmdlKSIsICJ0ZXh0UGxhaW5BdHRy aWJ1dGVzIik7CisKKyAgICAgICAgdmFyIHRleHRCb2xkID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0LWJvbGQiKTsKKyAgICAgICAgdmFyIHRleHRC b2xkUmFuZ2UgPSB0ZXh0Qm9sZC50ZXh0TWFya2VyUmFuZ2VGb3JFbGVtZW50KHRleHRCb2xkKTsK KyAgICAgICAgdmFyIHRleHRCb2xkQXR0cmlidXRlcyA9ICJBWEZvbnQgLSB7XG4gICAgQVhGb250 Qm9sZCA9IDE7XG4gICAgQVhGb250RmFtaWx5ID0gVGltZXM7XG4gICAgQVhGb250TmFtZSA9IFwi VGltZXMtQm9sZFwiO1xuICAgIEFYRm9udFNpemUgPSAxNjtcbiAgICBBWFZpc2libGVOYW1lID0g XCJUaW1lcyBCb2xkXCI7XG59LCBGb3giOworICAgICAgICBzaG91bGRCZSgidGV4dEJvbGQuYXR0 cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9sZFJhbmdlKSIsICJ0ZXh0Qm9s ZEF0dHJpYnV0ZXMiKTsKKworICAgICAgICB2YXIgdGV4dEl0YWxpYyA9IGFjY2Vzc2liaWxpdHlD b250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidGV4dC1pdGFsaWMiKTsKKyAgICAgICAg dmFyIHRleHRJdGFsaWNSYW5nZSA9IHRleHRJdGFsaWMudGV4dE1hcmtlclJhbmdlRm9yRWxlbWVu dCh0ZXh0SXRhbGljKTsKKyAgICAgICAgdmFyIHRleHRJdGFsaWNBdHRyaWJ1dGVzID0gIkFYRm9u dCAtIHtcbiAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztcbiAgICBBWEZvbnRJdGFsaWMgPSAxO1xu ICAgIEFYRm9udE5hbWUgPSBcIlRpbWVzLUl0YWxpY1wiO1xuICAgIEFYRm9udFNpemUgPSAxNjtc biAgICBBWFZpc2libGVOYW1lID0gXCJUaW1lcyBJdGFsaWNcIjtcbn0sIEp1bXBlZCI7CisgICAg ICAgIHNob3VsZEJlKCJ0ZXh0SXRhbGljLmF0dHJpYnV0ZWRTdHJpbmdGb3JUZXh0TWFya2VyUmFu Z2UodGV4dEl0YWxpY1JhbmdlKSIsICJ0ZXh0SXRhbGljQXR0cmlidXRlcyIpOworCisgICAgICAg IHZhciB0ZXh0Qm9sZEl0YWxpYyA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVF bGVtZW50QnlJZCgidGV4dC1ib2xkLWl0YWxpYyIpOworICAgICAgICB2YXIgdGV4dEJvbGRJdGFs aWNSYW5nZSA9IHRleHRCb2xkSXRhbGljLnRleHRNYXJrZXJSYW5nZUZvckVsZW1lbnQodGV4dEJv bGRJdGFsaWMpOworICAgICAgICB2YXIgdGV4dEJvbGRJdGFsaWNBdHRyaWJ1dGVzID0gIkFYRm9u dCAtIHtcbiAgICBBWEZvbnRCb2xkID0gMTtcbiAgICBBWEZvbnRGYW1pbHkgPSBUaW1lcztcbiAg ICBBWEZvbnRJdGFsaWMgPSAxO1xuICAgIEFYRm9udE5hbWUgPSBcIlRpbWVzLUJvbGRJdGFsaWNc IjtcbiAgICBBWEZvbnRTaXplID0gMTY7XG4gICAgQVhWaXNpYmxlTmFtZSA9IFwiVGltZXMgQm9s ZCBJdGFsaWNcIjtcbn0sIE92ZXIiOworICAgICAgICBzaG91bGRCZSgidGV4dEJvbGRJdGFsaWMu YXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0Qm9sZEl0YWxpY1JhbmdlKSIs ICJ0ZXh0Qm9sZEl0YWxpY0F0dHJpYnV0ZXMiKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L2NvbnRlbnQtZWRpdGFibGUtYXMtdGV4dGFyZWEtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvY29udGVudC1lZGl0YWJsZS1hcy10ZXh0YXJl YS1leHBlY3RlZC50eHQKaW5kZXggMDY2YWI0MDAxNzU1Li4yOThkNWFmNjY2ODcgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2NvbnRlbnQtZWRpdGFi bGUtYXMtdGV4dGFyZWEtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L2NvbnRlbnQtZWRpdGFibGUtYXMtdGV4dGFyZWEtZXhwZWN0ZWQudHh0 CkBAIC0xOSw2ICsxOSw3IEBAIEF0dHJpYnV0ZWQgc3RyaW5nIHdpdGggcmFuZ2U6IGVsbG8KIH13 b3JsewogICAgIEFYQmFja2dyb3VuZENvbG9yID0gIiBbIChrQ0dDb2xvclNwYWNlSUNDQmFzZWQ7 IGtDR0NvbG9yU3BhY2VNb2RlbFJHQjsgc1JHQiBJRUM2MTk2Ni0yLjEpXSAoIDAgMCAwIDAgKSI7 CiAgICAgQVhGb250ID0gICAgIHsKKyAgICAgICAgQVhGb250Qm9sZCA9IDE7CiAgICAgICAgIEFY Rm9udEZhbWlseSA9IFRpbWVzOwogICAgICAgICBBWEZvbnROYW1lID0gIlRpbWVzLUJvbGQiOwog ICAgICAgICBBWEZvbnRTaXplID0gMTY7Cg==