137669 2014-10-13 13:53:18 -0700 AX: [ATK] CSS-generated text content not exposed to assistive technologies 2014-10-21 11:44:23 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All Linux RESOLVED FIXED InRadar P2 Normal --- 25531 1 jdiggs jdiggs aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig mario samuel_white webkit-bug-importer oldest_to_newest 1041343 0 jdiggs 2014-10-13 13:53:18 -0700 Given: <html> <head> <style type="text/css"> p#generated:before { content: "Before"; } p#generated:after { content: "After"; } </style> </head> <body> <p id="generated"> Text </p> </body> </html> The reported accessible text for the paragraph is " Text ". 1041344 1 webkit-bug-importer 2014-10-13 13:53:44 -0700 <rdar://problem/18638498> 1041348 2 239742 jdiggs 2014-10-13 14:12:26 -0700 Created attachment 239742 Patch 1041353 3 jdiggs 2014-10-13 14:19:12 -0700 See also bug 137672. 1041354 4 cfleizach 2014-10-13 14:19:35 -0700 Note: this seems to work ok for me with VoiceOver on a mac 1041358 5 239742 cfleizach 2014-10-13 14:21:07 -0700 Comment on attachment 239742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239742&action=review > Source/WebCore/ChangeLog:11 > + Test: accessibility/css-content-attribute.html how come this works on Mac, but not GTK without more modification? 1041417 6 jdiggs 2014-10-13 16:55:05 -0700 (In reply to comment #5) > (From update of attachment 239742 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239742&action=review > > > Source/WebCore/ChangeLog:11 > > + Test: accessibility/css-content-attribute.html > > how come this works on Mac, but not GTK without more modification? Good question. Here's what seems to be the case (please correct me if I'm wrong): OS X most of the time is not calling textUnderElement on RenderBlock elements. Instead, you ask for and get the text for the children of those elements (i.e. the RenderInline and RenderText objects). The exception to this rule seems to be when you're getting the title for objects such as headings. But in that case, the mode is TextUnderElementModeSkipIgnoredChildren so you wind up deferring to AccessibilityNodeObject::textUnderElement. In contrast, GTK most of the time IS calling textUnderElement on RenderBlock elements and when it does the mode is TextUnderElementModeIncludeAllChildren because for GTK/ATK, StaticTextRole objects are "ignored" -- their content being folded into the parent block element. But as a result of this mode difference, on GTK, we're not deferring to AccessibilityNodeObject::textUnderElement. In light of the above, I wonder if we could simplify AccessibilityRenderObject::textUnderElement. How much benefit are we getting from our attempts to use a text iterator for consistent handling of whitespace? 1043192 7 cfleizach 2014-10-21 09:19:45 -0700 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 239742 [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=239742&action=review > > > > > Source/WebCore/ChangeLog:11 > > > + Test: accessibility/css-content-attribute.html > > > > how come this works on Mac, but not GTK without more modification? > > Good question. Here's what seems to be the case (please correct me if I'm > wrong): > > OS X most of the time is not calling textUnderElement on RenderBlock > elements. Instead, you ask for and get the text for the children of those > elements (i.e. the RenderInline and RenderText objects). The exception to > this rule seems to be when you're getting the title for objects such as > headings. But in that case, the mode is > TextUnderElementModeSkipIgnoredChildren so you wind up deferring to > AccessibilityNodeObject::textUnderElement. > > In contrast, GTK most of the time IS calling textUnderElement on RenderBlock > elements and when it does the mode is TextUnderElementModeIncludeAllChildren > because for GTK/ATK, StaticTextRole objects are "ignored" -- their content > being folded into the parent block element. But as a result of this mode > difference, on GTK, we're not deferring to > AccessibilityNodeObject::textUnderElement. > > In light of the above, I wonder if we could simplify > AccessibilityRenderObject::textUnderElement. How much benefit are we getting > from our attempts to use a text iterator for consistent handling of > whitespace? (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 239742 [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=239742&action=review > > > > > Source/WebCore/ChangeLog:11 > > > + Test: accessibility/css-content-attribute.html > > > > how come this works on Mac, but not GTK without more modification? > > Good question. Here's what seems to be the case (please correct me if I'm > wrong): > > OS X most of the time is not calling textUnderElement on RenderBlock > elements. Instead, you ask for and get the text for the children of those > elements (i.e. the RenderInline and RenderText objects). The exception to > this rule seems to be when you're getting the title for objects such as > headings. But in that case, the mode is > TextUnderElementModeSkipIgnoredChildren so you wind up deferring to > AccessibilityNodeObject::textUnderElement. > > In contrast, GTK most of the time IS calling textUnderElement on RenderBlock > elements and when it does the mode is TextUnderElementModeIncludeAllChildren > because for GTK/ATK, StaticTextRole objects are "ignored" -- their content > being folded into the parent block element. But as a result of this mode > difference, on GTK, we're not deferring to > AccessibilityNodeObject::textUnderElement. > > In light of the above, I wonder if we could simplify > AccessibilityRenderObject::textUnderElement. How much benefit are we getting > from our attempts to use a text iterator for consistent handling of > whitespace? Simplifying these these methods seems like it would be a good idea. It's totally unclear at this time what is expected behavior without actually debugging the code. Do you want to do that with this patch, or do you want to get this change in? 1043214 8 jdiggs 2014-10-21 10:15:27 -0700 (In reply to comment #7) > Simplifying these these methods seems like it would be a good idea. It's > totally unclear at this time what is expected behavior without actually > debugging the code. > > Do you want to do that with this patch, or do you want to get this change in? Regarding the simplification, I just opened bug 137927. If we need to debug the code just to figure it out, and given our platforms' different approaches to accessible text, tackling that problem should be separated out. As for getting the change from the attached patch in, I'm comfortable with it for my platform if you're comfortable with it for yours. If you'd prefer I make the change in the ATK code or write some more tests so we can be sure it isn't breaking anything on the Mac, I'm happy to do so. 1043241 9 239742 commit-queue 2014-10-21 11:44:19 -0700 Comment on attachment 239742 Patch Clearing flags on attachment: 239742 Committed r174992: <http://trac.webkit.org/changeset/174992> 1043242 10 commit-queue 2014-10-21 11:44:23 -0700 All reviewed patches have been landed. Closing bug. 239742 2014-10-13 14:12:26 -0700 2014-10-21 11:44:19 -0700 Patch bug-137669-20141013171229.patch text/plain 9410 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RlYjYzYjdlYThkMGI4 YjMyODE0NGEzZTY5MTdmYzY4ZjFkZjU4OS4uMWUxYTAwOTc1YThlNzBmMTY4NTEyZTIzZDAwNDQ3 YzBkOWU5NjlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTEwLTEzICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogW0FUS10gQ1NT LWdlbmVyYXRlZCB0ZXh0IGNvbnRlbnQgbm90IGV4cG9zZWQgdG8gYXNzaXN0aXZlIHRlY2hub2xv Z2llcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3 NjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG8g bm90IHVzZSBhIHRleHQgaXRlcmF0b3IgdG8gZ2V0IHRoZSB0ZXh0IGZvciBlbGVtZW50cyB3aGlj aCBpbmNsdWRlCisgICAgICAgIHBzZXVkbyBlbGVtZW50cy4KKworICAgICAgICBUZXN0OiBhY2Nl c3NpYmlsaXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS5odG1sCisKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dGV4dFVuZGVyRWxlbWVudCk6CisKIDIwMTQtMTAt MTMgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CiAKICAgICAgICAgW0NTU1Jl Z2lvbnNdIE1ha2UgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmNvbXB1dGVTdHlsZUluUmVnaW9u IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBjZGEyZWIxYmEzZmU5ZDQxMTQ2NmQyNzk4 YjM4Yjc4OWJmZWU1NGE3Li43MzM2NjUxNGE3ZWM3YTRhYzVmOGUxMjdlOTdhODliZjA4NWNkNGJm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTYzNyw2ICs2MzcsMTAgQEAgU3RyaW5nIEFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJpbGl0eVRleHRV bmRlckVsZW1lbnQKICAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRleHQ+KCptX3JlbmRl cmVyKS50ZXh0KCk7CiAjZW5kaWYKIAorICAgIC8vIHJhbmdlT2ZDb250ZW50cyBkb2VzIG5vdCBp bmNsdWRlIENTUy1nZW5lcmF0ZWQgY29udGVudC4KKyAgICBpZiAobV9yZW5kZXJlci0+aXNCZWZv cmVPckFmdGVyQ29udGVudCgpKQorICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQobW9kZSk7CisKICAgICAvLyBXZSB1c2UgYSB0ZXh0IGl0ZXJh dG9yIGZvciB0ZXh0IG9iamVjdHMgQU5EIGZvciB0aG9zZSBjYXNlcyB3aGVyZSB3ZSBhcmUKICAg ICAvLyBleHBsaWNpdGx5IGFza2luZyBmb3IgdGhlIGZ1bGwgdGV4dCB1bmRlciBhIGdpdmVuIGVs ZW1lbnQuCiAgICAgaWYgKGlzPFJlbmRlclRleHQ+KCptX3JlbmRlcmVyKSB8fCBtb2RlLmNoaWxk cmVuSW5jbHVzaW9uID09IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZTo6VGV4dFVu ZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4pIHsKQEAgLTY0NSw2ICs2NDksMTIgQEAg U3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQoQWNjZXNz aWJpbGl0eVRleHRVbmRlckVsZW1lbnQKICAgICAgICAgRG9jdW1lbnQqIG5vZGVEb2N1bWVudCA9 IG51bGxwdHI7CiAgICAgICAgIFJlZlB0cjxSYW5nZT4gdGV4dFJhbmdlOwogICAgICAgICBpZiAo Tm9kZSogbm9kZSA9IG1fcmVuZGVyZXItPm5vZGUoKSkgeworICAgICAgICAgICAgLy8gcmFuZ2VP ZkNvbnRlbnRzIGRvZXMgbm90IGluY2x1ZGUgQ1NTLWdlbmVyYXRlZCBjb250ZW50LgorICAgICAg ICAgICAgTm9kZSogZmlyc3RDaGlsZCA9IG5vZGUtPnBzZXVkb0F3YXJlRmlyc3RDaGlsZCgpOwor ICAgICAgICAgICAgTm9kZSogbGFzdENoaWxkID0gbm9kZS0+cHNldWRvQXdhcmVMYXN0Q2hpbGQo KTsKKyAgICAgICAgICAgIGlmICgoZmlyc3RDaGlsZCAmJiBmaXJzdENoaWxkLT5pc1BzZXVkb0Vs ZW1lbnQoKSkgfHwgKGxhc3RDaGlsZCAmJiBsYXN0Q2hpbGQtPmlzUHNldWRvRWxlbWVudCgpKSkK KyAgICAgICAgICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQobW9kZSk7CisKICAgICAgICAgICAgIG5vZGVEb2N1bWVudCA9ICZub2RlLT5kb2N1 bWVudCgpOwogICAgICAgICAgICAgdGV4dFJhbmdlID0gcmFuZ2VPZkNvbnRlbnRzKCpub2RlKTsK ICAgICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiOWQ3OWFjYjBmODVlNThkNWU4NjVlODc2ZmRiNzE3 Nzg2MWI0MjIyLi44MjM4MGY1MzdhMjU1NTIzNjMxYTQ3ZGUyNDk1ZGQwMWM3NDA2MWQxIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQtMTAtMTMgIEpvYW5tYXJpZSBEaWdncyAgPGpkaWdnc0Bp Z2FsaWEuY29tPgorCisgICAgICAgIEFYOiBbQVRLXSBDU1MtZ2VuZXJhdGVkIHRleHQgY29udGVu dCBub3QgZXhwb3NlZCB0byBhc3Npc3RpdmUgdGVjaG5vbG9naWVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc2NjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCB0aGUgTWFjIHBsYXRmb3JtIHRl c3QgYW5kIG1vZGlmaWVkIGl0IHRvIGR1bXAgdGhlIGFjY2Vzc2libGUgdHJlZQorICAgICAgICBh bmQgc3RyaW5nIHZhbHVlcyByYXRoZXIgdGhhbiBhIHBsYXRmb3JtLXNwZWNpZmljIGhpZXJhcmNo eSBzbyB0aGF0IGl0CisgICAgICAgIGNvdWxkIGJlIHNoYXJlZCBhY3Jvc3MgcGxhdGZvcm1zLgor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9jc3MtY29udGVudC1hdHRyaWJ1dGUuaHRtbDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY3NzLWNvbnRlbnQtYXR0 cmlidXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvY3NzLWNvbnRlbnQtYXR0cmlidXRlLWV4cGVjdGVkLnR4dDogTW9kaWZpZWQgdG8g cmVmbGVjdCBuZXcgb3V0cHV0LgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS5odG1sOiBSZW1vdmVkLgorCiAyMDE0LTA5LTMwICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIFBhc3MgdGhlIHZhbGlkIHNldCBvZiB0cmFja3MgdG8gZ3JvdyBiZXlvbmQgZ3Jv d3RoIGxpbWl0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jc3MtY29u dGVudC1hdHRyaWJ1dGUuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY3NzLWNvbnRl bnQtYXR0cmlidXRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmQ0NDhmODg1YzViZWYwZTg3N2Q3OGIxOTVj YjFhYjg2NzQ0YTEzNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvY3NzLWNvbnRlbnQtYXR0cmlidXRlLmh0bWwKQEAgLTAsMCArMSw1NCBAQAorPCFET0NUWVBF IEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8c2NyaXB0Pgor ICAgIGZ1bmN0aW9uIGR1bXBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oZWxlbWVudCwgbGV2ZWwpIHsK KyAgICAgICAgaWYgKGVsZW1lbnQuc3RyaW5nVmFsdWUuaW5kZXhPZignRW5kIG9mIHRlc3QnKSA+ PSAwKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIHZhciBpbmRlbnQgPSAi IjsKKyAgICAgICAgZm9yICh2YXIgayA9IDA7IGsgPCBsZXZlbDsgaysrKSB7IGluZGVudCArPSAi ICAiOyB9CisgICAgICAgIGRlYnVnKGluZGVudCArIGVsZW1lbnQucm9sZSArICIgIiArIGVsZW1l bnQuc3RyaW5nVmFsdWUpOworICAgICAgICB2YXIgY2hpbGRyZW5Db3VudCA9IGVsZW1lbnQuY2hp bGRyZW5Db3VudDsKKyAgICAgICAgZm9yICh2YXIgayA9IDA7IGsgPCBjaGlsZHJlbkNvdW50OyBr KyspIHsKKyAgICAgICAgICAgIGlmICghZHVtcEFjY2Vzc2liaWxpdHlDaGlsZHJlbihlbGVtZW50 LmNoaWxkQXRJbmRleChrKSwgbGV2ZWwrMSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKzwvc2NyaXB0PgorPGhl YWQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4K KworICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisKKyAgICAgICAgaDE6YmVmb3JlIHsKKyAg ICAgICAgICAgIGNvbnRlbnQ6ICdUaGlzIGlzIGEnOworICAgICAgICB9CisKKyAgICAgICAgaDE6 YWZ0ZXIgeworICAgICAgICAgICAgY29udGVudDogJ0hlYWRsaW5lJzsKKyAgICAgICAgfQorCisg ICAgPC9zdHlsZT4KKworPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorPGgxPlNBTVBMRTwvaDE+ Cis8ZGl2PkVuZCBvZiB0ZXN0PC9kaXY+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYg aWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMg dGVzdHMgdGhhdCB3aGVuIHRoZSBjb250ZW50IGF0dHJpYnV0ZSBpbiBDU1MgaXMgdXNlZCwgdGhl IGNvcnJlY3QgdmFsdWVzIGFyZSByZXR1cm5lZC4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi Ym9keSIpLmZvY3VzKCk7CisgICAgICAgICAgZHVtcEFjY2Vzc2liaWxpdHlDaGlsZHJlbihhY2Nl c3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudCwgMCk7CisgICAgfQorCis8L3Njcmlw dD4KKworPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L2FjY2Vzc2liaWxpdHkvY3NzLWNvbnRlbnQtYXR0cmlidXRlLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDcyYzlmNTMzODE3MGFiNmFhYjM4ZTJmYTI1NjI4OTgy ZjNlMTc0MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nl c3NpYmlsaXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx NCBAQAorU0FNUExFCisKK0VuZCBvZiB0ZXN0CitUaGlzIHRlc3RzIHRoYXQgd2hlbiB0aGUgY29u dGVudCBhdHRyaWJ1dGUgaW4gQ1NTIGlzIHVzZWQsIHRoZSBjb3JyZWN0IHZhbHVlcyBhcmUgcmV0 dXJuZWQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVz c2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitBWFJvbGU6IEFYV2ViQXJl YSAKKyAgQVhSb2xlOiBBWEhlYWRpbmcgQVhWYWx1ZTogVGhpcyBpcyBhIFNBTVBMRSBIZWFkbGlu ZQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2Nzcy1jb250 ZW50LWF0dHJpYnV0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9jc3MtY29udGVudC1hdHRyaWJ1dGUtZXhwZWN0ZWQudHh0CmluZGV4IDE1MDg0 MTU2ZTk2ZWU4MzliZTg1NmU3ZTdmNDY3NDMxNzY5ZDVmOWMuLjM2OTVlZDc1ZWQyYzk5YjUyOTJk MWJiOWQ1ZmRhZjM4YWNkNWIwMTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvY3NzLWNvbnRlbnQtYXR0cmli dXRlLWV4cGVjdGVkLnR4dApAQCAtMSwxNiArMSwxNyBAQAogU0FNUExFCiAKK0VuZCBvZiB0ZXN0 CiBUaGlzIHRlc3RzIHRoYXQgd2hlbiB0aGUgY29udGVudCBhdHRyaWJ1dGUgaW4gQ1NTIGlzIHVz ZWQsIHRoZSBjb3JyZWN0IHZhbHVlcyBhcmUgcmV0dXJuZWQuCiAKIE9uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KIAogCi1QQVNTIGJvZHkuY2hpbGRBdEluZGV4KDApLmNoaWxkQXRJbmRleCgwKS5y b2xlIGlzICdBWFJvbGU6IEFYU3RhdGljVGV4dCcKLVBBU1MgYm9keS5jaGlsZEF0SW5kZXgoMCku Y2hpbGRBdEluZGV4KDEpLnJvbGUgaXMgJ0FYUm9sZTogQVhTdGF0aWNUZXh0JwotUEFTUyBib2R5 LmNoaWxkQXRJbmRleCgwKS5jaGlsZEF0SW5kZXgoMikucm9sZSBpcyAnQVhSb2xlOiBBWFN0YXRp Y1RleHQnCi1QQVNTIGJvZHkuY2hpbGRBdEluZGV4KDApLmNoaWxkQXRJbmRleCgwKS5zdHJpbmdW YWx1ZSBpcyAnQVhWYWx1ZTogVGhpcyBpcyBhJwotUEFTUyBib2R5LmNoaWxkQXRJbmRleCgwKS5j aGlsZEF0SW5kZXgoMSkuc3RyaW5nVmFsdWUgaXMgJ0FYVmFsdWU6IFNBTVBMRScKLVBBU1MgYm9k eS5jaGlsZEF0SW5kZXgoMCkuY2hpbGRBdEluZGV4KDIpLnN0cmluZ1ZhbHVlIGlzICdBWFZhbHVl OiBIZWFkbGluZScKK0FYUm9sZTogQVhXZWJBcmVhIEFYVmFsdWU6IAorICBBWFJvbGU6IEFYSGVh ZGluZyBBWFZhbHVlOiAxCisgICAgQVhSb2xlOiBBWFN0YXRpY1RleHQgQVhWYWx1ZTogVGhpcyBp cyBhCisgICAgQVhSb2xlOiBBWFN0YXRpY1RleHQgQVhWYWx1ZTogU0FNUExFCisgICAgQVhSb2xl OiBBWFN0YXRpY1RleHQgQVhWYWx1ZTogSGVhZGxpbmUKKyAgQVhSb2xlOiBBWEdyb3VwIEFYVmFs dWU6IAogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9jc3MtY29u dGVudC1hdHRyaWJ1dGUuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAyZWU0YzAwMDY4ODI3NWYxZmYzNDlkODRmZDEyMzYwZDMwODFkNmQ5Li4wMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L2Nzcy1jb250ZW50LWF0dHJpYnV0ZS5odG1sCisrKyAvZGV2L251 bGwKQEAgLTEsNDggKzAsMCBAQAotPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQg SFRNTC8vRU4iPgotPGh0bWw+Ci08aGVhZD4KLTxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJj ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgotCi0gICAgPHN0eWxlIHR5cGU9InRleHQvY3Nz Ij4KLSAgICAKLSAgICAgICAgaDE6YmVmb3JlIHsKLSAgICAgICAgICAgIGNvbnRlbnQ6ICdUaGlz IGlzIGEnOwotICAgICAgICB9Ci0gICAgCi0gICAgICAgIGgxOmFmdGVyIHsKLSAgICAgICAgICAg IGNvbnRlbnQ6ICdIZWFkbGluZSc7Ci0gICAgICAgIH0KLSAgICAgICAgIAotICAgIDwvc3R5bGU+ Ci0KLTwvaGVhZD4KLTxib2R5IGlkPSJib2R5Ij4KLTxoMT5TQU1QTEU8L2gxPgotCi08cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KLTxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgotCi08c2NyaXB0Pgot Ci0gICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCB3aGVuIHRoZSBjb250ZW50IGF0dHJp YnV0ZSBpbiBDU1MgaXMgdXNlZCwgdGhlIGNvcnJlY3QgdmFsdWVzIGFyZSByZXR1cm5lZC4iKTsK LQotICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKLQotICAgICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5IikuZm9jdXMoKTsKLSAgICAgICAgICB2YXIg Ym9keSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OwotCi0gICAgICAg ICAgLy8gVGVzdCB0aGF0IGFsbCB0aHJlZSBjaGlsZHJlbiBpbiB0aGUgaGVhZGVyIGFwcGVhciB3 aXRoIHRoZSBjb3JyZWN0IHZhbHVlcy4KLSAgICAgICAgICBzaG91bGRCZSgiYm9keS5jaGlsZEF0 SW5kZXgoMCkuY2hpbGRBdEluZGV4KDApLnJvbGUiLCAiJ0FYUm9sZTogQVhTdGF0aWNUZXh0JyIp OwotICAgICAgICAgIHNob3VsZEJlKCJib2R5LmNoaWxkQXRJbmRleCgwKS5jaGlsZEF0SW5kZXgo MSkucm9sZSIsICInQVhSb2xlOiBBWFN0YXRpY1RleHQnIik7Ci0gICAgICAgICAgc2hvdWxkQmUo ImJvZHkuY2hpbGRBdEluZGV4KDApLmNoaWxkQXRJbmRleCgyKS5yb2xlIiwgIidBWFJvbGU6IEFY U3RhdGljVGV4dCciKTsKLQotICAgICAgICAgIHNob3VsZEJlKCJib2R5LmNoaWxkQXRJbmRleCgw KS5jaGlsZEF0SW5kZXgoMCkuc3RyaW5nVmFsdWUiLCAiJ0FYVmFsdWU6IFRoaXMgaXMgYSciKTsK LSAgICAgICAgICBzaG91bGRCZSgiYm9keS5jaGlsZEF0SW5kZXgoMCkuY2hpbGRBdEluZGV4KDEp LnN0cmluZ1ZhbHVlIiwgIidBWFZhbHVlOiBTQU1QTEUnIik7Ci0gICAgICAgICAgc2hvdWxkQmUo ImJvZHkuY2hpbGRBdEluZGV4KDApLmNoaWxkQXRJbmRleCgyKS5zdHJpbmdWYWx1ZSIsICInQVhW YWx1ZTogSGVhZGxpbmUnIik7Ci0gICAgfQotCi08L3NjcmlwdD4KLQotPHNjcmlwdCBzcmM9Ii4u Ly4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgotPC9ib2R5PgotPC9o dG1sPgo=