35514 2010-02-28 23:22:12 -0800 AX: changes to WAI-ARIA grid aren't perceived correctly by VoiceOver 2010-03-01 17:19:45 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 194632 0 cfleizach 2010-02-28 23:22:12 -0800 when a grid changes its DOM, and VoiceOver asks for an attribute like AXRows, the children are not updated 194635 1 49709 cfleizach 2010-03-01 00:03:01 -0800 Created attachment 49709 patch 194817 2 49709 darin 2010-03-01 14:11:32 -0800 Comment on attachment 49709 patch Seems to me that this idiom: if (needsToUpdateChildren()) clearChildren(); if (!hasChildren()) addChildren(); Should be in a helper function. It's not good to repeat it all those different places. Can we make the needsToUpdateChildren protected instead of public? 194818 3 cfleizach 2010-03-01 14:12:36 -0800 (In reply to comment #2) > (From update of attachment 49709 [details]) > Seems to me that this idiom: > > if (needsToUpdateChildren()) > clearChildren(); > > if (!hasChildren()) > addChildren(); > > Should be in a helper function. It's not good to repeat it all those different > places. > Will do > Can we make the needsToUpdateChildren protected instead of public? Yes, this patch makes it protected instead of private 194884 4 cfleizach 2010-03-01 17:19:45 -0800 http://trac.webkit.org/changeset/55390 49709 2010-03-01 00:03:01 -0800 2010-03-01 14:11:32 -0800 patch patch.txt text/plain 12194 cfleizach SW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuaAkocmV2aXNpb24gNTUwNDMpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTksNiArMjU5LDcgQEAK ICAgICAKICAgICB2b2lkIHNldFJlbmRlck9iamVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSB7 IG1fcmVuZGVyZXIgPSByZW5kZXJlcjsgfQogICAgIHZvaWQgYXJpYUxhYmVsZWRCeUVsZW1lbnRz KFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzKSBjb25zdDsKKyAgICBib29sIG5lZWRzVG9VcGRh dGVDaGlsZHJlbigpIGNvbnN0IHsgcmV0dXJuIG1fY2hpbGRyZW5EaXJ0eTsgfQogICAgIAogICAg IHZpcnR1YWwgYm9vbCBpc0RldGFjaGVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVuZGVyZXI7IH0K IApAQCAtMjk3LDcgKzI5OCw2IEBACiAgICAgdmlydHVhbCBib29sIGFyaWFMaXZlUmVnaW9uQnVz eSgpIGNvbnN0OyAgICAKICAgICAKICAgICB2b2lkIHNldE5lZWRzVG9VcGRhdGVDaGlsZHJlbigp IGNvbnN0IHsgbV9jaGlsZHJlbkRpcnR5ID0gdHJ1ZTsgfQotICAgIGJvb2wgbmVlZHNUb1VwZGF0 ZUNoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9jaGlsZHJlbkRpcnR5OyB9CiAgICAgCiAgICAg bXV0YWJsZSBBY2Nlc3NpYmlsaXR5Um9sZSBtX3JvbGVGb3JNU0FBOwogfTsKSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwCShyZXZpc2lvbiA1NTA0 MykKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xOTcsNiArMTk3LDcgQEAKICAgICBtX3Jvd3MuY2xlYXIoKTsKICAgICBt X2NvbHVtbnMuY2xlYXIoKTsKICAgICBtX2hhdmVDaGlsZHJlbiA9IGZhbHNlOworICAgIG1fY2hp bGRyZW5EaXJ0eSA9IGZhbHNlOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlUYWJsZTo6YWRkQ2hp bGRyZW4oKQpAQCAtMjg3LDYgKzI4OCw5IEBACiAKIEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vz c2liaWxpdHlDaGlsZHJlblZlY3RvciYgQWNjZXNzaWJpbGl0eVRhYmxlOjpjb2x1bW5zKCkKIHsK KyAgICBpZiAobmVlZHNUb1VwZGF0ZUNoaWxkcmVuKCkpCisgICAgICAgIGNsZWFyQ2hpbGRyZW4o KTsKKwogICAgIGlmICghaGFzQ2hpbGRyZW4oKSkKICAgICAgICAgYWRkQ2hpbGRyZW4oKTsKICAg ICAgICAgCkBAIC0yOTUsNiArMjk5LDkgQEAKIAogQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNz aWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBBY2Nlc3NpYmlsaXR5VGFibGU6OnJvd3MoKQogeworICAg IGlmIChuZWVkc1RvVXBkYXRlQ2hpbGRyZW4oKSkKKyAgICAgICAgY2xlYXJDaGlsZHJlbigpOwor CiAgICAgaWYgKCFoYXNDaGlsZHJlbigpKQogICAgICAgICBhZGRDaGlsZHJlbigpOwogCkBAIC0z MDYsNiArMzEzLDkgQEAKICAgICBpZiAoIW1fcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKICAg ICAKKyAgICBpZiAobmVlZHNUb1VwZGF0ZUNoaWxkcmVuKCkpCisgICAgICAgIGNsZWFyQ2hpbGRy ZW4oKTsKKwogICAgIGlmICghaGFzQ2hpbGRyZW4oKSkKICAgICAgICAgYWRkQ2hpbGRyZW4oKTsK ICAgICAKQEAgLTMyMyw2ICszMzMsOSBAQAogICAgIGlmICghbV9yZW5kZXJlcikKICAgICAgICAg cmV0dXJuOwogICAgIAorICAgIGlmIChuZWVkc1RvVXBkYXRlQ2hpbGRyZW4oKSkKKyAgICAgICAg Y2xlYXJDaGlsZHJlbigpOworCiAgICAgaWYgKCFoYXNDaGlsZHJlbigpKQogICAgICAgICBhZGRD aGlsZHJlbigpOwogICAgIApAQCAtMzQwLDYgKzM1Myw5IEBACiAgICAgaWYgKCFtX3JlbmRlcmVy KQogICAgICAgICByZXR1cm47CiAgICAgCisgICAgaWYgKG5lZWRzVG9VcGRhdGVDaGlsZHJlbigp KQorICAgICAgICBjbGVhckNoaWxkcmVuKCk7CisKICAgICBpZiAoIWhhc0NoaWxkcmVuKCkpCiAg ICAgICAgIGFkZENoaWxkcmVuKCk7CiAgICAgCkBAIC0zNTIsNiArMzY4LDkgQEAKICAgICAKIHVu c2lnbmVkIEFjY2Vzc2liaWxpdHlUYWJsZTo6Y29sdW1uQ291bnQoKQogeworICAgIGlmIChuZWVk c1RvVXBkYXRlQ2hpbGRyZW4oKSkKKyAgICAgICAgY2xlYXJDaGlsZHJlbigpOworCiAgICAgaWYg KCFoYXNDaGlsZHJlbigpKQogICAgICAgICBhZGRDaGlsZHJlbigpOwogICAgIApAQCAtMzYwLDYg KzM3OSw5IEBACiAgICAgCiB1bnNpZ25lZCBBY2Nlc3NpYmlsaXR5VGFibGU6OnJvd0NvdW50KCkK IHsKKyAgICBpZiAobmVlZHNUb1VwZGF0ZUNoaWxkcmVuKCkpCisgICAgICAgIGNsZWFyQ2hpbGRy ZW4oKTsKKwogICAgIGlmICghaGFzQ2hpbGRyZW4oKSkKICAgICAgICAgYWRkQ2hpbGRyZW4oKTsK ICAgICAKQEAgLTM3MSw2ICszOTMsOSBAQAogICAgIGlmICghbV9yZW5kZXJlciB8fCAhbV9yZW5k ZXJlci0+aXNUYWJsZSgpKQogICAgICAgICByZXR1cm4gMDsKICAgICAKKyAgICBpZiAobmVlZHNU b1VwZGF0ZUNoaWxkcmVuKCkpCisgICAgICAgIGNsZWFyQ2hpbGRyZW4oKTsKKwogICAgIGlmICgh aGFzQ2hpbGRyZW4oKSkKICAgICAgICAgYWRkQ2hpbGRyZW4oKTsKICAgICAKSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQuY3BwCShyZXZpc2lv biA1NTA0MykKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsNiArMTMxLDkgQEAKICAgICBpZiAoIW1fcmVuZGVy ZXIpCiAgICAgICAgIHJldHVybiAwOwogICAgIAorICAgIGlmIChuZWVkc1RvVXBkYXRlQ2hpbGRy ZW4oKSkKKyAgICAgICAgY2xlYXJDaGlsZHJlbigpOworCiAgICAgaWYgKCFoYXNDaGlsZHJlbigp KQogICAgICAgICBhZGRDaGlsZHJlbigpOwogICAgIApJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAJKHJldmlzaW9u IDU1MzYwKQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxl bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0Niw2ICs0NjAsMTYgQEAKICAgICByZXR1cm4g SlNWYWx1ZU1ha2VOdW1iZXIoY29udGV4dCwgdG9BWEVsZW1lbnQodGhpc09iamVjdCktPmNoaWxk cmVuQ291bnQoKSk7CiB9CiAKK3N0YXRpYyBKU1ZhbHVlUmVmIHJvd0NvdW50Q2FsbGJhY2soSlND b250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHBy b3BlcnR5TmFtZSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIHJldHVybiBKU1ZhbHVl TWFrZU51bWJlcihjb250ZXh0LCB0b0FYRWxlbWVudCh0aGlzT2JqZWN0KS0+cm93Q291bnQoKSk7 Cit9CisKK3N0YXRpYyBKU1ZhbHVlUmVmIGNvbHVtbkNvdW50Q2FsbGJhY2soSlNDb250ZXh0UmVm IGNvbnRleHQsIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFt ZSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIHJldHVybiBKU1ZhbHVlTWFrZU51bWJl cihjb250ZXh0LCB0b0FYRWxlbWVudCh0aGlzT2JqZWN0KS0+Y29sdW1uQ291bnQoKSk7Cit9CisK IHN0YXRpYyBKU1ZhbHVlUmVmIGdldFhDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNP YmplY3RSZWYgdGhpc09iamVjdCwgSlNTdHJpbmdSZWYgcHJvcGVydHlOYW1lLCBKU1ZhbHVlUmVm KiBleGNlcHRpb24pCiB7CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlTnVtYmVyKGNvbnRleHQsIHRv QVhFbGVtZW50KHRoaXNPYmplY3QpLT54KCkpOwpAQCAtNjM3LDYgKzY2Nyw4IEBACiAgICAgICAg IHsgIm1pblZhbHVlIiwgZ2V0TWluVmFsdWVDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1 dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7 ICJtYXhWYWx1ZSIsIGdldE1heFZhbHVlQ2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5QXR0cmlidXRl UmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAi Y2hpbGRyZW5Db3VudCIsIGdldENoaWxkcmVuQ291bnRDYWxsYmFjaywgMCwga0pTUHJvcGVydHlB dHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAorICAg ICAgICB7ICJyb3dDb3VudCIsIHJvd0NvdW50Q2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5QXR0cmli dXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKKyAgICAgICAg eyAiY29sdW1uQ291bnQiLCBjb2x1bW5Db3VudENhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJp YnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAg IHsgImluc2VydGlvblBvaW50TGluZU51bWJlciIsIGdldEluc2VydGlvblBvaW50TGluZU51bWJl ckNhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlB dHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgInNlbGVjdGVkVGV4dFJhbmdlIiwgZ2V0 U2VsZWN0ZWRUZXh0UmFuZ2VDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJpc0VuYWJs ZWQiLCBnZXRJc0VuYWJsZWRDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LApJbmRleDogV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvZ3RrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRHdGsuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50R3RrLmNwcAkocmV2aXNpb24gNTUzNjApCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1 LDYgKzc1LDE4IEBACiAgICAgfQogfQogCitpbnQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm93 Q291bnQoKQoreworICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQKKyAgICByZXR1cm4gMDsKK30KKwor aW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmNvbHVtbkNvdW50KCkKK3sKKyAgICAvLyBGSVhN RTogaW1wbGVtZW50CisgICAgcmV0dXJuIDA7Cit9CisKIGludCBBY2Nlc3NpYmlsaXR5VUlFbGVt ZW50OjpjaGlsZHJlbkNvdW50KCkKIHsKICAgICBpZiAoIW1fZWxlbWVudCkKSW5kZXg6IFdlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50TWFjLm1tCShyZXZpc2lvbiA1NTM2MCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBA IC02NzYsNiArNjc2LDE2IEBACiAgICAgcmV0dXJuIGRlc2NyaXB0aW9uT2ZFbGVtZW50cyhoZWFk ZXJWZWN0b3IpOwogfQogCitpbnQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm93Q291bnQoKQor eworICAgIHJldHVybiBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBcnJheUF0dHJpYnV0ZUNvdW50 Ok5TQWNjZXNzaWJpbGl0eVJvd3NBdHRyaWJ1dGVdOworfQorCitpbnQgQWNjZXNzaWJpbGl0eVVJ RWxlbWVudDo6Y29sdW1uQ291bnQoKQoreworICAgIHJldHVybiBbbV9lbGVtZW50IGFjY2Vzc2li aWxpdHlBcnJheUF0dHJpYnV0ZUNvdW50Ok5TQWNjZXNzaWJpbGl0eUNvbHVtbnNBdHRyaWJ1dGVd OworfQorCiBpbnQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aW5kZXhJblRhYmxlKCkKIHsKICAg ICBOU051bWJlciogaW5kZXhOdW1iZXIgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1 dGVWYWx1ZTpOU0FjY2Vzc2liaWxpdHlJbmRleEF0dHJpYnV0ZV07CkluZGV4OiBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oCShyZXZp c2lvbiA1NTM2MCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlV SUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTQzLDYgKzE0OSw4IEBACiAgICAgaW50IGlu ZGV4SW5UYWJsZSgpOwogICAgIEpTU3RyaW5nUmVmIHJvd0luZGV4UmFuZ2UoKTsKICAgICBKU1N0 cmluZ1JlZiBjb2x1bW5JbmRleFJhbmdlKCk7CisgICAgaW50IHJvd0NvdW50KCk7CisgICAgaW50 IGNvbHVtbkNvdW50KCk7CiAgICAgCiAgICAgLy8gVHJlZS9PdXRsaW5lIHNwZWNpZmljIGF0dHJp YnV0ZXMKICAgICBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50IHNlbGVjdGVkUm93QXRJbmRleCh1bnNp Z25lZCk7CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0 eVVJRWxlbWVudFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvd2luL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRXaW4uY3BwCShyZXZpc2lvbiA1NTM2MCkKKysr IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50V2lu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNiArODMsMTggQEAKICAgICByZXR1cm4gY2hpbGRD b3VudDsKIH0KIAoraW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnJvd0NvdW50KCkKK3sKKyAg ICAvLyBGSVhNRTogaW1wbGVtZW50CisgICAgcmV0dXJuIDA7Cit9CisgCitpbnQgQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6Y29sdW1uQ291bnQoKQoreworICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQK KyAgICByZXR1cm4gMDsKK30KKwogQWNjZXNzaWJpbGl0eVVJRWxlbWVudCBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50OjplbGVtZW50QXRQb2ludChpbnQgeCwgaW50IHkpCiB7CiAgICAgcmV0dXJuIDA7 CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCShyZXZpc2lvbiA1NTM2MCkKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEwLTAyLTI4ICBDaHJpcyBGbGVpemFjaCAg PGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1 NTE0CisgICAgICAgIEFYOiBjaGFuZ2VzIHRvIFdBSS1BUklBIGdyaWQgYXJlbid0IHBlcmNlaXZl ZCBjb3JyZWN0bHkgYnkgVm9pY2VPdmVyCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHJvd0Nv dW50LCBjb2x1bW5Db3VudC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnQuY3BwOgorICAgICAgICAocm93Q291bnRDYWxsYmFjayk6CisgICAgICAgIChj b2x1bW5Db3VudENhbGxiYWNrKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmls aXR5VUlFbGVtZW50Lmg6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnRHdGsuY3BwOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm93 Q291bnQpOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Y29sdW1uQ291bnQpOgor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1t OgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm93Q291bnQpOgorICAgICAgICAo QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Y29sdW1uQ291bnQpOgorICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL3dpbi9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50V2luLmNwcDoKKyAgICAgICAgKEFjY2Vz c2liaWxpdHlVSUVsZW1lbnQ6OnJvd0NvdW50KToKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQ6OmNvbHVtbkNvdW50KToKKwogMjAxMC0wMi0yOCAgQ2hyaXMgSmVyZG9uZWsgIDxjamVy ZG9uZWtAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFq aS4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3N0YWxlLXRh YmxlLXJvd3MtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L3N0YWxlLXRhYmxlLXJvd3MtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc3RhbGUtdGFi bGUtcm93cy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjAgQEAKK0EgQiBD Citmb28KK2JpcAorZm9vCitmb28KK2JhegorYmF6CitiYXIKK2JvcAorYmlwCitUaGlzIHRlc3Rz IHRoYXQgd2hlbiBhIHRhYmxlIGhhcyBpdHMgRE9NIGNoYW5nZWQsIGFsbCB0aGUgdGFibGUgbWV0 aG9kIHN0aWxsIHJldHVybiB0aGUgY29ycmVjdCBkYXRhLgorCitPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCisKKworUEFTUyBzdGFydGluZ1Jvd0luZGV4IGlzIGVuZGluZ1Jvd0luZGV4CitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc3RhbGUtdGFibGUtcm93cy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3N0 YWxlLXRhYmxlLXJvd3MuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L3N0YWxlLXRhYmxlLXJvd3MuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSw3OCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8v RU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4v Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBz dWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAKK3ZhciBjaG9pY2VzID0gWydmb28n LCAnYmFyJywgJ2JheicsICdiYWYnLCAnYm9wJywgJ2JpcCddOworICAgIAorZnVuY3Rpb24gJChp ZCl7CisgICByZXR1cm4gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpOworfQorZnVuY3Rpb24g bm9kZSh0YWdOYW1lLCByb2xlKXsKKyAgICB2YXIgZWwgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KHRhZ05hbWUpOworICAgIGVsLnNldEF0dHJpYnV0ZSgncm9sZScsIHJvbGUpOworICAgIHJldHVy biBlbDsKK30KKworZnVuY3Rpb24gcmFuZG9taXplKCl7CisgICAgdmFyIGQgPSAkKCdteURhdGEn KTsKKyAgICBkLmlubmVySFRNTCA9ICcnOyAvLyBjbGVhciBpdCBvdXQgZmlyc3QKKyAgICBmb3Ig KHZhciBpPTA7IGk8MzsgaSsrKXsKKyAgICAgICAgdmFyIHJvdyA9IG5vZGUoJ3RyJywgJ3Jvdycp OworICAgICAgICBkLmFwcGVuZENoaWxkKHJvdyk7CisgICAgICAgIGZvciAodmFyIGo9MDsgajwz OyBqKyspeworICAgICAgICAgICAgdmFyIGNlbGwgPSBub2RlKCd0cicsICdncmlkY2VsbCcpOwor ICAgICAgICAgICAgY2VsbC5pbm5lckhUTUwgPSBjaG9pY2VzW01hdGguZmxvb3IoTWF0aC5yYW5k b20oKSpjaG9pY2VzLmxlbmd0aCldOyAvLyBwb3B1bGF0ZSBjZWxsIHdpdGggYSByYW5kb20gZW50 cnkgZnJvbSAnY2hvaWNlcycgYXJyYXk6ICdmb28nLCAnYmFyJywgJ2JheicsIGV0Yy4KKyAgICAg ICAgICAgIHJvdy5hcHBlbmRDaGlsZChjZWxsKTsKKyAgICAgICAgfQorICAgIH0KK30KKworPC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8ZGl2IHJvbGU9 ImdyaWQiIHRhYmluZGV4PTAgaWQ9ImdyaWQxIj4KKyAgPGRpdiByb2xlPSJyb3dncm91cCI+Cisg ICAgPGRpdiByb2xlPSJyb3ciPgorICAgIDxzcGFuIHJvbGU9ImNvbHVtbmhlYWRlciI+QTwvc3Bh bj4KKyAgICA8c3BhbiByb2xlPSJjb2x1bW5oZWFkZXIiPkI8L3NwYW4+CisgICAgPHNwYW4gcm9s ZT0iY29sdW1uaGVhZGVyIj5DPC9zcGFuPgorICA8L2Rpdj4KKzwvZGl2PgorPGRpdiByb2xlPSJy b3dncm91cCIgaWQ9Im15RGF0YSI+PCEtLSB0byBiZSBwb3B1bGF0ZWQgYnkgc2NyaXB0IC0tPjwv ZGl2PgorPC9kaXY+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29s ZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0 IHdoZW4gYSB0YWJsZSBoYXMgaXRzIERPTSBjaGFuZ2VkLCBhbGwgdGhlIHRhYmxlIG1ldGhvZCBz dGlsbCByZXR1cm4gdGhlIGNvcnJlY3QgZGF0YS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIpIHsKKworICAgICAgICAgIHJhbmRvbWl6ZSgpOworICAgICAgICAg IAorICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJncmlkMSIpLmZvY3VzKCk7Cisg ICAgICAgICAgdmFyIGdyaWQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVu dDsKKyAgICAgICAgICB2YXIgcm93cyA9IGdyaWQucm93Q291bnQ7CisgICAgICAgICAgdmFyIGNv bHVtbnMgPSBncmlkLmNvbHVtbkNvdW50OworICAgICAgICAgIHJhbmRvbWl6ZSgpOworCisgICAg ICAgICAgLy8gdGhpcyB1c2VkIHRvIGNyYXNoIGluIGRlYnVnIG1vZGUuCisgICAgICAgICAgc2hv dWxkQmUoInJvd3MiLCAiZ3JpZC5yb3dDb3VudCIpOworICAgICAgICAgIHNob3VsZEJlKCJjb2x1 bW5zIiwgImdyaWQuY29sdW1uQ291bnQiKTsKKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQYXJz ZWQgPSB0cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jl c291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=