157219 2016-04-29 17:50:24 -0700 AX: @aria-label attribute should work on <label> element 2016-04-30 11:06:21 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 n_wang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario n_wang samuel_white webkit-bug-importer oldest_to_newest 1188916 0 n_wang 2016-04-29 17:50:24 -0700 In case: <label for="txtBox1" aria-label="Enter date in format MM/DD/YY">Date:</label> <input id="txtBox1" /> I would expect the value specified in the aria-label attribute to supersede the actual value of the label. I.e. I would expect VoiceOver to announce "Enter date in format MM/DD/YY". Instead the base value is announced ("Date"). <rdar://problem/15199588> 1188920 1 277769 n_wang 2016-04-29 17:57:33 -0700 Created attachment 277769 initial patch 1188924 2 277769 cfleizach 2016-04-29 18:03:22 -0700 Comment on attachment 277769 initial patch View in context: https://bugs.webkit.org/attachment.cgi?id=277769&action=review > Source/WebCore/accessibility/AccessibilityNodeObject.cpp:1269 > + // If there's aria-label on the label, we should use it instead. this comment seems unnecessary, since its self evident from the code > Source/WebCore/accessibility/AccessibilityNodeObject.cpp:1270 > + const AtomicString& labelStr = labelObject->getAttribute(aria_labelAttr); const AtomicString& ariaLabel > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:1075 > + // otherwise its inner text will be announced by screenreader. announced by "a" screenrea 1189028 3 277799 n_wang 2016-04-30 00:14:53 -0700 Created attachment 277799 patch applied review comments 1189080 4 277799 commit-queue 2016-04-30 11:06:16 -0700 Comment on attachment 277799 patch Clearing flags on attachment: 277799 Committed r200290: <http://trac.webkit.org/changeset/200290> 1189081 5 commit-queue 2016-04-30 11:06:21 -0700 All reviewed patches have been landed. Closing bug. 277769 2016-04-29 17:57:33 -0700 2016-04-30 00:14:53 -0700 initial patch patch.txt text/plain 6027 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDI3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA0LTI5ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEBhcmlhLWxhYmVsIGF0dHJpYnV0 ZSBzaG91bGQgd29yayBvbiA8bGFiZWw+IGVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlcmUncyBhcmlhLWxhYmVsIG9uIGEgPGxh YmVsPiBlbGVtZW50LCB3ZSBzaG91bGRuJ3QgZXhwb3NlIGl0CisgICAgICAgIGFzIHRoZSB0aXRs ZVVJRWxlbWVudC4gSW5zdGVhZCwgd2UgcmV0dXJuIGl0cyBhcmlhLWxhYmVsIGFzIGEgdGl0bGUu CisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1l bGVtZW50Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRp dGxlRWxlbWVudFRleHQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjpleHBvc2VzVGl0bGVVSUVsZW1lbnQpOgorCiAyMDE2LTA0LTI5ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTm9kZS5ub2RlTmFtZSBzaG91bGQgbm90IGJl IG51bGxhYmxlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAkocmV2aXNpb24gMjAwMjYzKQorKysgU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEyNjUsNiArMTI2NSwxMiBAQCB2b2lkIEFjY2Vzc2liaWxpdHlOb2Rl T2JqZWN0Ojp0aXRsZUVsZW1lCiAgICAgICAgIGlmIChIVE1MTGFiZWxFbGVtZW50KiBsYWJlbCA9 IGxhYmVsRm9yRWxlbWVudChkb3duY2FzdDxFbGVtZW50Pihub2RlKSkpIHsKICAgICAgICAgICAg IEFjY2Vzc2liaWxpdHlPYmplY3QqIGxhYmVsT2JqZWN0ID0gYXhPYmplY3RDYWNoZSgpLT5nZXRP ckNyZWF0ZShsYWJlbCk7CiAgICAgICAgICAgICBTdHJpbmcgaW5uZXJUZXh0ID0gbGFiZWwtPmlu bmVyVGV4dCgpOworICAgICAgICAgICAgCisgICAgICAgICAgICAvLyBJZiB0aGVyZSdzIGFyaWEt bGFiZWwgb24gdGhlIGxhYmVsLCB3ZSBzaG91bGQgdXNlIGl0IGluc3RlYWQuCisgICAgICAgICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIGxhYmVsU3RyID0gbGFiZWxPYmplY3QtPmdldEF0dHJpYnV0 ZShhcmlhX2xhYmVsQXR0cik7CisgICAgICAgICAgICBpZiAoIWxhYmVsU3RyLmlzRW1wdHkoKSkK KyAgICAgICAgICAgICAgICBpbm5lclRleHQgPSBsYWJlbFN0cjsKKyAgICAgICAgICAgIAogICAg ICAgICAgICAgLy8gT25seSB1c2UgdGhlIDxsYWJlbD4gdGV4dCBpZiB0aGVyZSdzIG5vIEFSSUEg b3ZlcnJpZGUuCiAgICAgICAgICAgICBpZiAoIWlubmVyVGV4dC5pc0VtcHR5KCkgJiYgIWFyaWFB Y2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSkKICAgICAgICAgICAgICAgICB0ZXh0T3JkZXIuYXBw ZW5kKEFjY2Vzc2liaWxpdHlUZXh0KGlubmVyVGV4dCwgTGFiZWxCeUVsZW1lbnRUZXh0LCBsYWJl bE9iamVjdCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiAyMDAyNjMpCisr KyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcxLDYgKzEwNzEsMTUgQEAgYm9vbCBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjpleHBvc2VzVAogICAgIGlmIChoYXNUZXh0QWx0ZXJuYXRpdmUoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAorICAgIC8vIFdoZW4gPGxhYmVsPiBlbGVtZW50 IGhhcyBhcmlhLWxhYmVsIG9uIGl0LCB3ZSBzaG91bGRuJ3QgZXhwb3NlIGl0IGFzIHRoZSB0aXRs ZVVJRWxlbWVudCwKKyAgICAvLyBvdGhlcndpc2UgaXRzIGlubmVyIHRleHQgd2lsbCBiZSBhbm5v dW5jZWQgYnkgc2NyZWVucmVhZGVyLgorICAgIGlmIChpczxIVE1MSW5wdXRFbGVtZW50PigqdGhp cy0+bm9kZSgpKSB8fCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc0FSSUFJbnB1dChhcmlhUm9sZUF0 dHJpYnV0ZSgpKSkgeworICAgICAgICBpZiAoSFRNTExhYmVsRWxlbWVudCogbGFiZWwgPSBsYWJl bEZvckVsZW1lbnQoZG93bmNhc3Q8RWxlbWVudD4obm9kZSgpKSkpIHsKKyAgICAgICAgICAgIGlm ICghbGFiZWwtPmZhc3RHZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpLmlzRW1wdHkoKSkKKyAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgCiAgICAg cmV0dXJuIHRydWU7CiB9CiAgICAgCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDAyNjMpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNi0w NC0yOSAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBAYXJpYS1s YWJlbCBhdHRyaWJ1dGUgc2hvdWxkIHdvcmsgb24gPGxhYmVsPiBlbGVtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTcyMTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFj L2FyaWEtbGFiZWwtb24tbGFiZWwtZWxlbWVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvbWFjL2FyaWEtbGFiZWwtb24tbGFiZWwtZWxlbWVudC5odG1sOiBB ZGRlZC4KKwogMjAxNi0wNC0yOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu Y29tPgogCiAgICAgICAgIFtSVEwgU2Nyb2xsYmFyc10gUkVHUkVTU0lPTihyMjAwMTE2KTogUG9z aXRpb25lZCBjb250ZW50cyBjYW4gb3ZlcmxhcCBSVEwgc2Nyb2xsYmFycwpJbmRleDogTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50LWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlh LWxhYmVsLW9uLWxhYmVsLWVsZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50LWV4 cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEzIEBACitTb21lIHRleHQgIFNv bWUgb3RoZXIgdGV4dCAKK1RoaXMgdGVzdHMgdGhhdCB0aGUgYXJpYS1sYWJlbCBhdHRyaWJ1dGUg d29ya3Mgb24gZWxlbWVudC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mg IXRpdGxlVUlFbGVtZW50MSBpcyB0cnVlCitQQVNTIGlucHV0MS50aXRsZSBpcyAnQVhUaXRsZTog YXJpYSBsYWJlbCcKK1BBU1MgdGl0bGVVSUVsZW1lbnQyLmlzRXF1YWwoYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCdsYWJlbDInKSkgaXMgdHJ1ZQorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtbGFiZWwtb24tbGFiZWwtZWxlbWVudC5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtbGFiZWwt b24tbGFiZWwtZWxlbWVudC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50Lmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQg SFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMv anMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8 bGFiZWwgZm9yPSJpbnB1dCIgYXJpYS1sYWJlbD0iYXJpYSBsYWJlbCI+U29tZSB0ZXh0PC9sYWJl bD4KKzxpbnB1dCBpZD0iaW5wdXQiIHR5cGU9InRleHQiIHNpemU9MjA+CisKKzxsYWJlbCBpZD0i bGFiZWwyIiBmb3I9ImlucHV0MiI+U29tZSBvdGhlciB0ZXh0PC9sYWJlbD4KKzxpbnB1dCBpZD0i aW5wdXQyIiB0eXBlPSJ0ZXh0IiBzaXplPTIwPgorCis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4K KzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24o IlRoaXMgdGVzdHMgdGhhdCB0aGUgYXJpYS1sYWJlbCBhdHRyaWJ1dGUgd29ya3Mgb24gPGxhYmVs PiBlbGVtZW50LiIpOworCisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikg eworICAgIAorICAgICAgICAvLyBhcmlhLWxhYmVsIG9uIHRoZSA8bGFiZWw+IGVsZW1lbnQgcmV0 dXJuIGEgdGl0bGUgZm9yIHRoZSBpbnB1dCwgaW5zdGVhZCBvZiBhIHRpdGxlIHVpIGVsZW1lbnQu CisgICAgICAgIHZhciBpbnB1dDEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxl RWxlbWVudEJ5SWQoImlucHV0Iik7CisgICAgICAgIHZhciB0aXRsZVVJRWxlbWVudDEgPSBpbnB1 dDEudGl0bGVVSUVsZW1lbnQoKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCIhdGl0bGVVSUVsZW1l bnQxIik7CisgICAgICAgIHNob3VsZEJlKCJpbnB1dDEudGl0bGUiLCAiJ0FYVGl0bGU6IGFyaWEg bGFiZWwnIik7CisgICAgICAgIAorICAgICAgICAvLyBOb3JtYWwgY2FzZS4KKyAgICAgICAgdmFy IGlucHV0MiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgi aW5wdXQyIik7CisgICAgICAgIHZhciB0aXRsZVVJRWxlbWVudDIgPSBpbnB1dDIudGl0bGVVSUVs ZW1lbnQoKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCJ0aXRsZVVJRWxlbWVudDIuaXNFcXVhbChh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ2xhYmVsMicpKSIp OworICAgIH0KKworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 277799 2016-04-30 00:14:53 -0700 2016-04-30 11:06:16 -0700 patch patch.txt text/plain 5961 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDI4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA0LTMwICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEBhcmlhLWxhYmVsIGF0dHJpYnV0 ZSBzaG91bGQgd29yayBvbiA8bGFiZWw+IGVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlcmUncyBhcmlhLWxhYmVsIG9uIGEgPGxh YmVsPiBlbGVtZW50LCB3ZSBzaG91bGRuJ3QgZXhwb3NlIGl0CisgICAgICAgIGFzIHRoZSB0aXRs ZVVJRWxlbWVudC4gSW5zdGVhZCwgd2UgcmV0dXJuIGl0cyBhcmlhLWxhYmVsIGFzIGEgdGl0bGUu CisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1l bGVtZW50Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRp dGxlRWxlbWVudFRleHQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjpleHBvc2VzVGl0bGVVSUVsZW1lbnQpOgorCiAyMDE2LTA0LTI5ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBJRExdIFNwZWNpZnkgZGVmYXVsdCBw YXJhbWV0ZXIgdmFsdWVzIGZvciBjYWxsYmFjayBwYXJhbWV0ZXJzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 LmNwcAkocmV2aXNpb24gMjAwMjg5KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNjUsNiArMTI2 NSwxMSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0aXRsZUVsZW1lCiAgICAgICAg IGlmIChIVE1MTGFiZWxFbGVtZW50KiBsYWJlbCA9IGxhYmVsRm9yRWxlbWVudChkb3duY2FzdDxF bGVtZW50Pihub2RlKSkpIHsKICAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGxhYmVs T2JqZWN0ID0gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShsYWJlbCk7CiAgICAgICAgICAg ICBTdHJpbmcgaW5uZXJUZXh0ID0gbGFiZWwtPmlubmVyVGV4dCgpOworICAgICAgICAgICAgCisg ICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGFyaWFMYWJlbCA9IGxhYmVsT2JqZWN0LT5n ZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpOworICAgICAgICAgICAgaWYgKCFhcmlhTGFiZWwu aXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIGlubmVyVGV4dCA9IGFyaWFMYWJlbDsKKyAgICAg ICAgICAgIAogICAgICAgICAgICAgLy8gT25seSB1c2UgdGhlIDxsYWJlbD4gdGV4dCBpZiB0aGVy ZSdzIG5vIEFSSUEgb3ZlcnJpZGUuCiAgICAgICAgICAgICBpZiAoIWlubmVyVGV4dC5pc0VtcHR5 KCkgJiYgIWFyaWFBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSkKICAgICAgICAgICAgICAgICB0 ZXh0T3JkZXIuYXBwZW5kKEFjY2Vzc2liaWxpdHlUZXh0KGlubmVyVGV4dCwgTGFiZWxCeUVsZW1l bnRUZXh0LCBsYWJlbE9iamVjdCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lv biAyMDAyODkpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcxLDYgKzEwNzEsMTUgQEAgYm9v bCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpleHBvc2VzVAogICAgIGlmIChoYXNUZXh0QWx0 ZXJuYXRpdmUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAorICAgIC8vIFdoZW4gPGxh YmVsPiBlbGVtZW50IGhhcyBhcmlhLWxhYmVsIG9uIGl0LCB3ZSBzaG91bGRuJ3QgZXhwb3NlIGl0 IGFzIHRoZSB0aXRsZVVJRWxlbWVudCwKKyAgICAvLyBvdGhlcndpc2UgaXRzIGlubmVyIHRleHQg d2lsbCBiZSBhbm5vdW5jZWQgYnkgYSBzY3JlZW5yZWFkZXIuCisgICAgaWYgKGlzPEhUTUxJbnB1 dEVsZW1lbnQ+KCp0aGlzLT5ub2RlKCkpIHx8IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzQVJJQUlu cHV0KGFyaWFSb2xlQXR0cmlidXRlKCkpKSB7CisgICAgICAgIGlmIChIVE1MTGFiZWxFbGVtZW50 KiBsYWJlbCA9IGxhYmVsRm9yRWxlbWVudChkb3duY2FzdDxFbGVtZW50Pihub2RlKCkpKSkgewor ICAgICAgICAgICAgaWYgKCFsYWJlbC0+ZmFzdEdldEF0dHJpYnV0ZShhcmlhX2xhYmVsQXR0ciku aXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAg IH0KKyAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKSW5kZXg6IExheW91dFRlc3RzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIw MDI4OSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDE2LTA0LTMwICBOYW4gV2FuZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAg ICAgQVg6IEBhcmlhLWxhYmVsIGF0dHJpYnV0ZSBzaG91bGQgd29yayBvbiA8bGFiZWw+IGVsZW1l bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzIx OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50LWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1l bGVtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDE2LTA0LTI5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJlbmFtZSBnZXRBc3NpZ25lZE5vZGVzIHRvIGFzc2lnbmVk Tm9kZXMgYW5kIHN1cHBvcnQgZmxhdHRlbmVkIG9wdGlvbgpJbmRleDogTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50LWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWxhYmVsLW9u LWxhYmVsLWVsZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50LWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEzIEBACitTb21lIHRleHQgIFNvbWUgb3RoZXIg dGV4dCAKK1RoaXMgdGVzdHMgdGhhdCB0aGUgYXJpYS1sYWJlbCBhdHRyaWJ1dGUgd29ya3Mgb24g ZWxlbWVudC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBt ZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgIXRpdGxlVUlF bGVtZW50MSBpcyB0cnVlCitQQVNTIGlucHV0MS50aXRsZSBpcyAnQVhUaXRsZTogYXJpYSBsYWJl bCcKK1BBU1MgdGl0bGVVSUVsZW1lbnQyLmlzRXF1YWwoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu YWNjZXNzaWJsZUVsZW1lbnRCeUlkKCdsYWJlbDInKSkgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVs bHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvbWFjL2FyaWEtbGFiZWwtb24tbGFiZWwtZWxlbWVudC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtbGFiZWwtb24tbGFiZWwt ZWxlbWVudC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvYXJpYS1sYWJlbC1vbi1sYWJlbC1lbGVtZW50Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwzOSBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4i PgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8bGFiZWwgZm9y PSJpbnB1dCIgYXJpYS1sYWJlbD0iYXJpYSBsYWJlbCI+U29tZSB0ZXh0PC9sYWJlbD4KKzxpbnB1 dCBpZD0iaW5wdXQiIHR5cGU9InRleHQiIHNpemU9MjA+CisKKzxsYWJlbCBpZD0ibGFiZWwyIiBm b3I9ImlucHV0MiI+U29tZSBvdGhlciB0ZXh0PC9sYWJlbD4KKzxpbnB1dCBpZD0iaW5wdXQyIiB0 eXBlPSJ0ZXh0IiBzaXplPTIwPgorCis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9 ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVz dHMgdGhhdCB0aGUgYXJpYS1sYWJlbCBhdHRyaWJ1dGUgd29ya3Mgb24gPGxhYmVsPiBlbGVtZW50 LiIpOworCisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgIAor ICAgICAgICAvLyBhcmlhLWxhYmVsIG9uIHRoZSA8bGFiZWw+IGVsZW1lbnQgcmV0dXJuIGEgdGl0 bGUgZm9yIHRoZSBpbnB1dCwgaW5zdGVhZCBvZiBhIHRpdGxlIHVpIGVsZW1lbnQuCisgICAgICAg IHZhciBpbnB1dDEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5 SWQoImlucHV0Iik7CisgICAgICAgIHZhciB0aXRsZVVJRWxlbWVudDEgPSBpbnB1dDEudGl0bGVV SUVsZW1lbnQoKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCIhdGl0bGVVSUVsZW1lbnQxIik7Cisg ICAgICAgIHNob3VsZEJlKCJpbnB1dDEudGl0bGUiLCAiJ0FYVGl0bGU6IGFyaWEgbGFiZWwnIik7 CisgICAgICAgIAorICAgICAgICAvLyBOb3JtYWwgY2FzZS4KKyAgICAgICAgdmFyIGlucHV0MiA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaW5wdXQyIik7 CisgICAgICAgIHZhciB0aXRsZVVJRWxlbWVudDIgPSBpbnB1dDIudGl0bGVVSUVsZW1lbnQoKTsK KyAgICAgICAgc2hvdWxkQmVUcnVlKCJ0aXRsZVVJRWxlbWVudDIuaXNFcXVhbChhY2Nlc3NpYmls aXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ2xhYmVsMicpKSIpOworICAgIH0K KworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K