21041 2008-09-23 14:41:58 -0700 "Add Contact" link at gmail does not support AXPress action 2008-09-23 17:10:00 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin oldest_to_newest 92400 0 bdakin 2008-09-23 14:41:58 -0700 All ARIA links are not clickable via accessibility. Steps to reproduce: 1. Login to Gmail account 2. Use Accessibility Inspector to inspect the "Add Contact" ARIA link. ("Add Contact" is a div with role="link") The AXPress action is missing. Impact on VoiceOver: VO user cannot click on this link 92404 1 23729 bdakin 2008-09-23 14:52:46 -0700 Created attachment 23729 Patch to add support to ARIA links in AccessibilityObject::anchorElement() 92405 2 bdakin 2008-09-23 14:53:02 -0700 <rdar://problem/6216178> 92434 3 23729 sam 2008-09-23 17:03:18 -0700 Comment on attachment 23729 Patch to add support to ARIA links in AccessibilityObject::anchorElement() Though you should make the changes discussed. 92437 4 bdakin 2008-09-23 17:10:00 -0700 Fixed with r36818. 23729 2008-09-23 14:52:46 -0700 2008-09-23 17:03:18 -0700 Patch to add support to ARIA links in AccessibilityObject::anchorElement() axPressed.txt text/plain 14483 bdakin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjgxNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDgtMDktMjMgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDQxICJBZGQgQ29u dGFjdCIgCisgICAgICAgIGxpbmsgYXQgZ21haWwgZG9lcyBub3Qgc3VwcG9ydCBBWFByZXNzIGFj dGlvbgorICAgICAgICBhbmQgY29ycmVzcG9uZGluZzogPHJkYXI6Ly9wcm9ibGVtLzYyMTYxNzg+ CisKKyAgICAgICAgSSBmaXhlZCB0aGlzIGJ1ZyBieSBtYWtpbmcgQWNjZXNzaWJpbGl0eU9iamVj dDo6YW5jaG9yRWxlbWVudCAKKyAgICAgICAgc3VwcG9ydCBBUklBIGxpbmtzLgorCisgICAgICAg ICogcGFnZS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlJbWFnZU1hcExpbms6OmFuY2hvckVsZW1lbnQpOgorICAgICAgICAqIHBh Z2UvQWNjZXNzaWJpbGl0eUltYWdlTWFwTGluay5oOgorICAgICAgICAqIHBhZ2UvQWNjZXNzaWJp bGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojph bmNob3JFbGVtZW50KToKKyAgICAgICAgKiBwYWdlL0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzTmF0aXZlQW5jaG9yKToKKyAg ICAgICAgKiBwYWdlL0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNOYXRpdmVBbmNob3IpOgorICAgICAg ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YW5jaG9yRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjppbnRlcm5hbExpbmtF bGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnVy bCk6CisgICAgICAgICogcGFnZS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAg ICogcGFnZS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW06CisgICAgICAgIChBWExp bmtFbGVtZW50Rm9yTm9kZSk6CisKIDIwMDgtMDktMjMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBw bGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTAzOQpJbmRleDogV2ViQ29yZS9wYWdlL0FjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNw cAkocmV2aXNpb24gMzY4MDkpCisrKyBXZWJDb3JlL3BhZ2UvQWNjZXNzaWJpbGl0eUltYWdlTWFw TGluay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYzLDcgKzYzLDcgQEAgQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eUltYWdlTQogICAgIHJldHVybiBtX21hcEVsZW1lbnQtPmRvY3Vt ZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0KG1fbWFwRWxlbWVudC0+cmVuZGVyZXIoKSk7CiB9 CiAgICAgCi1IVE1MQW5jaG9yRWxlbWVudCogQWNjZXNzaWJpbGl0eUltYWdlTWFwTGluazo6YW5j aG9yRWxlbWVudCgpIGNvbnN0CitFbGVtZW50KiBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rOjph bmNob3JFbGVtZW50KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9hcmVhRWxlbWVudDsKIH0KSW5k ZXg6IFdlYkNvcmUvcGFnZS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wYWdlL0FjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuaAkocmV2aXNpb24gMzY4 MDkpCisrKyBXZWJDb3JlL3BhZ2UvQWNjZXNzaWJpbGl0eUltYWdlTWFwTGluay5oCSh3b3JraW5n IGNvcHkpCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgYWNjZXNz aWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0dWFs IEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudE9iamVjdCgpIGNvbnN0OwotICAgIHZpcnR1YWwg SFRNTEFuY2hvckVsZW1lbnQqIGFuY2hvckVsZW1lbnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIEVs ZW1lbnQqIGFuY2hvckVsZW1lbnQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNMaW5rKCkg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfSAKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0 OwogICAgIHZpcnR1YWwgU3RyaW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigpIGNvbnN0OwpJ bmRleDogV2ViQ29yZS9wYWdlL0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGFnZS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkocmV2aXNpb24gMzY4MDkpCisr KyBXZWJDb3JlL3BhZ2UvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMxNSw3ICszMTUsNyBAQCBXaWRnZXQqIEFjY2Vzc2liaWxpdHlPYmplY3Q6OndpZGdldEZvckF0 CiAgICAgcmV0dXJuIDA7CiB9CiAKLUhUTUxBbmNob3JFbGVtZW50KiBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjphbmNob3JFbGVtZW50KCkgY29uc3QKK0VsZW1lbnQqIEFjY2Vzc2liaWxpdHlPYmplY3Q6 OmFuY2hvckVsZW1lbnQoKSBjb25zdAogewogICAgIHJldHVybiAwOyAgIAogfQpJbmRleDogV2Vi Q29yZS9wYWdlL0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvQWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lvbiAzNjgwOSkKKysrIFdlYkNvcmUvcGFn ZS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE5Miw2ICsxOTIsNyBA QCBwdWJsaWM6CiAgICAgdHlwZWRlZiBWZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+ ID4gQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yOwogICAgIAogICAgIHZpcnR1YWwgYm9vbCBp c0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfTsKKyAg ICB2aXJ0dWFsIGJvb2wgaXNOYXRpdmVBbmNob3IoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQog ICAgIHZpcnR1YWwgYm9vbCBpc0FuY2hvcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9OwogICAg IHZpcnR1YWwgYm9vbCBpc0F0dGFjaG1lbnQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfTsKICAg ICB2aXJ0dWFsIGJvb2wgaXNIZWFkaW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH07CkBAIC0y NzIsNyArMjczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eVJvbGUgcm9s ZVZhbHVlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBBWE9iamVjdENhY2hlKiBheE9iamVjdENhY2hl KCkgY29uc3Q7CiAgICAgCi0gICAgdmlydHVhbCBIVE1MQW5jaG9yRWxlbWVudCogYW5jaG9yRWxl bWVudCgpIGNvbnN0OworICAgIHZpcnR1YWwgRWxlbWVudCogYW5jaG9yRWxlbWVudCgpIGNvbnN0 OwogICAgIHZpcnR1YWwgRWxlbWVudCogYWN0aW9uRWxlbWVudCgpIGNvbnN0OwogICAgIHZpcnR1 YWwgSW50UmVjdCBib3VuZGluZ0JveFJlY3QoKSBjb25zdDsKICAgICB2aXJ0dWFsIEludFJlY3Qg ZWxlbWVudFJlY3QoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDM2ODA5KQorKysgV2ViQ29yZS9wYWdlL0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTUsNiArMTk1LDExIEBA IGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNBbmNob3IKICAgICByZXR1cm4gIWlz TmF0aXZlSW1hZ2UoKSAmJiBpc0xpbmsoKTsKIH0KIAorYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0Ojppc05hdGl2ZUFuY2hvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzQW5jaG9yKCkg JiYgbV9yZW5kZXJlci0+ZWxlbWVudCgpLT5oYXNUYWdOYW1lKGFUYWcpOworfQorCiBib29sIEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzTmF0aXZlVGV4dENvbnRyb2woKSBjb25zdAogewog ICAgIHJldHVybiBtX3JlbmRlcmVyLT5pc1RleHRGaWVsZCgpIHx8IG1fcmVuZGVyZXItPmlzVGV4 dEFyZWEoKTsKQEAgLTQ0MCwxNiArNDQ1LDE4IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgQWNjZXNz aWJpbGl0eVJlbmRlck8KICAgICByZXR1cm4gZWxlbWVudC0+Z2V0QXR0cmlidXRlKGF0dHJpYnV0 ZSk7CiB9CiAKLUhUTUxBbmNob3JFbGVtZW50KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojph bmNob3JFbGVtZW50KCkgY29uc3QKK0VsZW1lbnQqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmFuY2hvckVsZW1lbnQoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBJbiBYSFRNTCAyLjAsIGFu eSBIVE1MIGVsZW1lbnQgY2FuIGhhdmUgYW4gaHJlZiBhdHRyaWJ1dGUuIFdlIHdpbGwgbmVlZCB0 byBpbXBsZW1lbnQgdGhpcyB0byBmdWxseQotICAgIC8vIHN1cHBvcnQgQVJJQSBsaW5rcy4KLQot ICAgIC8vIFNlYXJjaCB1cCB0aGUgcmVuZGVyIHRyZWUgZm9yIGEgUmVuZGVyT2JqZWN0IHdpdGgg YSBET00gbm9kZS4gIERlZmVyIHRvIGFuIGVhcmxpZXIgY29udGludWF0aW9uLCB0aG91Z2guCisg ICAgaWYgKCFtX3JlbmRlcmVyKQorICAgICAgICByZXR1cm4gMDsKKyAgICAKKyAgICBBWE9iamVj dENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKICAgICBSZW5kZXJPYmplY3QqIGN1cnJS ZW5kZXJlcjsKKyAgICAKKyAgICAvLyBTZWFyY2ggdXAgdGhlIHJlbmRlciB0cmVlIGZvciBhIFJl bmRlck9iamVjdCB3aXRoIGEgRE9NIG5vZGUuICBEZWZlciB0byBhbiBlYXJsaWVyIGNvbnRpbnVh dGlvbiwgdGhvdWdoLgogICAgIGZvciAoY3VyclJlbmRlcmVyID0gbV9yZW5kZXJlcjsgY3VyclJl bmRlcmVyICYmICFjdXJyUmVuZGVyZXItPmVsZW1lbnQoKTsgY3VyclJlbmRlcmVyID0gY3VyclJl bmRlcmVyLT5wYXJlbnQoKSkgewogICAgICAgICBpZiAoY3VyclJlbmRlcmVyLT5jb250aW51YXRp b24oKSkKLSAgICAgICAgICAgIHJldHVybiBjdXJyUmVuZGVyZXItPmRvY3VtZW50KCktPmF4T2Jq ZWN0Q2FjaGUoKS0+Z2V0KGN1cnJSZW5kZXJlci0+Y29udGludWF0aW9uKCkpLT5hbmNob3JFbGVt ZW50KCk7CisgICAgICAgICAgICByZXR1cm4gY2FjaGUtPmdldChjdXJyUmVuZGVyZXItPmNvbnRp bnVhdGlvbigpKS0+YW5jaG9yRWxlbWVudCgpOwogICAgIH0KICAgICAKICAgICAvLyBiYWlsIGlm IG5vbmUgZm91bmQKQEAgLTQ2MCw4ICs0NjcsOCBAQCBIVE1MQW5jaG9yRWxlbWVudCogQWNjZXNz aWJpbGl0eVJlbmRlck9iCiAgICAgLy8gTk9URTogdGhpcyBhc3N1bWVzIHRoYXQgYW55IG5vbi1p bWFnZSB3aXRoIGFuIGFuY2hvciBpcyBhbiBIVE1MQW5jaG9yRWxlbWVudAogICAgIE5vZGUqIG5v ZGUgPSBjdXJyUmVuZGVyZXItPm5vZGUoKTsKICAgICBmb3IgKCA7IG5vZGU7IG5vZGUgPSBub2Rl LT5wYXJlbnROb2RlKCkpIHsKLSAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoYVRhZykpCi0g ICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTEFuY2hvckVsZW1lbnQqPihub2RlKTsK KyAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoYVRhZykgfHwgKG5vZGUtPnJlbmRlcmVyKCkg JiYgY2FjaGUtPmdldChub2RlLT5yZW5kZXJlcigpKS0+aXNBbmNob3IoKSkpCisgICAgICAgICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOwogICAgIH0KICAgICAKICAgICBy ZXR1cm4gMDsKQEAgLTk2NSwxMCArOTcyLDE1IEBAIEludFNpemUgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6c2l6ZSgKIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6aW50ZXJuYWxMaW5rRWxlbWVudCgpIGNvbnN0CiB7Ci0gICAgSFRNTEFuY2hvckVs ZW1lbnQqIGFuY2hvciA9IGFuY2hvckVsZW1lbnQoKTsKLSAgICBpZiAoIWFuY2hvcikKKyAgICBF bGVtZW50KiBlbGVtZW50ID0gYW5jaG9yRWxlbWVudCgpOworICAgIGlmICghZWxlbWVudCkKICAg ICAgICAgcmV0dXJuIDA7CiAgICAgCisgICAgLy8gUmlnaHQgbm93LCB3ZSBkbyBub3Qgc3VwcG9y dCBBUklBIGxpbmtzIGFzIGludGVybmFsIGxpbmsgZWxlbWVudHMKKyAgICBpZiAoIWVsZW1lbnQt Pmhhc1RhZ05hbWUoYVRhZykpCisgICAgICAgIHJldHVybiAwOworICAgIEhUTUxBbmNob3JFbGVt ZW50KiBhbmNob3IgPSBzdGF0aWNfY2FzdDxIVE1MQW5jaG9yRWxlbWVudCo+KGVsZW1lbnQpOwor ICAgIAogICAgIEtVUkwgbGlua1VSTCA9IGFuY2hvci0+aHJlZigpOwogICAgIFN0cmluZyByZWYg PSBsaW5rVVJMLnJlZigpOwogICAgIGlmIChyZWYuaXNFbXB0eSgpKQpAQCAtMTMyMCw4ICsxMzMy LDggQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlYwogCiBLVVJMIEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnVybCgpIGNvbnN0CiB7Ci0gICAgaWYgKGlzQW5jaG9y KCkpIHsKLSAgICAgICAgaWYgKEhUTUxBbmNob3JFbGVtZW50KiBhbmNob3IgPSBhbmNob3JFbGVt ZW50KCkpCisgICAgaWYgKGlzTmF0aXZlQW5jaG9yKCkpIHsKKyAgICAgICAgaWYgKEhUTUxBbmNo b3JFbGVtZW50KiBhbmNob3IgPSBzdGF0aWNfY2FzdDxIVE1MQW5jaG9yRWxlbWVudCo+KGFuY2hv ckVsZW1lbnQoKSkpCiAgICAgICAgICAgICByZXR1cm4gYW5jaG9yLT5ocmVmKCk7CiAgICAgfQog ICAgIApJbmRleDogV2ViQ29yZS9wYWdlL0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCShyZXZp c2lvbiAzNjgwOSkKKysrIFdlYkNvcmUvcGFnZS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfTsKICAgICAKICAg ICB2aXJ0dWFsIGJvb2wgaXNBbmNob3IoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNOYXRp dmVBbmNob3IoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNBdHRhY2htZW50KCkgY29uc3Q7 CiAgICAgdmlydHVhbCBib29sIGlzSGVhZGluZygpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBp c0xpbmsoKSBjb25zdDsKQEAgLTEzNSw3ICsxMzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBF bGVtZW50KiBhY3Rpb25FbGVtZW50KCkgY29uc3Q7CiAgICAgRWxlbWVudCogbW91c2VCdXR0b25M aXN0ZW5lcigpIGNvbnN0OwogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3SWZSZW5kZXJWaWV3KCkg Y29uc3Q7Ci0gICAgdmlydHVhbCBIVE1MQW5jaG9yRWxlbWVudCogYW5jaG9yRWxlbWVudCgpIGNv bnN0OworICAgIHZpcnR1YWwgRWxlbWVudCogYW5jaG9yRWxlbWVudCgpIGNvbnN0OwogICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIG1lbnVGb3JNZW51QnV0dG9uKCkgY29uc3Q7CiAgICAgQWNjZXNz aWJpbGl0eU9iamVjdCogbWVudUJ1dHRvbkZvck1lbnUoKSBjb25zdDsKICAgICAKSW5kZXg6IFdl YkNvcmUvcGFnZS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wYWdlL21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2aXNp b24gMzY4MDkpCisrKyBXZWJDb3JlL3BhZ2UvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MjEsNyArNDIxLDcgQEAgc3RhdGljIEFjY2Vzc2liaWxp dHlPYmplY3QqIEFYTGlua0VsZW1lbgogICAgICAgICByZXR1cm4gMDsKIAogICAgIFJlZlB0cjxB Y2Nlc3NpYmlsaXR5T2JqZWN0PiBheE9iaiA9IG9iai0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNo ZSgpLT5nZXQob2JqKTsKLSAgICBIVE1MQW5jaG9yRWxlbWVudCogYW5jaG9yID0gYXhPYmotPmFu Y2hvckVsZW1lbnQoKTsKKyAgICBFbGVtZW50KiBhbmNob3IgPSBheE9iai0+YW5jaG9yRWxlbWVu dCgpOwogICAgIGlmICghYW5jaG9yKQogICAgICAgICByZXR1cm4gMDsKIApJbmRleDogV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gMzY4MTUpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNyBAQAorMjAwOC0wOS0yMyAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBw YXRjaCBleHRlbmRzIER1bXBSZW5kZXJUcmVlJ3MgQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIgdG8g YXNrIAorICAgICAgICBpZiB0aGUgZm9jdXNlZCBlbGVtZW50IHN1cHBvcnRzIHRoZSBwcmVzcyBh Y3Rpb24uCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50 LmNwcDoKKyAgICAgICAgKGdldFN1cHBvcnRzUHJlc3NBY3Rpb25DYWxsYmFjayk6CisgICAgICAg IChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpnZXRKU0NsYXNzKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50Lmg6CisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW06CisgICAgICAgIChBY2Nlc3NpYmls aXR5VUlFbGVtZW50OjpzdXBwb3J0c1ByZXNzQWN0aW9uKToKKwogMjAwOC0wOS0yMiAgQWxpY2Ug TGl1ICA8YWxpY2UubGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRpbmcgYSBzdGFuZC1hbG9u ZSBXaW5kb3dzIGNvbnNvbGUgYXBwbGljYXRpb24gdG8gcmVjb3JkIGEgcHJvY2VzcydzIG1lbW9y eSB1c2FnZQpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAJKHJldmlzaW9uIDM2ODA5KQorKysgV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIyNiw2ICsyMjYsMTEgQEAgc3RhdGljIEpTVmFsdWVSZWYgZ2V0U2VsZWN0ZWRUZXh0UmFu Z2VDYQogICAgIHJldHVybiBKU1ZhbHVlTWFrZVN0cmluZyhjb250ZXh0LCBzZWxlY3RlZFRleHRS YW5nZS5nZXQoKSk7CiB9CiAKK3N0YXRpYyBKU1ZhbHVlUmVmIGdldFN1cHBvcnRzUHJlc3NBY3Rp b25DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwg SlNTdHJpbmdSZWYgcHJvcGVydHlOYW1lLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCit7CisgICAg cmV0dXJuIEpTVmFsdWVNYWtlQm9vbGVhbihjb250ZXh0LCAgdG9BWEVsZW1lbnQodGhpc09iamVj dCktPnN1cHBvcnRzUHJlc3NBY3Rpb24oKSk7Cit9CisKIC8vIERlc3RydWN0aW9uCiAKIHN0YXRp YyB2b2lkIGZpbmFsaXplKEpTT2JqZWN0UmVmIHRoaXNPYmplY3QpCkBAIC0yNTMsNiArMjU4LDcg QEAgSlNDbGFzc1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpnZXRKUwogICAgICAgICB7ICJt YXhWYWx1ZSIsIGdldE1heFZhbHVlQ2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVh ZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiaW5z ZXJ0aW9uUG9pbnRMaW5lTnVtYmVyIiwgZ2V0SW5zZXJ0aW9uUG9pbnRMaW5lTnVtYmVyQ2FsbGJh Y2ssIDAsIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0 ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAic2VsZWN0ZWRUZXh0UmFuZ2UiLCBnZXRTZWxlY3Rl ZFRleHRSYW5nZUNhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pT UHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgInN1cHBvcnRzUHJlc3NB Y3Rpb24iLCBnZXRTdXBwb3J0c1ByZXNzQWN0aW9uQ2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5QXR0 cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAg ICAgeyAwLCAwLCAwLCAwIH0KICAgICB9OwogCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oCShyZXZpc2lvbiAzNjgwOSkK KysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAko d29ya2luZyBjb3B5KQpAQCAtODAsNiArODAsNyBAQCBwdWJsaWM6CiAgICAgZG91YmxlIG1heFZh bHVlKCk7CiAgICAgaW50IGluc2VydGlvblBvaW50TGluZU51bWJlcigpOwogICAgIEpTU3RyaW5n UmVmIHNlbGVjdGVkVGV4dFJhbmdlKCk7CisgICAgYm9vbCBzdXBwb3J0c1ByZXNzQWN0aW9uKCk7 CiAKICAgICAvLyBUYWJsZS1zcGVjaWZpYyBhdHRyaWJ1dGVzCiAgICAgSlNTdHJpbmdSZWYgYXR0 cmlidXRlc09mQ29sdW1uSGVhZGVycygpOwpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW0JKHJl dmlzaW9uIDM2ODA5KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0FjY2Vzc2li aWxpdHlVSUVsZW1lbnRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4Niw2ICsyODYsMTIgQEAg aW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Omluc2VydGlvblBvaQogICAgIHJldHVybiAtMTsK IH0KIAorYm9vbCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzdXBwb3J0c1ByZXNzQWN0aW9uKCkK K3sKKyAgICBOU0FycmF5KiBhY3Rpb25zID0gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5QWN0aW9u TmFtZXNdOworICAgIHJldHVybiBbYWN0aW9ucyBjb250YWluc09iamVjdDpAIkFYUHJlc3MiXTsK K30KKwogLy8gcGFyYW1ldGVyaXplZCBhdHRyaWJ1dGVzCiBpbnQgQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6bGluZUZvckluZGV4KGludCBpbmRleCkKIHsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDM2ODE1 KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQg QEAKKzIwMDgtMDktMjMgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgZm9yIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA0MSAiQWRkIAorICAgICAgICBDb250 YWN0IiBsaW5rIGF0IGdtYWlsIGRvZXMgbm90IHN1cHBvcnQgQVhQcmVzcyBhY3Rpb24KKyAgICAg ICAgYW5kIGNvcnJlc3BvbmRpbmc6IDxyZGFyOi8vcHJvYmxlbS82MjE2MTc4PgorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9hcmlhLWxpbmstc3VwcG9ydHMtcHJlc3MtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGluay1zdXBwb3J0cy1wcmVzcy5o dG1sOiBBZGRlZC4KKwogMjAwOC0wOS0yMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJldGggRGFraW4uCkluZGV4OiBMYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L2FyaWEtbGluay1zdXBwb3J0cy1wcmVzcy1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxpbmstc3VwcG9ydHMtcHJl c3MtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9hcmlhLWxpbmstc3VwcG9ydHMtcHJlc3MtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDMgQEAKK0NsaWNrCisKK1NVQ0NFU1MhIFRoaXMgdGVzdCBwYXNzZXMgYmVjYXVzZSB0 aGUgQVJJQSBsaW5rIGFib3ZlIHN1cHBvcnRzIHRoZSBwcmVzcyBhY3Rpb24uCkluZGV4OiBMYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGluay1zdXBwb3J0cy1wcmVzcy5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1saW5rLXN1cHBvcnRzLXBy ZXNzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEt bGluay1zdXBwb3J0cy1wcmVzcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI4IEBACis8 aHRtbD4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8Ym9k eT4KKzxkaXYgaWQ9ImxpbmsiIHJvbGU9ImxpbmsiIHRhYmluZGV4PSIwIj5DbGljazwvZGl2Pgor Cis8YnI+CisKKzxzcGFuIGlkPSJyZXN1bHQiPlRvIHJ1biB0aGlzIHRlc3Qgb3V0c2lkZSBvZiBE UlQsIHVzZSB0aGUgQWNjc3NpYmlsaXR5IEluc3BlY3RvciB0byBpbnNwZWN0IHRoZSBsaW5rIGFi b3ZlLCBhbmQgbWFrZSBzdXJlIEFYUHJlc3NlZCBpcyBsaXN0ZWQgYXMgYSBzdXBwb3J0ZWQgYWN0 aW9uLjwvc3Bhbj4KKworPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250 cm9sbGVyKSB7CisgICAgICAgIHZhciBsaW5rID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImxp bmsiKTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1 bHQiKTsKKyAgICAgICAgCisgICAgICAgIGxpbmsuZm9jdXMoKTsKKyAgICAgICAgdmFyIHN1cHBv cnRzQWN0aW9uID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuc3VwcG9y dHNQcmVzc0FjdGlvbjsKKyAgICAgICAgaWYgKHN1cHBvcnRzQWN0aW9uKQorICAgICAgICAgICAg cmVzdWx0LmlubmVySFRNTCA9ICJTVUNDRVNTISBUaGlzIHRlc3QgcGFzc2VzIGJlY2F1c2UgdGhl IEFSSUEgbGluayBhYm92ZSBzdXBwb3J0cyB0aGUgcHJlc3MgYWN0aW9uLiI7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIHJlc3VsdC5pbm5lckhUTUwgPSAiRkFJTCEgVGhpcyB0ZXN0IGZhaWxz IGJlY2F1c2UgdGhlIEFSSUEgbGluayBhYm92ZSBkb2VzIE5PVCBzdXBwb3J0IHRoZSBwcmVzcyBh Y3Rpb24sIGJ1dCBpdCBzaG91bGQuIjsKKyAgICB9Cis8L3NjcmlwdD4KKworPC9ib2R5PgorPC9o dG1sPgo=