69736 2011-10-09 20:59:41 -0700 Wrapped <label> elements aren't reported by screen readers 2012-01-08 22:06:14 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboxhall aboxhall cfleizach dmazzoni dtseng mike rniwa webmaster oldest_to_newest 480806 0 aboxhall 2011-10-09 20:59:41 -0700 See http://www.html5accessibility.com/tests/form-labels.html. 480825 1 110326 aboxhall 2011-10-09 21:58:32 -0700 Created attachment 110326 Patch 480851 2 110326 cfleizach 2011-10-10 00:11:32 -0700 Comment on attachment 110326 Patch Changing <label> to be static text will cause all elements inside the <label> to be lost. Thus <label>label<input></label> will not report the <input> as an element, which will be a regression. I just tested that website with VoiceOver on Lion, and it seems that VoiceOver reads all of the labels for the input fields. What is motivating this change? 480853 3 cfleizach 2011-10-10 00:14:59 -0700 Note I did see that on test 7, VO repeated the label twice. I filed a VoiceOVer bug for that (rdar://10257905) 480982 4 dtseng 2011-10-10 09:57:46 -0700 The issue on Snow Leopard (haven't tried it on Lion) (on test cases 3 and greater): • VO-cmd-j to the edit field result: voiceover reads "edit text" expected: voiceover reads "label wrapped edit text" We suspect that the root cause is because the title UI element is a parent of the text field being labeled. If VoiceOver follows alll references to title UI elements, this would cause a cycle (so perhaps VO ignores this case)? reproduces on both Chrome and WebKit r97062 480984 5 cfleizach 2011-10-10 10:01:49 -0700 (In reply to comment #4) > The issue on Snow Leopard (haven't tried it on Lion) (on test cases 3 and greater): > • VO-cmd-j to the edit field > > result: > voiceover reads "edit text" > > expected: voiceover reads "label wrapped edit text" > > We suspect that the root cause is because the title UI element is a parent of the text field being labeled. If VoiceOver follows alll references to title UI elements, this would cause a cycle (so perhaps VO ignores this case)? > > reproduces on both Chrome and WebKit r97062 This was a VoiceOver bug. Fixed in Lion. 481217 6 aboxhall 2011-10-10 15:21:30 -0700 Ah, ok. 531145 7 rniwa 2012-01-06 10:25:49 -0800 Is this bug fixed for Lion? Can we close it then? Does WebKit pass all test cases on http://www.html5accessibility.com/tests/form-labels.html now? 531943 8 aboxhall 2012-01-08 20:35:56 -0800 (In reply to comment #7) > Is this bug fixed for Lion? Can we close it then? Does WebKit pass all test cases on http://www.html5accessibility.com/tests/form-labels.html now? Yes, with the exception of the duplication mentioned by Chris. 110326 2011-10-09 21:58:32 -0700 2011-10-10 00:11:32 -0700 Patch bug-69736-20111010155830.patch text/plain 12178 aboxhall U3VidmVyc2lvbiBSZXZpc2lvbjogOTY4NjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2OTM0NTIxOGJkNDBiYzNhMTgyOTQ0 NmRhY2RmMTA1MDBmMzgzNmM5Li40OTk2NTFmNjkwZTliMzQ3MDhiNjIxNTFlYjM5NWYwNzdhMGMw YTBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMDkgIEFsaWNlIEJveGhhbGwgIDxh Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV3JhcHBlZCA8bGFiZWw+IGVsZW1lbnRz IGFyZW4ndCByZXBvcnRlZCBieSBzY3JlZW4gcmVhZGVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk3MzYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xh YmVsLWVsZW1lbnQtd2l0aC1oaWRkZW4tY29udHJvbC1leHBlY3RlZC50eHQ6CisgICAgICAgICog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGFiZWwtZWxlbWVudC13aXRoLWhpZGRlbi1jb250 cm9sLmh0bWw6CisgICAgICAgIE1vZGlmaWVkIHRvIHJlZmxlY3QgdGhlIHJvbGUgZm9yIGEgbGFi ZWwgZWxlbWVudCBiZWluZyBjaGFuZ2VkIHRvIFN0YXRpY1RleHQuCisgICAgICAgICogcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvbGFiZWwtd3JhcHBlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xhYmVsLXdyYXBwZWQuaHRtbDog QWRkZWQuCisKIDIwMTEtMTAtMDYgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBDcmFzaCBpbiBWaXNpYmxlUG9zaXRpb246OmNhbm9uaWNhbFBvc2l0aW9u LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGFi ZWwtZWxlbWVudC13aXRoLWhpZGRlbi1jb250cm9sLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xhYmVsLWVsZW1lbnQtd2l0aC1oaWRkZW4tY29u dHJvbC1leHBlY3RlZC50eHQKaW5kZXggZjQ2MDViNDRkOGU5ZTIyNDAwZWNmNTljODFjOGM4N2Zh YjhhNzQxOS4uNmNiZmNiMDQ0N2Q3MTc3YWQ4ZjFjNzhhYThlNjFhMjNjOTUxYzJjMiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGFiZWwtZWxlbWVu dC13aXRoLWhpZGRlbi1jb250cm9sLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9sYWJlbC1lbGVtZW50LXdpdGgtaGlkZGVuLWNvbnRyb2wt ZXhwZWN0ZWQudHh0CkBAIC00LDcgKzQsNyBAQCBUaGlzIHRlc3RzIHRoYXQgaWYgYSBsYWJlbCBl bGVtZW50IHJlZmVyZW5jZXMgYSBoaWRkZW4gY29udHJvbCwgaXQgaXMgc3RpbGwgdmlzaQogT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgogCiAKLVBBU1MgY29udGFpbmVyLmNoaWxkQXRJbmRleCgn MCcpLnJvbGUgaXMgJ0FYUm9sZTogQVhHcm91cCcKK1BBU1MgY29udGFpbmVyLmNoaWxkQXRJbmRl eCgnMCcpLnJvbGUgaXMgJ0FYUm9sZTogQVhTdGF0aWNUZXh0JwogUEFTUyBjb250YWluZXIuY2hp bGRBdEluZGV4KCcwJykuY2hpbGRBdEluZGV4KDApLnJvbGUgaXMgJ0FYUm9sZTogQVhTdGF0aWNU ZXh0JwogUEFTUyBjb250YWluZXIuY2hpbGRBdEluZGV4KCcwJykuY2hpbGRBdEluZGV4KDApLnN0 cmluZ1ZhbHVlIGlzICdBWFZhbHVlOiBUZXN0IGxhYmVsMScKIFBBU1MgY29udGFpbmVyLmNoaWxk QXRJbmRleCgnMScpLnJvbGUgaXMgJ0FYUm9sZTogQVhDaGVja0JveCcKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xhYmVsLWVsZW1lbnQtd2l0aC1o aWRkZW4tY29udHJvbC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxp dHkvbGFiZWwtZWxlbWVudC13aXRoLWhpZGRlbi1jb250cm9sLmh0bWwKaW5kZXggNWQ3Y2Y4Y2Zm MDcwZWQ4MzcxOWNmMGYzZTk1NDBmZmIxMDk4NTM3ZS4uMTIzMjRmMTUzZjRlZjE0MDlkOGEyZmFm YTMzMmVkM2VjOGM0ZGE1MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj Y2Vzc2liaWxpdHkvbGFiZWwtZWxlbWVudC13aXRoLWhpZGRlbi1jb250cm9sLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGFiZWwtZWxlbWVudC13aXRo LWhpZGRlbi1jb250cm9sLmh0bWwKQEAgLTI1LDcgKzI1LDcgQEAgdmFyIHN1Y2Nlc3NmdWxseVBh cnNlZCA9IGZhbHNlOwogICAgICAgICAgICAgdmFyIGJvZHkgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiYm9keSIpOwogICAgICAgICAgICAgYm9keS5mb2N1cygpOwogICAgICAgICAgICAgdmFy IGNvbnRhaW5lciA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmNoaWxk QXRJbmRleCgwKTsKLSAgICAgICAgICAgIHNob3VsZEJlKCJjb250YWluZXIuY2hpbGRBdEluZGV4 KCcwJykucm9sZSIsICInQVhSb2xlOiBBWEdyb3VwJyIpOyAgICAgICAgICAgIAorICAgICAgICAg ICAgc2hvdWxkQmUoImNvbnRhaW5lci5jaGlsZEF0SW5kZXgoJzAnKS5yb2xlIiwgIidBWFJvbGU6 IEFYU3RhdGljVGV4dCciKTsgICAgICAgICAgICAKICAgICAgICAgICAgIHNob3VsZEJlKCJjb250 YWluZXIuY2hpbGRBdEluZGV4KCcwJykuY2hpbGRBdEluZGV4KDApLnJvbGUiLCAiJ0FYUm9sZTog QVhTdGF0aWNUZXh0JyIpOyAgICAgICAgICAgIAogICAgICAgICAgICAgc2hvdWxkQmUoImNvbnRh aW5lci5jaGlsZEF0SW5kZXgoJzAnKS5jaGlsZEF0SW5kZXgoMCkuc3RyaW5nVmFsdWUiLCAiJ0FY VmFsdWU6IFRlc3QgbGFiZWwxJyIpOyAgICAgICAgICAgIAogICAgICAgICAgICAgc2hvdWxkQmUo ImNvbnRhaW5lci5jaGlsZEF0SW5kZXgoJzEnKS5yb2xlIiwgIidBWFJvbGU6IEFYQ2hlY2tCb3gn Iik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9s YWJlbC13cmFwcGVkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nl c3NpYmlsaXR5L2xhYmVsLXdyYXBwZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRkNDU4NTZi YjA2MTIwMjk4OTc4NzA1M2RhMmRhYTI2NjA1MTI3NTcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9sYWJlbC13cmFwcGVkLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDMwIEBACitsYWJlbCB3cmFwcGVkCisKK2xhYmVsIHdyYXBwZWQgYW5k IGZvci9pZAorCitsYWJlbCB3cmFwcGVkIHdpdGggdGV4dCBiZWZvcmUgYW5kIGFmdGVyIGlucHV0 CisKK2xhYmVsIHdyYXBwZWQgYW5kIGZvci9pZCB3aXRoIHRleHQgYmVmb3JlIGFuZCBhZnRlciBp bnB1dAorCitsYWJlbCB3cmFwcGVkIGFuZCBhcmlhLWxhYmVsbGVkYnkKKworVGhpcyB0ZXN0cyB0 aGF0IHRoZSBjb3JyZWN0IGFjY2Vzc2libGUgbGFiZWwgaW5mb3JtYXRpb24gaXMgZ2l2ZW4gZm9y IGVsZW1lbnRzIHdpdGggd3JhcHBlZCBsYWJlbHMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF Ii4KKworCitQQVNTOiB0aXRsZVVJRWxlbWVudC5yb2xlIGZvciBsYWJlbC13cmFwcGVkIGlzIFtB WFJvbGU6IEFYU3RhdGljVGV4dF0KK1BBU1M6IHRpdGxlVUlFbGVtZW50LnN0cmluZ1ZhbHVlIGZv ciBsYWJlbC13cmFwcGVkIGlzIFtBWFZhbHVlOiBsYWJlbCB3cmFwcGVkXQorUEFTUzogdGl0bGVV SUVsZW1lbnQucm9sZSBmb3IgbGFiZWwtd3JhcHBlZC1hbmQtZm9yLWlkIGlzIFtBWFJvbGU6IEFY U3RhdGljVGV4dF0KK1BBU1M6IHRpdGxlVUlFbGVtZW50LnN0cmluZ1ZhbHVlIGZvciBsYWJlbC13 cmFwcGVkLWFuZC1mb3ItaWQgaXMgW0FYVmFsdWU6IGxhYmVsIHdyYXBwZWQgYW5kIGZvci9pZF0K K1BBU1M6IHRpdGxlVUlFbGVtZW50LnJvbGUgZm9yIGxhYmVsLXdyYXBwZWQtYmVmb3JlLWFmdGVy IGlzIFtBWFJvbGU6IEFYU3RhdGljVGV4dF0KK1BBU1M6IHRpdGxlVUlFbGVtZW50LnN0cmluZ1Zh bHVlIGZvciBsYWJlbC13cmFwcGVkLWJlZm9yZS1hZnRlciBpcyBbQVhWYWx1ZTogbGFiZWwgd3Jh cHBlZCB3aXRoIHRleHQgYmVmb3JlIGFuZCBhZnRlciBpbnB1dF0KK1BBU1M6IHRpdGxlVUlFbGVt ZW50LnJvbGUgZm9yIGxhYmVsLXdyYXBwZWQtYW5kLWZvci1pZC1iZWZvcmUtYWZ0ZXIgaXMgW0FY Um9sZTogQVhTdGF0aWNUZXh0XQorUEFTUzogdGl0bGVVSUVsZW1lbnQuc3RyaW5nVmFsdWUgZm9y IGxhYmVsLXdyYXBwZWQtYW5kLWZvci1pZC1iZWZvcmUtYWZ0ZXIgaXMgW0FYVmFsdWU6IGxhYmVs IHdyYXBwZWQgYW5kIGZvci9pZCB3aXRoIHRleHQgYmVmb3JlIGFuZCBhZnRlciBpbnB1dF0KK1BB U1M6IHRpdGxlIGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVkYnkgaXMgW0FYVGl0 bGU6IGxhYmVsIHdyYXBwZWQgYW5kIGFyaWEtbGFiZWxsZWRieV0KK1BBU1M6IGRlc2NyaXB0aW9u IGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVkYnkgaXMgW0FYRGVzY3JpcHRpb246 IGxhYmVsIHdyYXBwZWQgYW5kIGFyaWEtbGFiZWxsZWRieV0KK1BBU1M6IHRpdGxlVUlFbGVtZW50 IGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVkYnkgaXMgW3VuZGVmaW5lZF0KK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9sYWJlbC13cmFwcGVk Lmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9sYWJlbC13cmFw cGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNmIyMzI2N2RjODM2NTdkNDkyMjU4OTkwYWEzODIzMDNiYzM1 MTRhNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np YmlsaXR5L2xhYmVsLXdyYXBwZWQuaHRtbApAQCAtMCwwICsxLDU5IEBACis8IURPQ1RZUEUgSFRN TCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsg cmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0 LXN0eWxlLmNzcyI+Cis8c2NyaXB0PgordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOwor PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVz dC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cD48bGFiZWw+bGFiZWwgd3Jh cHBlZDxpbnB1dCB0eXBlPSJ0ZXh0IiBpZD0ibGFiZWwtd3JhcHBlZCI+PC9sYWJlbD48L3A+Cis8 cD48bGFiZWwgZm9yPSJsYWJlbC13cmFwcGVkLWFuZC1mb3ItaWQiPmxhYmVsIHdyYXBwZWQgYW5k IGZvci9pZDxpbnB1dCB0eXBlPSJ0ZXh0IiBpZD0ibGFiZWwtd3JhcHBlZC1hbmQtZm9yLWlkIj48 L2xhYmVsPjwvcD4KKzxwPjxsYWJlbD5sYWJlbCB3cmFwcGVkPGlucHV0IHR5cGU9InRleHQiIGlk PSJsYWJlbC13cmFwcGVkLWJlZm9yZS1hZnRlciI+IHdpdGggdGV4dCBiZWZvcmUgYW5kIGFmdGVy IGlucHV0PC9sYWJlbD48L3A+Cis8cD48bGFiZWwgZm9yPSJsYWJlbC13cmFwcGVkLWFuZC1mb3It aWQtYmVmb3JlLWFmdGVyIj5sYWJlbCB3cmFwcGVkIGFuZCBmb3IvaWQ8aW5wdXQgdHlwZT0idGV4 dCIgaWQ9ImxhYmVsLXdyYXBwZWQtYW5kLWZvci1pZC1iZWZvcmUtYWZ0ZXIiPiB3aXRoIHRleHQg YmVmb3JlIGFuZCBhZnRlciBpbnB1dDwvbGFiZWw+PC9wPgorPHA+PGxhYmVsIGlkPSJsYWJlbC1m b3Itd3JhcHBlZC1hbmQtYXJpYS1sYWJlbGxlZGJ5Ij5sYWJlbCB3cmFwcGVkIGFuZCBhcmlhLWxh YmVsbGVkYnk8aW5wdXQgdHlwZT0idGV4dCIgYXJpYS1sYWJlbGxlZGJ5PSJsYWJlbC1mb3Itd3Jh cHBlZC1hbmQtYXJpYS1sYWJlbGxlZGJ5IiBpZD0ibGFiZWwtd3JhcHBlZC1hbmQtYXJpYS1sYWJl bGxlZGJ5Ij48L2xhYmVsPjwvcD4KKworPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlk PSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KKworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRl c3RzIHRoYXQgdGhlIGNvcnJlY3QgYWNjZXNzaWJsZSBsYWJlbCBpbmZvcm1hdGlvbiBpcyBnaXZl biBmb3IgZWxlbWVudHMgd2l0aCB3cmFwcGVkIGxhYmVscy4iKTsKKyAgICBpZiAod2luZG93LmFj Y2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIGZ1bmN0aW9uIGFzc2VydEVxdWFsKGV4 cGVjdGVkLCBhY3R1YWwsIHZhbHVlRGVzY3JpcHRpb24pIHsKKyAgICAgICAgICBpZiAoZXhwZWN0 ZWQgIT0gYWN0dWFsKQorICAgICAgICAgICAgZGVidWcoIkZBSUw6ICIgKyB2YWx1ZURlc2NyaXB0 aW9uICsgIiBzaG91bGQgYmUgWyIgKyBleHBlY3RlZCArICJdIGJ1dCB3YXMgWyIgKyBhY3R1YWwg KyAiXSIpOworICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRlYnVnKCJQQVNTOiAiICsgdmFs dWVEZXNjcmlwdGlvbiArICIgaXMgWyIgKyBhY3R1YWwgKyAiXSIpOworICAgICAgICB9CisKKyAg ICAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICAgICAg W3tpZDogImxhYmVsLXdyYXBwZWQiLCBleHBlY3RlZFN0cmluZ1ZhbHVlOiAibGFiZWwgd3JhcHBl ZCJ9LAorICAgICAgICAgICAgIHtpZDogImxhYmVsLXdyYXBwZWQtYW5kLWZvci1pZCIsIGV4cGVj dGVkU3RyaW5nVmFsdWU6ICJsYWJlbCB3cmFwcGVkIGFuZCBmb3IvaWQifSwKKyAgICAgICAgICAg ICB7aWQ6ICJsYWJlbC13cmFwcGVkLWJlZm9yZS1hZnRlciIsIGV4cGVjdGVkU3RyaW5nVmFsdWU6 ICJsYWJlbCB3cmFwcGVkIHdpdGggdGV4dCBiZWZvcmUgYW5kIGFmdGVyIGlucHV0In0sCisgICAg ICAgICAgICAge2lkOiAibGFiZWwtd3JhcHBlZC1hbmQtZm9yLWlkLWJlZm9yZS1hZnRlciIsIGV4 cGVjdGVkU3RyaW5nVmFsdWU6ICJsYWJlbCB3cmFwcGVkIGFuZCBmb3IvaWQgd2l0aCB0ZXh0IGJl Zm9yZSBhbmQgYWZ0ZXIgaW5wdXQifQorICAgICAgICAgICAgXS5mb3JFYWNoKGZ1bmN0aW9uKGRh dGEpIHsKKyAgICAgICAgICAgICAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKGRhdGEuaWQpOworICAgICAgICAgICAgICAgIGVsZW1lbnQuZm9jdXMoKTsKKyAgICAgICAg ICAgICAgICB2YXIgYXhPYmplY3QgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxl bWVudDsKKyAgICAgICAgICAgICAgICB2YXIgdGl0bGVVSUVsZW1lbnQgPSBheE9iamVjdC50aXRs ZVVJRWxlbWVudCgpOworICAgICAgICAgICAgICAgIGFzc2VydEVxdWFsKCJBWFJvbGU6IEFYU3Rh dGljVGV4dCIsIHRpdGxlVUlFbGVtZW50LnJvbGUsICJ0aXRsZVVJRWxlbWVudC5yb2xlIGZvciAi ICsgZGF0YS5pZCkKKyAgICAgICAgICAgICAgICBhc3NlcnRFcXVhbCgiQVhWYWx1ZTogIiArIGRh dGEuZXhwZWN0ZWRTdHJpbmdWYWx1ZSwgdGl0bGVVSUVsZW1lbnQuc3RyaW5nVmFsdWUsICJ0aXRs ZVVJRWxlbWVudC5zdHJpbmdWYWx1ZSBmb3IgIiArIGRhdGEuaWQpOworICAgICAgICAgICAgfSk7 CisKKyAgICAgICAgICAgIC8vIGFyaWEtbGFiZWxsZWRieSBvdmVycmlkZXMgd3JhcHBlZCBsYWJl bAorICAgICAgICAgICAgdmFyIGFyaWFMYWJlbGxlZGJ5RWxlbWVudCA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVkYnkiKTsKKyAgICAgICAg ICAgIGFyaWFMYWJlbGxlZGJ5RWxlbWVudC5mb2N1cygpOworICAgICAgICAgICAgYXhPYmplY3Qg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKKyAgICAgICAgICAgIGFz c2VydEVxdWFsKCJBWFRpdGxlOiBsYWJlbCB3cmFwcGVkIGFuZCBhcmlhLWxhYmVsbGVkYnkiLCBh eE9iamVjdC50aXRsZSwgInRpdGxlIGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVk YnkiKTsKKyAgICAgICAgICAgIGFzc2VydEVxdWFsKCJBWERlc2NyaXB0aW9uOiBsYWJlbCB3cmFw cGVkIGFuZCBhcmlhLWxhYmVsbGVkYnkiLCBheE9iamVjdC5kZXNjcmlwdGlvbiwgImRlc2NyaXB0 aW9uIGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxhYmVsbGVkYnkiKTsKKyAgICAgICAgICAg IGFzc2VydEVxdWFsKHVuZGVmaW5lZCwgYXhPYmplY3QudGl0bGVVSUVsZW1lbnQoKS5wbGF0Zm9y bVVJRWxlbWVudCwgInRpdGxlVUlFbGVtZW50IGZvciBsYWJlbC13cmFwcGVkLWFuZC1hcmlhLWxh YmVsbGVkYnkiKTsKKyAgICAgICAgfQorICAgIH0KKyAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0 cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNl cy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDAyMTgwZDEwYjFmZmJlZGFlNzllZTQxNDU4MGM3MDliMTczN2MyMjIuLjdkYThhOWM0MGNk OTMwMzFjMTNiYWQ4MmE3YTVjYTY1YThiM2YzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBA QAorMjAxMS0xMC0wOSAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXcmFwcGVkIDxsYWJlbD4gZWxlbWVudHMgYXJlbid0IHJlcG9ydGVkIGJ5IHNjcmVl biByZWFkZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02OTczNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xhYmVsLXdyYXBwZWQuaHRtbAorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnN0cmluZ1ZhbHVlKToK KyAgICAgICAgUmV0dXJuIHRleHQoKSBmb3IgYW4gZWxlbWVudCB3aXRoIHJvbGU9U3RhdGljVGV4 dCwgcmF0aGVyIHRoYW4gZW1wdHkgc3RyaW5nLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6dGV4dCk6CisgICAgICAgIFJldHVybiBpbm5lclRleHQgdmFsdWUg Zm9yIGFuIGVsZW1lbnQgd2l0aCByb2xlPVN0YXRpY1RleHQsIHJhdGhlciB0aGFuIGVtcHR5IHN0 cmluZy4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVy bWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKyAgICAgICAgUmVwcmVzZW50IGxhYmVsIGVsZW1lbnRz IGFzIFN0YXRpY1RleHQgcmF0aGVyIHRoYW4gR3JvdXAgcm9sZS4KKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNhbkhhdmVDaGlsZHJlbik6CisgICAgICAgIFN0 YXRpY1RleHQgY2FuIGhhdmUgY2hpbGRyZW4uCisKIDIwMTEtMTAtMDYgIEFiaGlzaGVrIEFyeWEg IDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDcmFzaCBpbiBWaXNpYmxlUG9zaXRp b246OmNhbm9uaWNhbFBvc2l0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggMDI0ZGE3ZGQ0 MzUzMjczMjk0MGZkNzE3NGRlYzQ5OGI0NmNhNWEzZS4uZDU0Yjg0YWFhMWYzOGNhYTRiNGRkZWVm NTk4ODVjMzQ4ZGYxMGQ2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0xMTgzLDYgKzExODMs OSBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c3RyaW5nVmFsdWUoKSBjb25z dAogICAgIGlmIChpc0ZpbGVVcGxvYWRCdXR0b24oKSkKICAgICAgICAgcmV0dXJuIHRvUmVuZGVy RmlsZVVwbG9hZENvbnRyb2wobV9yZW5kZXJlciktPmZpbGVUZXh0VmFsdWUoKTsKICAgICAKKyAg ICBpZiAobV9yb2xlID09IFN0YXRpY1RleHRSb2xlKQorICAgICAgICByZXR1cm4gdGV4dCgpOwor CiAgICAgLy8gRklYTUU6IFdlIG1pZ2h0IG5lZWQgdG8gaW1wbGVtZW50IGEgdmFsdWUgaGVyZSBm b3IgbW9yZSB0eXBlcwogICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBiZXR0ZXIgbm90IHRvIGFk dmVydGlzZSBhIHZhbHVlIGF0IGFsbCBmb3IgdGhlIHR5cGVzIGZvciB3aGljaCB3ZSBkb24ndCBp bXBsZW1lbnQgb25lOwogICAgIC8vIHRoaXMgd291bGQgcmVxdWlyZSBzdWJjbGFzc2luZyBvciBt YWtpbmcgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzIGRvIHNvbWV0aGluZyBvdGhlciB0aGFu IHJldHVybiBhCkBAIC0xOTY1LDkgKzE5NjgsNiBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6dGV4dCgpIGNvbnN0CiAgICAgaWYgKGFyaWFSb2xlQXR0cmlidXRlKCkgPT0gU3Rh dGljVGV4dFJvbGUpCiAgICAgICAgIHJldHVybiBhcmlhQWNjZXNzaWJpbGl0eURlc2NyaXB0aW9u KCk7CiAgICAgCi0gICAgaWYgKCFpc1RleHRDb250cm9sKCkgfHwgaXNQYXNzd29yZEZpZWxkKCkp Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQogICAgIE5vZGUqIG5vZGUgPSBtX3JlbmRlcmVy LT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CkBAIC0x OTc3LDggKzE5NzcsMTEgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHQo KSBjb25zdAogCiAgICAgaWYgKCFub2RlLT5pc0VsZW1lbnROb2RlKCkpCiAgICAgICAgIHJldHVy biBTdHJpbmcoKTsKLSAgICAKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUp LT5pbm5lclRleHQoKTsKKworICAgIGlmIChtX3JvbGUgPT0gU3RhdGljVGV4dFJvbGUgfHwgKGlz VGV4dENvbnRyb2woKSAmJiAhaXNQYXNzd29yZEZpZWxkKCkpKQorICAgICAgICByZXR1cm4gc3Rh dGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpLT5pbm5lclRleHQoKTsKKworICAgIHJldHVybiBTdHJp bmcoKTsKIH0KICAgICAKIGludCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0ZXh0TGVuZ3Ro KCkgY29uc3QKQEAgLTMyMTYsNyArMzIxOSw3IEBAIEFjY2Vzc2liaWxpdHlSb2xlIEFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKCkKICAgICAgICAg cmV0dXJuIEZvcm1Sb2xlOwogI2Vsc2UKICAgICBpZiAobm9kZSAmJiBub2RlLT5oYXNUYWdOYW1l KGxhYmVsVGFnKSkKLSAgICAgICAgcmV0dXJuIEdyb3VwUm9sZTsKKyAgICAgICAgcmV0dXJuIFN0 YXRpY1RleHRSb2xlOwogI2VuZGlmCiAKICAgICBpZiAobm9kZSAmJiBub2RlLT5oYXNUYWdOYW1l KGFydGljbGVUYWcpKQpAQCAtMzQ1OSw3ICszNDYyLDYgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0OjpjYW5IYXZlQ2hpbGRyZW4oKSBjb25zdAogICAgIGNhc2UgQ2hlY2tCb3hSb2xl OgogICAgIGNhc2UgUmFkaW9CdXR0b25Sb2xlOgogICAgIGNhc2UgVGFiUm9sZToKLSAgICBjYXNl IFN0YXRpY1RleHRSb2xlOgogICAgIGNhc2UgTGlzdEJveE9wdGlvblJvbGU6CiAgICAgY2FzZSBT Y3JvbGxCYXJSb2xlOgogICAgICAgICByZXR1cm4gZmFsc2U7Cg==