126914 2014-01-13 10:03:32 -0800 AX: Do not return an accessible name for an object just because it has tabindex=0 2014-01-22 17:57:39 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 967380 0 cfleizach 2014-01-13 10:03:32 -0800 When VoiceOver encounters a <div> that has tabindex=0 on it, it speaks all the text under that div. That's because we're concatenating all the text under an element that is focusable. There's nothing in ARIA that allows for this and it has caused endless problems for VoiceOver speaking way too much useless information. I think we should undo this change which isn't supported by any spec. <rdar://problem/13603051> 967383 1 221059 cfleizach 2014-01-13 10:08:34 -0800 Created attachment 221059 patch 968655 2 221059 mario 2014-01-16 01:55:31 -0800 Comment on attachment 221059 patch View in context: https://bugs.webkit.org/attachment.cgi?id=221059&action=review The patch looks good to me, although I don't understand why you are getting that undefined expectation for one test. Also, I think we might potentially have to adapt the ATK port after this change, but I'm happy to give it a try now and adapt later so VO is not blocked on theories :) Setting the r+ anyway, but please take a look to the issue with the FAIL expectation before landing > LayoutTests/accessibility/focusable-div-expected.txt:17 > -PASS lastChar(axDiv.title) is "B" > +FAIL lastChar(axDiv.title) should be undefined (of type undefined). Was (of type string). This FAIL expectation looks wrong. Not sure why this is happening, though (why is "" undefined?) > LayoutTests/accessibility/focusable-div-expected.txt:19 > +FAIL lastChar(axDiv2.title) should be undefined (of type undefined). Was (of type string). Same here 970961 3 cfleizach 2014-01-22 17:57:39 -0800 http://trac.webkit.org/changeset/162576 221059 2014-01-13 10:08:34 -0800 2014-01-16 01:55:31 -0800 patch patch text/plain 10067 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTg4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAxLTEzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IERvIG5vdCByZXR1 cm4gYW4gYWNjZXNzaWJsZSBuYW1lIGZvciBhbiBvYmplY3QganVzdCBiZWNhdXNlIGl0IGhhcyB0 YWJpbmRleD0wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjY5MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWJLaXQgaGFzIGNvZGUgdG8gcmV0dXJuIGFuIGFjY2Vzc2libGUgbmFtZSBmb3IgYW55IG9i amVjdCB0aGF0IGlzICJnZW5lcmljYWxseSIgZm9jdXNhYmxlIChpZS4gdGFiaW5kZXg9MCkuCisg ICAgICAgIFRoaXMgYmVoYXZpb3IsIHdoaWNoIGlzIG5vdCBzdXBwb3J0ZWQgaW4gQVJJQSwgaGFz IGNhdXNlZCBtYW55IHByb2JsZW1zIGZvciBWb2ljZU92ZXIuIE9mdGVuIFZvaWNlT3ZlciB3aWxs CisgICAgICAgIHNwZWFrIGFsbCB0aGUgdGV4dCB1bmRlcm5lYXRoIGFueSB0eXBlIG9mIGdyb3Vw LgorCisgICAgICAgIEkgdGhpbmsgd2UgbmVlZCB0byByZXZlcnQgdGhpcyBiZWhhdmlvciBhbmQg Zm9sbG93IHRoZSBBUklBIHNwZWMgbW9yZSBjbG9zZWx5LgorCisgICAgICAgIFRlc3Q6IGFjY2Vz c2liaWxpdHkvYXJpYS1kZXNjcmliZWRieS1lbnN1cmVzLXZpc2liaWxpdHkuaHRtbAorCisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dmlzaWJsZVRleHQpOgorICAgICAg ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRpdGxlKToKKwogMjAxNC0wMS0x MyAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQnVpbGQg Rml4OiBjb3B5IGlPUy1zcGVjaWZpYyBnZW5lcmF0ZWQgaGVhZGVycwpJbmRleDogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVj dC5jcHAJKHJldmlzaW9uIDE2MTY3MykKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYxLDExICsx MzYxLDYgQEAKICAgICAvLyB0aGUgdXNlciBhcyBhIHNpbmdsZSBhdG9taWMgb2JqZWN0LCBzbyB3 ZSBzaG91bGQgdXNlIGl0cyB0ZXh0IGFzIHRoZSBkZWZhdWx0IHRpdGxlLgogICAgIGlmIChpc0hl YWRpbmcoKSB8fCBpc0xpbmsoKSkKICAgICAgICAgdXNlVGV4dFVuZGVyRWxlbWVudCA9IHRydWU7 Ci0gICAgZWxzZSBpZiAoaXNHZW5lcmljRm9jdXNhYmxlRWxlbWVudCgpKSB7Ci0gICAgICAgIC8v IElmIGEgbm9kZSB1c2VzIGEgbmVnYXRpdmUgdGFiaW5kZXgsIGRvIG5vdCBleHBvc2UgaXQgYXMg YSBnZW5lcmljIGZvY3VzYWJsZSBlbGVtZW50LCBiZWNhdXNlIGtleWJvYXJkIGZvY3VzIG1hbmFn ZW1lbnQKLSAgICAgICAgLy8gd2lsbCBuZXZlciBsYW5kIG9uIHRoaXMgc3BlY2lmaWMgZWxlbWVu dC4KLSAgICAgICAgdXNlVGV4dFVuZGVyRWxlbWVudCA9ICEobm9kZSAmJiBub2RlLT5pc0VsZW1l bnROb2RlKCkgJiYgdG9FbGVtZW50KG5vZGUpLT50YWJJbmRleCgpIDwgMCk7Ci0gICAgfQogICAg IAogICAgIGlmICh1c2VUZXh0VW5kZXJFbGVtZW50KSB7CiAgICAgICAgIEFjY2Vzc2liaWxpdHlU ZXh0VW5kZXJFbGVtZW50TW9kZSBtb2RlOwpAQCAtMTc0MSwxOCArMTczNiw2IEBACiAgICAgaWYg KGlzSGVhZGluZygpKQogICAgICAgICByZXR1cm4gdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmls aXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2Rl OjpUZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4sIHRydWUpKTsKIAotICAg IC8vIElmIGl0J3MgZm9jdXNhYmxlIGJ1dCBpdCdzIG5vdCBjb250ZW50IGVkaXRhYmxlIG9yIGEg a25vd24gY29udHJvbCB0eXBlLCB0aGVuIGl0IHdpbGwgYXBwZWFyIHRvCi0gICAgLy8gdGhlIHVz ZXIgYXMgYSBzaW5nbGUgYXRvbWljIG9iamVjdCwgc28gd2Ugc2hvdWxkIHVzZSBpdHMgdGV4dCBh cyB0aGUgZGVmYXVsdCB0aXRsZS4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKLSAgICBp ZiAoaXNHZW5lcmljRm9jdXNhYmxlRWxlbWVudCgpKSB7Ci0gICAgICAgIC8vIElmIGEgbm9kZSB1 c2VzIGEgbmVnYXRpdmUgdGFiaW5kZXgsIGRvIG5vdCBleHBvc2UgaXQgYXMgYSBnZW5lcmljIGZv Y3VzYWJsZSBlbGVtZW50LCBiZWNhdXNlIGtleWJvYXJkIGZvY3VzIG1hbmFnZW1lbnQKLSAgICAg ICAgLy8gd2lsbCBuZXZlciBsYW5kIG9uIHRoaXMgc3BlY2lmaWMgZWxlbWVudC4KLSAgICAgICAg Tm9kZSogbm9kZSA9IHRoaXMtPm5vZGUoKTsKLSAgICAgICAgaWYgKG5vZGUgJiYgbm9kZS0+aXNF bGVtZW50Tm9kZSgpICYmIHRvRWxlbWVudChub2RlKS0+dGFiSW5kZXgoKSA8IDApCi0gICAgICAg ICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAgICAgIAotICAgICAgICByZXR1cm4gdGV4dFVuZGVy RWxlbWVudCgpOwotICAgIH0KLQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIApJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gMTYxODg2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDEtMTMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNo QGFwcGxlLmNvbT4KKworICAgICAgICBBWDogV2ViS2l0IGNvbmNhdGVuYXRlcyBuYW1lIG9mIGFs bCB0b29sYmFyIGJ1dHRvbnMgaW4gdGhlIGFwcGxlLmNvbSB2aWRlbyBwbGF5ZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjkxNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9h cmlhLWRlc2NyaWJlZGJ5LWVuc3VyZXMtdmlzaWJpbGl0eS1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXJpYS1kZXNjcmliZWRieS1lbnN1cmVzLXZpc2liaWxp dHkuaHRtbDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9mb2N1c2FibGUtZGl2LWV4 cGVjdGVkLnR4dDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2ZvY3VzYWJsZS1kaXYuaHRtbDoK KwogMjAxNC0wMS0xMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgTUFDIGdhcmRlbmluZy4gUmViYXNlbGluaW5nIGFmdGVyIHN1YnBpeGVsIGxh eW91dCBpcyBlbmFibGVkIChyMTYxODgyKS4KSW5kZXg6IExheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvYXJpYS1kZXNjcmliZWRieS1lbnN1cmVzLXZpc2liaWxpdHktZXhwZWN0ZWQudHh0Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1kZXNjcmliZWRieS1lbnN1 cmVzLXZpc2liaWxpdHktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9hcmlhLWRlc2NyaWJlZGJ5LWVuc3VyZXMtdmlzaWJpbGl0eS1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMCBAQAorVGhpcyB0ZXN0cyB0aGF0IGlm IGFyaWEtZGVzY3JpYmVkYnkgaXMgcHJlc2VudCwgdGhlbiBhbiBlbGVtZW50IHRoYXQgd291bGQg b3RoZXJ3aXNlIGJlIGlnbm9yZWQgaXMgc2hvd24uCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF Ii4KKworCitJTUcgcm9sZTogQVhSb2xlOiBBWEltYWdlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hcmlhLWRlc2NyaWJlZGJ5LWVuc3VyZXMtdmlzaWJpbGl0eS5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1kZXNjcmliZWRieS1lbnN1cmVzLXZp c2liaWxpdHkuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv YXJpYS1kZXNjcmliZWRieS1lbnN1cmVzLXZpc2liaWxpdHkuaHRtbAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1M Ly9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0 LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzxkaXYgaWQ9 InRvQmVIaWRkZW4iPgorICAgIDxpbWcgc3JjPSJmb28uanBnIiBpZD0idGVzdCIgYXJpYS1kZXNj cmliZWRieT0idDEiPgorICAgIDxkaXYgaWQ9InQxIiByb2xlPSJwcmVzZW50YXRpb24iPgorICAg ICAgICBmb28KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4K KzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24o IlRoaXMgdGVzdHMgdGhhdCBpZiBhcmlhLWRlc2NyaWJlZGJ5IGlzIHByZXNlbnQsIHRoZW4gYW4g ZWxlbWVudCB0aGF0IHdvdWxkIG90aGVyd2lzZSBiZSBpZ25vcmVkIGlzIHNob3duLiIpOworCisg ICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworCisgICAgICAgIHZhciBp bWcgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRlc3Qi KTsKKyAgICAgICAgZGVidWcoIklNRyByb2xlOiAiICsgaW1nLnJvbGUpOworICAgIH0KKworICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0b0JlSGlkZGVuJykuaGlkZGVuID0gdHJ1ZTsgLy8g aGlkZSB0aGlzIHRvIGF2b2lkIHRleHQgZGlmZnMgd2hlbiBhZGRpbmcgbW9yZSBlbGVtZW50cyB0 byB0aGUgdGVzdAorCis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10 ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9mb2N1c2FibGUtZGl2LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2ZvY3VzYWJsZS1kaXYtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAxNjE2NzMpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2ZvY3VzYWJsZS1k aXYtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC02LDcgKzYsNyBAQAogTGlzdCBpdGVt CiBJbml0aWFsIHRleHQgYmVmb3JlIGxpc3QKIExpc3QgaXRlbQotVGhpcyB0ZXN0IG1ha2VzIHN1 cmUgdGhhdCBhIGdlbmVyaWMgZm9jdXNhYmxlIGRpdiBjYW4gZ2V0IGFjY2Vzc2liaWxpdHkgZm9j dXMgYW5kIGdldHMgaXRzIGFjY2Vzc2libGUgdGV4dCBmcm9tIGNvbnRlbnRzLi4KK1RoaXMgdGVz dCBtYWtlcyBzdXJlIHRoYXQgYSBnZW5lcmljIGZvY3VzYWJsZSBkaXYgY2FuIGdldCBhY2Nlc3Np YmlsaXR5IGZvY3VzLiBJdCBzaG91bGQgbm90IGdldCBhY2Nlc3NpYmxlIHRleHQgZnJvbSBpdHMg Y2hpbGRyZW4gYXV0b21hdGljYWxseSB0aG91Z2guCiAKIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF Ii4KIApAQCAtMTQsMjEgKzE0LDIxIEBACiBQQVNTIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQgPT0g bGluayBpcyB0cnVlCiBQQVNTIGxhc3RDaGFyKGF4TGluay50aXRsZSkgaXMgIkEiCiBQQVNTIGRv Y3VtZW50LmFjdGl2ZUVsZW1lbnQgPT0gZGl2IGlzIHRydWUKLVBBU1MgbGFzdENoYXIoYXhEaXYu dGl0bGUpIGlzICJCIgorRkFJTCBsYXN0Q2hhcihheERpdi50aXRsZSkgc2hvdWxkIGJlIHVuZGVm aW5lZCAob2YgdHlwZSB1bmRlZmluZWQpLiBXYXMgICAob2YgdHlwZSBzdHJpbmcpLgogUEFTUyBk b2N1bWVudC5hY3RpdmVFbGVtZW50ID09IGRpdjIgaXMgdHJ1ZQotUEFTUyBsYXN0Q2hhcihheERp djIudGl0bGUpIGlzICJDIgorRkFJTCBsYXN0Q2hhcihheERpdjIudGl0bGUpIHNob3VsZCBiZSB1 bmRlZmluZWQgKG9mIHR5cGUgdW5kZWZpbmVkKS4gV2FzICAgKG9mIHR5cGUgc3RyaW5nKS4KIFBB U1MgZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9PSBkaXYzIGlzIHRydWUKIFBBU1MgbGFzdENoYXIo YXhEaXYzLmRlc2NyaXB0aW9uKSBpcyAiRCIKIFBBU1MgZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9 PSBkaXY0IGlzIHRydWUKIFBBU1MgYXhEaXY0LnRpdGxlLmluZGV4T2YoJ0xpbmsnKSBpcyAtMQog UEFTUyBkb2N1bWVudC5hY3RpdmVFbGVtZW50ID09IGRpdjUgaXMgdHJ1ZQogUEFTUyBheERpdjUu dGl0bGUuaW5kZXhPZignTGluaycpIGlzIC0xCi1QQVNTIGF4RGl2NS50aXRsZS5pbmRleE9mKCdJ bml0aWFsIHRleHQgYmVmb3JlIGxpbmsnKSA+PSAwIGlzIHRydWUKK1BBU1MgYXhEaXY1LnRpdGxl LmluZGV4T2YoJ0luaXRpYWwgdGV4dCBiZWZvcmUgbGluaycpID49IDAgaXMgZmFsc2UKIFBBU1Mg ZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9PSBkaXY2IGlzIHRydWUKIFBBU1MgYXhEaXY2LnRpdGxl LmluZGV4T2YoJ0xpc3QgaXRlbScpIGlzIC0xCiBQQVNTIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQg PT0gZGl2NyBpcyB0cnVlCiBQQVNTIGF4RGl2Ny50aXRsZS5pbmRleE9mKCdMaXN0IGl0ZW0nKSBp cyAtMQotUEFTUyBheERpdjcudGl0bGUuaW5kZXhPZignSW5pdGlhbCB0ZXh0IGJlZm9yZSBsaXN0 JykgPj0gMCBpcyB0cnVlCitQQVNTIGF4RGl2Ny50aXRsZS5pbmRleE9mKCdJbml0aWFsIHRleHQg YmVmb3JlIGxpc3QnKSA+PSAwIGlzIGZhbHNlCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCiAKIFRFU1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZm9j dXNhYmxlLWRpdi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv Zm9jdXNhYmxlLWRpdi5odG1sCShyZXZpc2lvbiAxNjE2NzMpCisrKyBMYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2ZvY3VzYWJsZS1kaXYuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNiw3ICs2LDcg QEAKIDwhLS0gQSBsaW5rIGFsd2F5cyBnZXRzIGl0cyBhY2Nlc3NpYmxlIHRleHQgZnJvbSBjb250 ZW50cy4gLS0+CiA8YSBpZD0ibGluayIgaHJlZj0iIyI+QTwvYT4KIAotPCEtLSBBIGdlbmVyaWMg Zm9jdXNhYmxlIGRpdiBzaG91bGQgYWxzbyBnZXQgaXRzIGFjY2Vzc2libGUgdGV4dCBmcm9tIGNv bnRlbnRzLiAtLT4KKzwhLS0gQSBnZW5lcmljIGZvY3VzYWJsZSBkaXYgc2hvdWxkIG5vdCBnZXQg aXRzIGFjY2Vzc2libGUgdGV4dCBmcm9tIGNvbnRlbnRzLiAtLT4KIDxkaXYgaWQ9ImRpdiIgdGFi aW5kZXg9IjAiPkI8L2Rpdj4KIDxkaXYgaWQ9ImRpdjIiIHRhYmluZGV4PSIwIj48ZGl2PjwvZGl2 PkM8L2Rpdj4KIDxkaXYgaWQ9ImRpdjMiIHRhYmluZGV4PSIwIiBhcmlhLWxhYmVsPSJEIj48L2Rp dj4KQEAgLTE5LDcgKzE5LDcgQEAKIAogPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CiA8c2NyaXB0 PgotZGVzY3JpcHRpb24oIlRoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgYSBnZW5lcmljIGZvY3Vz YWJsZSBkaXYgY2FuIGdldCBhY2Nlc3NpYmlsaXR5IGZvY3VzIGFuZCBnZXRzIGl0cyBhY2Nlc3Np YmxlIHRleHQgZnJvbSBjb250ZW50cy4uIik7CitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0IG1ha2Vz IHN1cmUgdGhhdCBhIGdlbmVyaWMgZm9jdXNhYmxlIGRpdiBjYW4gZ2V0IGFjY2Vzc2liaWxpdHkg Zm9jdXMuIEl0IHNob3VsZCBub3QgZ2V0IGFjY2Vzc2libGUgdGV4dCBmcm9tIGl0cyBjaGlsZHJl biBhdXRvbWF0aWNhbGx5IHRob3VnaC4iKTsKIAogaWYgKHdpbmRvdy50ZXN0UnVubmVyICYmIHdp bmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewogICAgIHdpbmRvdy50ZXN0UnVubmVyLmR1 bXBBc1RleHQoKTsKQEAgLTM4LDEzICszOCwxMyBAQAogICAgIGRpdi5mb2N1cygpOwogICAgIHNo b3VsZEJlKCJkb2N1bWVudC5hY3RpdmVFbGVtZW50ID09IGRpdiIsICJ0cnVlIik7CiAgICAgd2lu ZG93LmF4RGl2ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7Ci0gICAg c2hvdWxkQmUoImxhc3RDaGFyKGF4RGl2LnRpdGxlKSIsICJcIkJcIiIpOworICAgIHNob3VsZEJl KCJsYXN0Q2hhcihheERpdi50aXRsZSkiLCAiIik7CiAKICAgICB2YXIgZGl2MiA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdkaXYyJyk7CiAgICAgZGl2Mi5mb2N1cygpOwogICAgIHNob3VsZEJl KCJkb2N1bWVudC5hY3RpdmVFbGVtZW50ID09IGRpdjIiLCAidHJ1ZSIpOwogICAgIHdpbmRvdy5h eERpdjIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKLSAgICBzaG91 bGRCZSgibGFzdENoYXIoYXhEaXYyLnRpdGxlKSIsICJcIkNcIiIpOworICAgIHNob3VsZEJlKCJs YXN0Q2hhcihheERpdjIudGl0bGUpIiwgIiIpOwogCiAgICAgdmFyIGRpdjMgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnZGl2MycpOwogICAgIGRpdjMuZm9jdXMoKTsKQEAgLTYzLDcgKzYzLDcg QEAKICAgICBzaG91bGRCZSgiZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9PSBkaXY1IiwgInRydWUi KTsKICAgICB3aW5kb3cuYXhEaXY1ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVs ZW1lbnQ7CiAgICAgc2hvdWxkQmUoImF4RGl2NS50aXRsZS5pbmRleE9mKCdMaW5rJykiLCAiLTEi KTsKLSAgICBzaG91bGRCZSgiYXhEaXY1LnRpdGxlLmluZGV4T2YoJ0luaXRpYWwgdGV4dCBiZWZv cmUgbGluaycpID49IDAiLCAidHJ1ZSIpOworICAgIHNob3VsZEJlKCJheERpdjUudGl0bGUuaW5k ZXhPZignSW5pdGlhbCB0ZXh0IGJlZm9yZSBsaW5rJykgPj0gMCIsICJmYWxzZSIpOwogCiAgICAg dmFyIGRpdjYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2NicpOwogICAgIGRpdjYuZm9j dXMoKTsKQEAgLTc2LDcgKzc2LDcgQEAKICAgICBzaG91bGRCZSgiZG9jdW1lbnQuYWN0aXZlRWxl bWVudCA9PSBkaXY3IiwgInRydWUiKTsKICAgICB3aW5kb3cuYXhEaXY3ID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CiAgICAgc2hvdWxkQmUoImF4RGl2Ny50aXRsZS5p bmRleE9mKCdMaXN0IGl0ZW0nKSIsICItMSIpOwotICAgIHNob3VsZEJlKCJheERpdjcudGl0bGUu aW5kZXhPZignSW5pdGlhbCB0ZXh0IGJlZm9yZSBsaXN0JykgPj0gMCIsICJ0cnVlIik7CisgICAg c2hvdWxkQmUoImF4RGl2Ny50aXRsZS5pbmRleE9mKCdJbml0aWFsIHRleHQgYmVmb3JlIGxpc3Qn KSA+PSAwIiwgImZhbHNlIik7CiB9CiAKIDwvc2NyaXB0Pgo=