132349 2014-04-29 12:28:59 -0700 AX: [ATK] text inside span block in a block not accessible 2014-06-13 09:13:01 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk, InRadar P2 Normal --- 25531 1 jarekczek webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 1005056 0 jarekczek 2014-04-29 12:28:59 -0700 <div> <div>Before</div> <a style="display:block;" href="xref"> <span style="display:block;">Span</span> </a> <div>After</div> </div> In this example Span text is not accessible. The link is not ATK_TEXT. This is related to bug #130941 and these 2 bugs together make yelp gnome documentation partially inaccessible. Test case to come soon. 1005057 1 webkit-bug-importer 2014-04-29 12:29:18 -0700 <rdar://problem/16759234> 1014018 2 232681 jarekczek 2014-06-08 01:15:54 -0700 Created attachment 232681 fix for span block v1.00 When atk interfaces are considered getInterfaceMaskFromObject (accessibility/atk/WebKitAccessibleWrapperAtk.cpp), then all divs are given (roleIsTextType). Seems like all links may also be given this interface. I don't see any counterexample. So this is what the one-liner patch does. The patch also tested on 2.4 branch. 1014085 3 232681 mario 2014-06-09 02:34:30 -0700 Comment on attachment 232681 fix for span block v1.00 View in context: https://bugs.webkit.org/attachment.cgi?id=232681&action=review The patch looks good to me, but I have a suggestion to improve the test before landing. See below... > LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html:14 > + <span style="display:block;">text1</span> I think it would be interesting to place some text before and after the <span> *and* inside the scope of the <a> elements (for all the three cases), and then check that the full text (including the text inside the span and those 'before' and 'after' bits) will be returned when calling element.stringValue. The purpose of this suggestion is to ensure that the implementation of AtkText for those links whose children are not inline (because of the 'display: block' thing) is still returning the full 'flattened' text for all the block children (the 'before' and 'after' will be part of generated block elements) inside of it. Other than this (and assuming that that extended version of the test will still pass), I don't have any other comment on the patch. 1014190 4 232723 jarekczek 2014-06-09 12:53:13 -0700 Created attachment 232723 fix for span block v1.01 Hi Mario >I think it would be interesting to place some text before and after [...] There are countless configurations possible. I chose three of them and I hope this set is sufficient for you :) Small rebuild of test script was needed to keep it friendly. Thanks for the immediate review! 1015437 5 232723 mario 2014-06-13 08:43:04 -0700 Comment on attachment 232723 fix for span block v1.01 (In reply to comment #4) > Created an attachment (id=232723) [details] > fix for span block v1.01 > > Hi Mario > > >I think it would be interesting to place some text before and after [...] > > There are countless configurations possible. I chose three of them and I hope this set is sufficient for you :) > Small rebuild of test script was needed to keep it friendly. > Hi Jarek, apologies for taking so much time to review this (it fell off my radar somehow), and thanks for considering my comments and incorporating them in the new patch. LGTM now 1015450 6 232723 commit-queue 2014-06-13 09:12:56 -0700 Comment on attachment 232723 fix for span block v1.01 Clearing flags on attachment: 232723 Committed r169936: <http://trac.webkit.org/changeset/169936> 1015451 7 commit-queue 2014-06-13 09:13:01 -0700 All reviewed patches have been landed. Closing bug. 232681 2014-06-08 01:15:54 -0700 2014-06-09 12:53:13 -0700 fix for span block v1.00 span_block_1_00.patch text/plain 5250 jarekczek SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY1NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA2LTA4ICBKYXJlayBDemVrYWxza2kg IDxqYXJla2N6ZWtAcG9jenRhLm9uZXQucGw+CisKKyAgICAgICAgW0FUS10gQWRkIHRlc3QgZm9y IGFjY2Vzc2liaWxpdHkgb2YgdGV4dCBpbnNpZGUgc3BhbiBibG9jayBpbiBhIGJsb2NrLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMzQ5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS90ZXh0LWluLXNwYW4tYmxvY2staW4tYS1ibG9jay1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RleHQtaW4t c3Bhbi1ibG9jay1pbi1hLWJsb2NrLmh0bWw6IEFkZGVkLgorCiAyMDE0LTA2LTA2ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBIaXQgdGVzdGlu ZyBvZiBjb21wb3NpdGVkIGVsZW1lbnRzIGlzIGJyb2tlbiBpbiBuZXcgbXVsdGljb2x1bW4gbGF5 b3V0LgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGV4dC1p bi1zcGFuLWJsb2NrLWluLWEtYmxvY2stZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RleHQtaW4tc3Bhbi1ibG9jay1pbi1h LWJsb2NrLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9hY2Nlc3NpYmlsaXR5L3RleHQtaW4tc3Bhbi1ibG9jay1pbi1hLWJsb2NrLWV4cGVjdGVk LnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE5IEBACit0ZXh0MQorYmVmb3JlCit0ZXh0 MgordGV4dDMKK1RoaXMgdGVzdHMgdGhhdCB0ZXh0IGluc2lkZSAiYSIgYmxvY2sgaW5zaWRlICJz cGFuIiBibG9jayBpcyBhY2Nlc3NpYmxlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisK KworUEFTUyBlbGVtVGV4dCBpcyAiQVhWYWx1ZTogdGV4dDEiCitQQVNTIHNldENhcmV0T2Zmc2V0 KGVsZW0sIDEpIGlzIHRydWUKK1BBU1MgZWxlbVRleHQgaXMgIkFYVmFsdWU6IHRleHQyIgorUEFT UyBzZXRDYXJldE9mZnNldChlbGVtLCAxKSBpcyB0cnVlCitQQVNTIGVsZW1UZXh0IGlzICJBWFZh bHVlOiB0ZXh0MyIKK1BBU1Mgc2V0Q2FyZXRPZmZzZXQoZWxlbSwgMSkgaXMgdHJ1ZQorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RleHQtaW4tc3Bhbi1ibG9jay1pbi1h LWJsb2NrLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vz c2liaWxpdHkvdGV4dC1pbi1zcGFuLWJsb2NrLWluLWEtYmxvY2suaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RleHQtaW4tc3Bhbi1i bG9jay1pbi1hLWJsb2NrLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw2NiBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2Ny aXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9hdGstaGVscGVycy5qcyI+PC9zY3JpcHQ+ Cis8L2hlYWQ+CisKKzxib2R5PgorCis8IS0tIFN1c3BlY3RlZCAiYSIgZWxlbWVudCBpbiBzZXZl cmFsIGRpZmZlcmVudCBjb25maWd1cmF0aW9ucy4gLS0+CisKKzxkaXY+CisgIDxhIGlkPSJpZDEi IGhyZWY9IngiIHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+CisgICAgPHNwYW4gc3R5bGU9ImRpc3Bs YXk6YmxvY2s7Ij50ZXh0MTwvc3Bhbj4KKyAgPC9hPgorPC9kaXY+CisKKzxkaXY+CisgIDxkaXY+ YmVmb3JlPC9kaXY+CisgIDxhIGlkPSJpZDIiIGhyZWY9IngiIHN0eWxlPSJkaXNwbGF5OmJsb2Nr OyI+CisgICAgPHNwYW4gc3R5bGU9ImRpc3BsYXk6YmxvY2s7Ij50ZXh0Mjwvc3Bhbj4KKyAgPC9h PgorPC9kaXY+CisKKzxhIGlkPSJpZDMiIGhyZWY9IngiIHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+ CisgIDxzcGFuIHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+dGV4dDM8L3NwYW4+Cis8L2E+CisKKzxk aXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgordmFyIGNhcmV0TW92ZWREYXRhOwor CitmdW5jdGlvbiBnbG9iYWxMaXN0ZW5lcihvYmplY3QsIG5hbWUsIG9mZnNldCkKK3sKKyAgICB2 YXIgcm9sZSA9IG9iamVjdC5yb2xlLnJlcGxhY2UoJ0FYUm9sZTogQVgnLCAnJyk7CisgICAgaWYg KG5hbWUgPT0gJ0FYVGV4dENhcmV0TW92ZWQnKSB7CisgICAgICAgIGNhcmV0TW92ZWREYXRhICs9 IHJvbGUgKyAnfCcgKyBvZmZzZXQ7CisgICAgfQorfQorCitpZiAod2luZG93LnRlc3RSdW5uZXIp IHsKKyAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0RW5hYmxlQ2FyZXRC cm93c2luZyIsIHRydWUpOworICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworfQorCitpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgZm9yIChpID0gMTsgaSA8PSAz OyBpKyspIHsKKyAgICAgICAgZWxlbSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgnaWQnICsgaSk7CisgICAgICAgIGVsZW1UZXh0ID0gZWxlbS5zdHJpbmdW YWx1ZTsKKyAgICAgICAgLy8gSWdub3JlIGxpbmUgZW5kaW5ncywgd2hldGhlciB0aGV5IGFyZSBv ciBub3QuCisgICAgICAgIGVsZW1UZXh0ID0gZWxlbVRleHQucmVwbGFjZSgiPFxcbj4iLCAiIik7 CisgICAgICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZWxlbVRleHQiLCAiQVhWYWx1ZTogdGV4 dCIgKyBpKTsKKyAgICAgICAgY2FyZXRNb3ZlZERhdGEgPSAnJzsKKyAgICAgICAgc2hvdWxkQmUo InNldENhcmV0T2Zmc2V0KGVsZW0sIDEpIiwgInRydWUiKTsKKyAgICAgICAgLy8gRklYTUU6IFRo aXMgbGluZSB3aWxsIGJlIGFkZGVkIGFmdGVyIGZpeGluZyBidWcgIzEzMDk0MS4KKyAgICAgICAg Ly9zaG91bGRCZUVxdWFsVG9TdHJpbmcoImNhcmV0TW92ZWREYXRhIiwgInRleHQiICsgaSArICJ8 MSIpOworICAgIH0KK30KKworZGVzY3JpcHRpb24oJ1RoaXMgdGVzdHMgdGhhdCB0ZXh0IGluc2lk ZSAiYSIgYmxvY2sgaW5zaWRlICJzcGFuIiBibG9jayBpcyBhY2Nlc3NpYmxlLicpOworCis8L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48 L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY1 NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDE0LTA2LTA4ICBKYXJlayBDemVrYWxza2kgIDxqYXJla2N6ZWtAcG9jenRhLm9u ZXQucGw+CisKKyAgICAgICAgW0FUS10gRml4IHRleHQgaW5zaWRlICJzcGFuIiBibG9jayBpbiAi YSIgYmxvY2sgd2FzIG5vdCBhY2Nlc3NpYmxlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMzQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxl V3JhcHBlckF0ay5jcHA6IEFkZCBsaW5rIHJvbGUKKyAgICAgICAgICB0byB0aGUgbGlzdCBvZiBy b2xlcyB3aG9zZSBvYmplY3RzIGFsd2F5cyBleHBvc2UgYXRrX3RleHQgaW50ZXJmYWNlLgorCiAy MDE0LTA2LTA2ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi Q29yZSBwYXJ0IG9mIDxyZGFyOi8vcHJvYmxlbS8xNzA5NTY5Mj4gW2lPU10gQ2xpZW50LWNlcnRp ZmljYXRlIGF1dGhlbnRpY2F0aW9uIGlzbuKAmXQgd29ya2luZwpJbmRleDogU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2li bGVXcmFwcGVyQXRrLmNwcAkocmV2aXNpb24gMTY5NjU1KQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTIzLDcgKzExMjMsOCBAQAogCiBzdGF0aWMgYm9vbCByb2xlSXNUZXh0VHlwZShB Y2Nlc3NpYmlsaXR5Um9sZSByb2xlKQogewotICAgIHJldHVybiByb2xlID09IFBhcmFncmFwaFJv bGUgfHwgcm9sZSA9PSBIZWFkaW5nUm9sZSB8fCByb2xlID09IERpdlJvbGUgfHwgcm9sZSA9PSBD ZWxsUm9sZSB8fCByb2xlID09IExpc3RJdGVtUm9sZTsKKyAgICByZXR1cm4gcm9sZSA9PSBQYXJh Z3JhcGhSb2xlIHx8IHJvbGUgPT0gSGVhZGluZ1JvbGUgfHwgcm9sZSA9PSBEaXZSb2xlIHx8IHJv bGUgPT0gQ2VsbFJvbGUKKyAgICAgICAgfHwgcm9sZSA9PSBMaW5rUm9sZSB8fCByb2xlID09IFdl YkNvcmVMaW5rUm9sZSB8fCByb2xlID09IExpc3RJdGVtUm9sZTsKIH0KIAogc3RhdGljIGd1aW50 MTYgZ2V0SW50ZXJmYWNlTWFza0Zyb21PYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9i amVjdCkK 232723 2014-06-09 12:53:13 -0700 2014-06-13 09:12:56 -0700 fix for span block v1.01 span_block_1_01.patch text/plain 6203 jarekczek SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE2OTY1NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA2LTA4ICBKYXJlayBDemVrYWxza2kg IDxqYXJla2N6ZWtAcG9jenRhLm9uZXQucGw+CisKKyAgICAgICAgW0FUS10gQWRkIHRlc3QgZm9y IGFjY2Vzc2liaWxpdHkgb2YgdGV4dCBpbnNpZGUgInNwYW4iIGJsb2NrIGluICJhIiBibG9jay4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjM0OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGV4dC1pbi1zcGFuLWJsb2NrLWluLWEtYmxvY2stZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90ZXh0 LWluLXNwYW4tYmxvY2staW4tYS1ibG9jay5odG1sOiBBZGRlZC4KKwogMjAxNC0wNi0wNiAgRGF2 aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogSGl0IHRl c3Rpbmcgb2YgY29tcG9zaXRlZCBlbGVtZW50cyBpcyBicm9rZW4gaW4gbmV3IG11bHRpY29sdW1u IGxheW91dC4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3Rl eHQtaW4tc3Bhbi1ibG9jay1pbi1hLWJsb2NrLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90ZXh0LWluLXNwYW4tYmxvY2st aW4tYS1ibG9jay1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90ZXh0LWluLXNwYW4tYmxvY2staW4tYS1ibG9jay1leHBl Y3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMyBAQAorb25lCitiZWZvcmUKK3R3 bwordGhyZWUKK2JlZm9yZSwKK2ZvdXIKKyxhZnRlcgorYmVmb3JlCitmaXZlCissYWZ0ZXIKK2Jl Zm9yZSwKK3NpeAorVGhpcyB0ZXN0cyB0aGF0IHRleHQgaW5zaWRlICJhIiBibG9jayBpbnNpZGUg InNwYW4iIGJsb2NrIGlzIGFjY2Vzc2libGUuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitQQVNTIGFjY1RleHQgaXMgIkFYVmFsdWU6b25lIgorUEFTUyBzZXRDYXJldE9mZnNldChl bGVtLCAxKSBpcyB0cnVlCitQQVNTIGFjY1RleHQgaXMgIkFYVmFsdWU6dHdvIgorUEFTUyBzZXRD YXJldE9mZnNldChlbGVtLCAxKSBpcyB0cnVlCitQQVNTIGFjY1RleHQgaXMgIkFYVmFsdWU6dGhy ZWUiCitQQVNTIHNldENhcmV0T2Zmc2V0KGVsZW0sIDEpIGlzIHRydWUKK1BBU1MgYWNjVGV4dCBp cyAiQVhWYWx1ZTpiZWZvcmUsZm91cixhZnRlciIKK1BBU1Mgc2V0Q2FyZXRPZmZzZXQoZWxlbSwg MSkgaXMgdHJ1ZQorUEFTUyBhY2NUZXh0IGlzICJBWFZhbHVlOmZpdmUsYWZ0ZXIiCitQQVNTIHNl dENhcmV0T2Zmc2V0KGVsZW0sIDEpIGlzIHRydWUKK1BBU1MgYWNjVGV4dCBpcyAiQVhWYWx1ZTpi ZWZvcmUsc2l4IgorUEFTUyBzZXRDYXJldE9mZnNldChlbGVtLCAxKSBpcyB0cnVlCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGV4dC1pbi1zcGFuLWJsb2NrLWluLWEt YmxvY2suaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS90ZXh0LWluLXNwYW4tYmxvY2staW4tYS1ibG9jay5odG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGV4dC1pbi1zcGFuLWJs b2NrLWluLWEtYmxvY2suaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDkzIEBACis8IURP Q1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFk PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2F0ay1oZWxwZXJzLmpzIj48L3NjcmlwdD4K KzwvaGVhZD4KKworPGJvZHk+CisKKzwhLS0gU3VzcGVjdGVkICJhIiBlbGVtZW50IGluIHNldmVy YWwgZGlmZmVyZW50IGNvbmZpZ3VyYXRpb25zLiAtLT4KKworPGRpdj4KKyAgPGEgaWQ9ImlkMSIg aHJlZj0ieCIgc3R5bGU9ImRpc3BsYXk6YmxvY2s7Ij4KKyAgICA8c3BhbiBzdHlsZT0iZGlzcGxh eTpibG9jazsiPm9uZTwvc3Bhbj4KKyAgPC9hPgorPC9kaXY+CisKKzxkaXY+CisgIDxkaXY+YmVm b3JlPC9kaXY+CisgIDxhIGlkPSJpZDIiIGhyZWY9IngiIHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+ CisgICAgPHNwYW4gc3R5bGU9ImRpc3BsYXk6YmxvY2s7Ij50d288L3NwYW4+CisgIDwvYT4KKzwv ZGl2PgorCis8YSBpZD0iaWQzIiBocmVmPSJ4IiBzdHlsZT0iZGlzcGxheTpibG9jazsiPjxzcGFu IHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+dGhyZWU8L3NwYW4+PC9hPgorCis8ZGl2PgorICA8YSBp ZD0iaWQ0IiBocmVmPSJ4IiBzdHlsZT0iZGlzcGxheTpibG9jazsiPgorICAgIGJlZm9yZSwKKyAg ICA8c3BhbiBzdHlsZT0iZGlzcGxheTpibG9jazsiPmZvdXI8L3NwYW4+CisgICAgLGFmdGVyCisg IDwvYT4KKzwvZGl2PgorCis8ZGl2PgorICA8ZGl2PmJlZm9yZTwvZGl2PgorICA8YSBpZD0iaWQ1 IiBocmVmPSJ4IiBzdHlsZT0iZGlzcGxheTpibG9jazsiPjxzcGFuIHN0eWxlPSJkaXNwbGF5OmJs b2NrOyI+Zml2ZTwvc3Bhbj4KKyAgICAsYWZ0ZXIKKyAgPC9hPgorPC9kaXY+CisKKzxhIGlkPSJp ZDYiIGhyZWY9IngiIHN0eWxlPSJkaXNwbGF5OmJsb2NrOyI+YmVmb3JlLDxzcGFuIHN0eWxlPSJk aXNwbGF5OmJsb2NrOyI+c2l4PC9zcGFuPjwvYT4KKworPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+ CisKKzxzY3JpcHQ+Cit2YXIgY2FyZXRNb3ZlZERhdGE7CisKK2Z1bmN0aW9uIHN0cmlwTm9uV2hp dGUocykKK3sKKyAgICB2YXIgczIgPSAiIjsKKyAgICB2YXIgaTsKKyAgICBmb3IoaSA9IDA7IGkg PCBzLmxlbmd0aDsgaSsrKQorICAgICAgICBpZiAoc1tpXSAhPSAnICcgJiYgc1tpXSAhPSAnXG4n KQorICAgICAgICAgICAgczIgKz0gc1tpXTsKKyAgICByZXR1cm4gczIucmVwbGFjZSgvPFxcbj4v ZywgIiIpOworfQorCitmdW5jdGlvbiBnbG9iYWxMaXN0ZW5lcihvYmplY3QsIG5hbWUsIG9mZnNl dCkKK3sKKyAgICB2YXIgcm9sZSA9IG9iamVjdC5yb2xlLnJlcGxhY2UoJ0FYUm9sZTogQVgnLCAn Jyk7CisgICAgaWYgKG5hbWUgPT0gJ0FYVGV4dENhcmV0TW92ZWQnKSB7CisgICAgICAgIGNhcmV0 TW92ZWREYXRhICs9IHJvbGUgKyAnfCcgKyBvZmZzZXQ7CisgICAgfQorfQorCitpZiAod2luZG93 LnRlc3RSdW5uZXIpIHsKKyAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0 RW5hYmxlQ2FyZXRCcm93c2luZyIsIHRydWUpOworICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgp OworfQorCitpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgdmFyIGks IGxpbmtUZXh0LCBhY2NUZXh0LCBpZDsKKyAgICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hZGRO b3RpZmljYXRpb25MaXN0ZW5lcihnbG9iYWxMaXN0ZW5lcikKKyAgICBmb3IgKGkgPSAxOyBpIDw9 IDY7IGkrKykgeworICAgICAgICBpZCA9ICdpZCcgKyBpOworICAgICAgICBlbGVtID0gYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKGlkKTsKKyAgICAgICAgbGlu a1RleHQgPSBzdHJpcE5vbldoaXRlKGRvY3VtZW50LmxpbmtzW2lkXS50ZXh0Q29udGVudCk7Cisg ICAgICAgIGFjY1RleHQgPSBzdHJpcE5vbldoaXRlKGVsZW0uc3RyaW5nVmFsdWUpOworICAgICAg ICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImFjY1RleHQiLCAiQVhWYWx1ZToiICsgbGlua1RleHQp OworICAgICAgICBjYXJldE1vdmVkRGF0YSA9ICcnOworICAgICAgICBzaG91bGRCZSgic2V0Q2Fy ZXRPZmZzZXQoZWxlbSwgMSkiLCAidHJ1ZSIpOworICAgICAgICAvLyBGSVhNRTogVGhpcyBsaW5l IHdpbGwgYmUgYWRkZWQgYWZ0ZXIgZml4aW5nIGJ1ZyAjMTMwOTQxLgorICAgICAgICAvL3Nob3Vs ZEJlRXF1YWxUb1N0cmluZygiY2FyZXRNb3ZlZERhdGEiLCAiTGlua3wxIik7CisgICAgfQorfQor CitkZXNjcmlwdGlvbignVGhpcyB0ZXN0cyB0aGF0IHRleHQgaW5zaWRlICJhIiBibG9jayBpbnNp ZGUgInNwYW4iIGJsb2NrIGlzIGFjY2Vzc2libGUuJyk7CisKKzwvc2NyaXB0PgorPHNjcmlwdCBz cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5NjU1KQorKysgU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDYt MDggIEphcmVrIEN6ZWthbHNraSAgPGphcmVrY3pla0Bwb2N6dGEub25ldC5wbD4KKworICAgICAg ICBbQVRLXSBGaXggdGV4dCBpbnNpZGUgInNwYW4iIGJsb2NrIGluICJhIiBibG9jayB3YXMgbm90 IGFjY2Vzc2libGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzIzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcDog QWRkIGxpbmsgcm9sZQorICAgICAgICAgIHRvIHRoZSBsaXN0IG9mIHJvbGVzIHdob3NlIG9iamVj dHMgYWx3YXlzIGV4cG9zZSBhdGtfdGV4dCBpbnRlcmZhY2UuCisKIDIwMTQtMDYtMDYgIERhbiBC ZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJDb3JlIHBhcnQgb2YgPHJk YXI6Ly9wcm9ibGVtLzE3MDk1NjkyPiBbaU9TXSBDbGllbnQtY2VydGlmaWNhdGUgYXV0aGVudGlj YXRpb24gaXNu4oCZdCB3b3JraW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3Bw CShyZXZpc2lvbiAxNjk2NTUpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9X ZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMjMsNyAr MTEyMyw4IEBACiAKIHN0YXRpYyBib29sIHJvbGVJc1RleHRUeXBlKEFjY2Vzc2liaWxpdHlSb2xl IHJvbGUpCiB7Ci0gICAgcmV0dXJuIHJvbGUgPT0gUGFyYWdyYXBoUm9sZSB8fCByb2xlID09IEhl YWRpbmdSb2xlIHx8IHJvbGUgPT0gRGl2Um9sZSB8fCByb2xlID09IENlbGxSb2xlIHx8IHJvbGUg PT0gTGlzdEl0ZW1Sb2xlOworICAgIHJldHVybiByb2xlID09IFBhcmFncmFwaFJvbGUgfHwgcm9s ZSA9PSBIZWFkaW5nUm9sZSB8fCByb2xlID09IERpdlJvbGUgfHwgcm9sZSA9PSBDZWxsUm9sZQor ICAgICAgICB8fCByb2xlID09IExpbmtSb2xlIHx8IHJvbGUgPT0gV2ViQ29yZUxpbmtSb2xlIHx8 IHJvbGUgPT0gTGlzdEl0ZW1Sb2xlOwogfQogCiBzdGF0aWMgZ3VpbnQxNiBnZXRJbnRlcmZhY2VN YXNrRnJvbU9iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0KQo=