32126 2009-12-03 11:24:02 -0800 Implement WAI-ARIA scrollbar role and related property aria-orientation 2009-12-03 17:00:22 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin webkit.review.bot oldest_to_newest 168478 0 cfleizach 2009-12-03 11:24:02 -0800 http://www.w3.org/WAI/PF/aria/complete#scrollbar http://www.w3.org/WAI/PF/aria/complete#aria-orientation 168497 1 44263 cfleizach 2009-12-03 12:06:25 -0800 Created attachment 44263 patch 168498 2 webkit.review.bot 2009-12-03 12:10:26 -0800 style-queue ran check-webkit-style on attachment 44263 without any errors. 168596 3 cfleizach 2009-12-03 17:00:22 -0800 http://trac.webkit.org/changeset/51669 44263 2009-12-03 12:06:25 -0800 2009-12-03 16:46:58 -0800 patch patch.txt text/plain 15452 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTY1MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDktMTItMDMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbXBsZW1lbnQgV0FJLUFSSUEgc2Nyb2xsYmFyIHJvbGUgYW5kIHJlbGF0ZWQgcHJvcGVydHkg YXJpYS1vcmllbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzIxMjYKKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2FyaWEtc2Nyb2xs YmFyLXJvbGUuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFSSUFSb2xlTWFwKToKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzU2Nyb2xsYmFyKToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dmFsdWVGb3JSYW5nZSk6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpvcmllbnRhdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5IYXZlQ2hpbGRyZW4pOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tOgorICAgICAg ICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhZGRpdGlvbmFsQWNjZXNzaWJpbGl0eUF0 dHJpYnV0ZU5hbWVzXSk6CisgICAgICAgICgtW0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFj Y2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKyAgICAgICAgKiBodG1sL0hUTUxBdHRyaWJ1 dGVOYW1lcy5pbjoKKwogMjAwOS0xMi0wMyAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEJ1aWxkIGZpeApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkocmV2aXNpb24gNTE2NTApCisrKyBXZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5Nyw2 ICs4OTcsNyBAQCBzdGF0aWMgQVJJQVJvbGVNYXAqIGNyZWF0ZUFSSUFSb2xlTWFwKCkKICAgICAg ICAgeyAicmVnaW9uIiwgRG9jdW1lbnRSZWdpb25Sb2xlIH0sCiAgICAgICAgIHsgInJvdyIsIFJv d1JvbGUgfSwKICAgICAgICAgeyAicmFuZ2UiLCBTbGlkZXJSb2xlIH0sCisgICAgICAgIHsgInNj cm9sbGJhciIsIFNjcm9sbEJhclJvbGUgfSwKICAgICAgICAgeyAic2VhcmNoIiwgTGFuZG1hcmtT ZWFyY2hSb2xlIH0sCiAgICAgICAgIHsgInNlcGFyYXRvciIsIFNwbGl0dGVyUm9sZSB9LAogICAg ICAgICB7ICJzbGlkZXIiLCBTbGlkZXJSb2xlIH0sCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHJldmlzaW9uIDUxNjUwKQorKysgV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjg1 LDYgKzI4NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ29tYm9Cb3goKSBjb25zdCB7IHJldHVy biByb2xlVmFsdWUoKSA9PSBDb21ib0JveFJvbGU7IH0KICAgICBib29sIGlzVHJlZSgpIGNvbnN0 IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFRyZWVSb2xlOyB9CiAgICAgYm9vbCBpc1RyZWVJdGVt KCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gVHJlZUl0ZW1Sb2xlOyB9CisgICAgYm9v bCBpc1Njcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFNjcm9sbEJhclJv bGU7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNDaGVja2VkKCkgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH0KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDUxNjUwKQorKysgV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MzMs NyArODMzLDcgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnZhbHVlRAogICAg IAogZmxvYXQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dmFsdWVGb3JSYW5nZSgpIGNvbnN0 CiB7Ci0gICAgaWYgKCFpc1Byb2dyZXNzSW5kaWNhdG9yKCkgJiYgIWlzU2xpZGVyKCkpCisgICAg aWYgKCFpc1Byb2dyZXNzSW5kaWNhdG9yKCkgJiYgIWlzU2xpZGVyKCkgJiYgIWlzU2Nyb2xsYmFy KCkpCiAgICAgICAgIHJldHVybiAwLjBmOwogCiAgICAgcmV0dXJuIGdldEF0dHJpYnV0ZShhcmlh X3ZhbHVlbm93QXR0cikudG9GbG9hdCgpOwpAQCAtMjY1MSw2ICsyNjUxLDE3IEBAIEFjY2Vzc2li aWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmoKICAgICByZXR1cm4gVW5rbm93blJvbGU7 CiB9CiAKK0FjY2Vzc2liaWxpdHlPcmllbnRhdGlvbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 OjpvcmllbnRhdGlvbigpIGNvbnN0Cit7CisgICAgY29uc3QgQXRvbWljU3RyaW5nJiBhcmlhT3Jp ZW50YXRpb24gPSBnZXRBdHRyaWJ1dGUoYXJpYV9vcmllbnRhdGlvbkF0dHIpLnN0cmluZygpOwor ICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShhcmlhT3JpZW50YXRpb24sICJob3Jpem9udGFsIikp CisgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb25Ib3Jpem9udGFsOworICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShhcmlhT3JpZW50YXRpb24sICJ2ZXJ0aWNhbCIpKQorICAg ICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uVmVydGljYWw7CisgICAgCisgICAg cmV0dXJuIEFjY2Vzc2liaWxpdHlPYmplY3Q6Om9yaWVudGF0aW9uKCk7Cit9CisgICAgCiBib29s IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzUHJlc2VudGF0aW9uYWxDaGlsZE9mQXJpYVJv bGUoKSBjb25zdAogewogICAgIC8vIFdhbGsgdGhlIHBhcmVudCBjaGFpbiBsb29raW5nIGZvciBh IHBhcmVudCB0aGF0IGhhcyBwcmVzZW50YXRpb25hbCBjaGlsZHJlbgpAQCAtMjc2Miw2ICsyNzcz LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5IYXZlQwogICAgIGNhc2Ug VGFiUm9sZToKICAgICBjYXNlIFN0YXRpY1RleHRSb2xlOgogICAgIGNhc2UgTGlzdEJveE9wdGlv blJvbGU6CisgICAgY2FzZSBTY3JvbGxCYXJSb2xlOgogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIHRydWU7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDUxNjUw KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAko d29ya2luZyBjb3B5KQpAQCAtMjAxLDYgKzIwMSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgc2V0U2VsZWN0ZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFNlbGVjdGVkUm93cyhB Y2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKTsKICAgICB2aXJ0dWFsIHZvaWQgY2hhbmdlVmFs dWVCeVBlcmNlbnQoZmxvYXQgcGVyY2VudENoYW5nZSk7CisgICAgdmlydHVhbCBBY2Nlc3NpYmls aXR5T3JpZW50YXRpb24gb3JpZW50YXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgaW5j cmVtZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGRlY3JlbWVudCgpOwogICAgIApJbmRleDogV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyLm1tCShyZXZpc2lvbiA1MTY1MCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMv QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTU5MCw2ICs1 OTAsOSBAQCBzdGF0aWMgV2ViQ29yZVRleHRNYXJrZXJSYW5nZSogdGV4dE1hcmtlCiAgICAgaWYg KG1fb2JqZWN0LT5zdXBwb3J0c0FSSUFPd25zKCkpCiAgICAgICAgIFthZGRpdGlvbmFsIGFkZE9i amVjdDpOU0FjY2Vzc2liaWxpdHlPd25zQXR0cmlidXRlXTsKIAorICAgIGlmIChtX29iamVjdC0+ aXNTY3JvbGxiYXIoKSkKKyAgICAgICAgW2FkZGl0aW9uYWwgYWRkT2JqZWN0Ok5TQWNjZXNzaWJp bGl0eU9yaWVudGF0aW9uQXR0cmlidXRlXTsKKyAgICAKICAgICBpZiAobV9vYmplY3QtPnN1cHBv cnRzQVJJQURyYWdnaW5nKCkpCiAgICAgICAgIFthZGRpdGlvbmFsIGFkZE9iamVjdDpOU0FjY2Vz c2liaWxpdHlHcmFiYmVkQXR0cmlidXRlXTsKIApAQCAtMTQ0OCw3ICsxNDUxLDcgQEAgc3RhdGlj IE5TU3RyaW5nKiByb2xlVmFsdWVUb05TU3RyaW5nKEFjYwogICAgICAgICAgICAgaWYgKFtbW3Nl bGYgYXR0YWNobWVudFZpZXddIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVOYW1lc10gY29udGFpbnNP YmplY3Q6TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdKSAKICAgICAgICAgICAgICAgICBy ZXR1cm4gW1tzZWxmIGF0dGFjaG1lbnRWaWV3XSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6 TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdOwogICAgICAgICB9Ci0gICAgICAgIGlmICht X29iamVjdC0+aXNQcm9ncmVzc0luZGljYXRvcigpIHx8IG1fb2JqZWN0LT5pc1NsaWRlcigpKQor ICAgICAgICBpZiAobV9vYmplY3QtPmlzUHJvZ3Jlc3NJbmRpY2F0b3IoKSB8fCBtX29iamVjdC0+ aXNTbGlkZXIoKSB8fCBtX29iamVjdC0+aXNTY3JvbGxiYXIoKSkKICAgICAgICAgICAgIHJldHVy biBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0Om1fb2JqZWN0LT52YWx1ZUZvclJhbmdlKCldOwog ICAgICAgICBpZiAobV9vYmplY3QtPmhhc0ludFZhbHVlKCkpCiAgICAgICAgICAgICByZXR1cm4g W05TTnVtYmVyIG51bWJlcldpdGhJbnQ6bV9vYmplY3QtPmludFZhbHVlKCldOwpJbmRleDogV2Vi Q29yZS9odG1sL0hUTUxBdHRyaWJ1dGVOYW1lcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0 bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluCShyZXZpc2lvbiA1MTY1MCkKKysrIFdlYkNvcmUvaHRt bC9IVE1MQXR0cmlidXRlTmFtZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAg YXJpYS1sYWJlbGVkYnkKIGFyaWEtbGFiZWxsZWRieQogYXJpYS1sZXZlbAogYXJpYS1tdWx0aXNl bGVjdGFibGUKK2FyaWEtb3JpZW50YXRpb24KIGFyaWEtb3ducwogYXJpYS1wcmVzc2VkCiBhcmlh LXJlYWRvbmx5CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MTY1MSkKKysrIFdlYktpdFRvb2xzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDA5LTEyLTAzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IFdBSS1BUklBIHNjcm9sbGJhciByb2xl IGFuZCByZWxhdGVkIHByb3BlcnR5IGFyaWEtb3JpZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMTI2CisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcDoKKyAgICAgICAgKGdldE9yaWVudGF0 aW9uQ2FsbGJhY2spOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Z2V0SlNDbGFz cyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oOgor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50R3RrLmNw cDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om9yaWVudGF0aW9uKToKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbToKKyAg ICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om9yaWVudGF0aW9uKToKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eVVJRWxlbWVudFdpbi5jcHA6CisgICAgICAg IChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpvcmllbnRhdGlvbik6CisKIDIwMDktMTItMDMgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNh bSBXZWluaWcuCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcAkocmV2aXNpb24gNTE2NTApCisrKyBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzcxLDYgKzM3MSwxMiBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBnZXRMYW5ndWFnZUNhbGxi YWNrKEpTCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRleHQsIGxhbmd1YWdlLmdl dCgpKTsKIH0KIAorc3RhdGljIEpTVmFsdWVSZWYgZ2V0T3JpZW50YXRpb25DYWxsYmFjayhKU0Nv bnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwgSlNTdHJpbmdSZWYgcHJv cGVydHlOYW1lLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCit7CisgICAgSlNSZXRhaW5QdHI8SlNT dHJpbmdSZWY+IG9yaWVudGF0aW9uKEFkb3B0LCB0b0FYRWxlbWVudCh0aGlzT2JqZWN0KS0+b3Jp ZW50YXRpb24oKSk7CisgICAgcmV0dXJuIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRleHQsIG9yaWVu dGF0aW9uLmdldCgpKTsKK30KKwogc3RhdGljIEpTVmFsdWVSZWYgZ2V0Q2hpbGRyZW5Db3VudENh bGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBKU1N0 cmluZ1JlZiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKICAgICByZXR1 cm4gSlNWYWx1ZU1ha2VOdW1iZXIoY29udGV4dCwgdG9BWEVsZW1lbnQodGhpc09iamVjdCktPmNo aWxkcmVuQ291bnQoKSk7CkBAIC01MjYsNiArNTMyLDcgQEAgSlNDbGFzc1JlZiBBY2Nlc3NpYmls aXR5VUlFbGVtZW50OjpnZXRKUwogICAgICAgICB7ICJkb2N1bWVudEVuY29kaW5nIiwgZ2V0RG9j dW1lbnRFbmNvZGluZ0NhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwg a0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImRvY3VtZW50VVJJ IiwgZ2V0RG9jdW1lbnRVUklDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJpc1ZhbGlk IiwgZ2V0SXNWYWxpZENhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwg a0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgIm9yaWVudGF0aW9u IiwgZ2V0T3JpZW50YXRpb25DYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJhcmlhSXNH cmFiYmVkIiwgZ2V0QVJJQUlzR3JhYmJlZENhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0 ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsg ImFyaWFEcm9wRWZmZWN0cyIsIGdldEFSSUFEcm9wRWZmZWN0c0NhbGxiYWNrLCAwLCBrSlNQcm9w ZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0s CiAgICAgICAgIHsgMCwgMCwgMCwgMCB9CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oCShyZXZpc2lvbiA1MTY1MCkKKysr IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtOTUsNiArOTUsNyBAQCBwdWJsaWM6CiAgICAgSlNTdHJpbmdSZWYgbGFu Z3VhZ2UoKTsKICAgICBKU1N0cmluZ1JlZiBzdHJpbmdWYWx1ZSgpOwogICAgIEpTU3RyaW5nUmVm IGFjY2Vzc2liaWxpdHlWYWx1ZSgpIGNvbnN0OworICAgIEpTU3RyaW5nUmVmIG9yaWVudGF0aW9u KCkgY29uc3Q7CiAgICAgZG91YmxlIHgoKTsKICAgICBkb3VibGUgeSgpOwogICAgIGRvdWJsZSB3 aWR0aCgpOwpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnRHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50R3RrLmNwcAkocmV2aXNpb24gNTE2NTApCisr KyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEd0 ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzOSw2ICsyMzksMTAgQEAgZG91YmxlIEFjY2Vzc2li aWxpdHlVSUVsZW1lbnQ6OmNsaWNrUG9pbgogICAgIHJldHVybiAwLmY7CiB9CiAKK0pTU3RyaW5n UmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om9yaWVudGF0aW9uKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gMDsKK30KIAogZG91YmxlIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmludFZhbHVlKCkK IHsKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlF bGVtZW50TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21h Yy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCShyZXZpc2lvbiA1MTY1MCkKKysrIFdlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zODYsNiArMzg2LDEyIEBAIEpTU3RyaW5nUmVmIEFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6OmRlc2MKICAgICByZXR1cm4gY29uY2F0ZW5hdGVBdHRyaWJ1dGVBbmRWYWx1 ZShAIkFYRGVzY3JpcHRpb24iLCBkZXNjcmlwdGlvbik7CiB9CiAKK0pTU3RyaW5nUmVmIEFjY2Vz c2liaWxpdHlVSUVsZW1lbnQ6Om9yaWVudGF0aW9uKCkgY29uc3QKK3sKKyAgICBpZCBkZXNjcmlw dGlvbiA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1 dGVWYWx1ZTpOU0FjY2Vzc2liaWxpdHlPcmllbnRhdGlvbkF0dHJpYnV0ZV0sIG1fZWxlbWVudCk7 CisgICAgcmV0dXJuIGNvbmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWE9yaWVudGF0aW9u IiwgZGVzY3JpcHRpb24pOyAgICAKK30KKwogSlNTdHJpbmdSZWYgQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6c3RyaW5nVmFsdWUoKQogewogICAgIGlkIGRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb25P ZlZhbHVlKFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOk5TQWNjZXNzaWJp bGl0eVZhbHVlQXR0cmlidXRlXSwgbV9lbGVtZW50KTsKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL3dpbi9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50V2luLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eVVJRWxlbWVudFdp bi5jcHAJKHJldmlzaW9uIDUxNjUwKQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzcsNiAr Mjc3LDExIEBAIGJvb2wgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNFeHBhbmRlZCgKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKK0pTU3RyaW5nUmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om9y aWVudGF0aW9uKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMDsKK30KKwogZG91YmxlIEFjY2Vzc2li aWxpdHlVSUVsZW1lbnQ6OmludFZhbHVlKCkKIHsKICAgICBCU1RSIHZhbHVlQlNUUjsKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDUxNjUxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTItMDMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6 YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbXBsZW1lbnQgV0FJLUFSSUEgc2Nyb2xsYmFyIHJvbGUgYW5kIHJlbGF0ZWQgcHJv cGVydHkgYXJpYS1vcmllbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzIxMjYKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXJpYS1zY3Jv bGxiYXItcm9sZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv YXJpYS1zY3JvbGxiYXItcm9sZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsv U2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKwogMjAwOS0xMi0wMyAg T2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh biBCZXJuc3RlaW4uCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtc2Nyb2xs YmFyLXJvbGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvYXJpYS1zY3JvbGxiYXItcm9sZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtc2Nyb2xsYmFyLXJvbGUtZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE0IEBACitzY3JvbGxiYXIKK1RoaXMgdGVzdHMgdGhh dCB0aGUgQVJJQSBzY3JvbGxiYXIgcm9sZSB3b3JrcyBjb3JyZWN0bHkKKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc2Nyb2xsZXIucm9sZSBpcyAnQVhSb2xlOiBBWFNjcm9s bEJhcicKK1BBU1Mgc2Nyb2xsZXIuaW50VmFsdWUgaXMgNTUKK1BBU1Mgc2Nyb2xsZXIub3JpZW50 YXRpb24gaXMgJ0FYT3JpZW50YXRpb246IEFYVmVydGljYWxPcmllbnRhdGlvbicKK1BBU1Mgc2Ny b2xsZXIub3JpZW50YXRpb24gaXMgJ0FYT3JpZW50YXRpb246IEFYSG9yaXpvbnRhbE9yaWVudGF0 aW9uJworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisK SW5kZXg6IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1zY3JvbGxiYXItcm9sZS5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1zY3JvbGxiYXIt cm9sZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlh LXNjcm9sbGJhci1yb2xlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9D VFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+ Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRl c3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQ+Cit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7 Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzxkaXYgdGFiaW5k ZXg9MCBpZD0ic2Nyb2xsZXIiIGFyaWEtdmFsdWVub3c9IjU1IiByb2xlPSJzY3JvbGxiYXIiIGFy aWEtb3JpZW50YXRpb249InZlcnRpY2FsIj5zY3JvbGxiYXI8L2Rpdj4KKworCis8cCBpZD0iZGVz Y3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisg ICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCB0aGUgQVJJQSBzY3JvbGxiYXIgcm9sZSB3 b3JrcyBjb3JyZWN0bHkiKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIpIHsKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2Nyb2xsZXIiKS5mb2N1 cygpOworICAgICAgICB2YXIgc2Nyb2xsZXIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1 c2VkRWxlbWVudDsKKyAgICAgICAgc2hvdWxkQmUoInNjcm9sbGVyLnJvbGUiLCAiJ0FYUm9sZTog QVhTY3JvbGxCYXInIik7CisgICAgICAgIHNob3VsZEJlKCJzY3JvbGxlci5pbnRWYWx1ZSIsICI1 NSIpOworICAgICAgICBzaG91bGRCZSgic2Nyb2xsZXIub3JpZW50YXRpb24iLCAiJ0FYT3JpZW50 YXRpb246IEFYVmVydGljYWxPcmllbnRhdGlvbiciKTsKKworICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgic2Nyb2xsZXIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtb3JpZW50YXRpb24iLCAi aG9yaXpvbnRhbCIpOworICAgICAgICBzaG91bGRCZSgic2Nyb2xsZXIub3JpZW50YXRpb24iLCAi J0FYT3JpZW50YXRpb246IEFYSG9yaXpvbnRhbE9yaWVudGF0aW9uJyIpOworICAgIH0KKworICAg IHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkocmV2aXNpb24gNTE2NTApCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtNTMs NiArNTMsNyBAQCBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtCiBhY2Nl c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1zdGF5LXdpdGhpbi5odG1sCiBhY2Nlc3NpYmlsaXR5 L2FyaWEtbGluay1zdXBwb3J0cy1wcmVzcy5odG1sCiBhY2Nlc3NpYmlsaXR5L2FyaWEtcmVhZG9u bHkuaHRtbAorYWNjZXNzaWJpbGl0eS9hcmlhLXNjcm9sbGJhci1yb2xlLmh0bWwKIGFjY2Vzc2li aWxpdHkvYXJpYS10YWItcm9sZXMuaHRtbAogYWNjZXNzaWJpbGl0eS9hcmlhLXRleHQtcm9sZS5o dG1sCiBhY2Nlc3NpYmlsaXR5L2FyaWEtdXNlZC1vbi1pbWFnZS1tYXBzLmh0bWwKSW5kZXg6IExh eW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L3BsYXRmb3JtL3dpbi9Ta2lwcGVkCShyZXZpc2lvbiA1MTY1MCkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL3dpbi9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC0zNzAsNiArMzcwLDcgQEAgYWNj ZXNzaWJpbGl0eS9hcmlhLWxpc3QtYW5kLWxpc3RpdGVtLmh0bQogYWNjZXNzaWJpbGl0eS9hcmlh LXByZXNlbnRhdGlvbmFsLXJvbGUuaHRtbAogYWNjZXNzaWJpbGl0eS9hcmlhLXJlYWRvbmx5Lmh0 bWwKIGFjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy5odG1sCithY2Nlc3NpYmlsaXR5L2FyaWEtc2Ny b2xsYmFyLXJvbGUuaHRtbAogYWNjZXNzaWJpbGl0eS9hcmlhLXRhYmxlcy5odG1sCiBhY2Nlc3Np YmlsaXR5L2FyaWEtdGFiLXJvbGVzLmh0bWwKIGFjY2Vzc2liaWxpdHkvYXJpYS10ZXh0LXJvbGUu aHRtbAo=