55706 2011-03-03 14:33:24 -0800 AX: WK1 needs to use ScrollView attachment for AXScrollArea, WK2 does not 2011-03-07 14:31:51 -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 361947 0 cfleizach 2011-03-03 14:33:24 -0800 In WK1, ScrollView does not have a handle on the scroll bars. those are handled by the platformWidget In WK2, ScrollView does have a handle on the scroll bars, since there is no platform widget The changes to support WK2 Scroll views did not account for this. The fix is to expose the platform widget as the parent of the web area in WK1 and use the ScrollView AX object representation in WK2 361976 1 84633 cfleizach 2011-03-03 14:57:43 -0800 Created attachment 84633 patch 363585 2 cfleizach 2011-03-07 14:31:51 -0800 http://trac.webkit.org/changeset/80498 84633 2011-03-03 14:57:43 -0800 2011-03-07 13:54:08 -0800 patch patch.txt text/plain 14186 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0zMDgsNiArMzA4LDcgQEAgX19a TjdXZWJDb3JlMTJjcmVhdGVNYXJrdXBFUEtOU181UmFuZ2VFUAogX19aTjdXZWJDb3JlMTJnY0Nv bnRyb2xsZXJFdgogX19aTjdXZWJDb3JlMTJpY29uRGF0YWJhc2VFdgogX19aTjdXZWJDb3JlMTNB WE9iamVjdENhY2hlMTByb290T2JqZWN0RXYKK19fWk43V2ViQ29yZTEzQVhPYmplY3RDYWNoZTE4 cm9vdE9iamVjdEZvckZyYW1lRVBOU181RnJhbWVFCiBfX1pON1dlYkNvcmUxM0FYT2JqZWN0Q2Fj aGUyMWdBY2Nlc3NpYmlsaXR5RW5hYmxlZEUKIF9fWk43V2ViQ29yZTEzQVhPYmplY3RDYWNoZTQy Z0FjY2Vzc2liaWxpdHlFbmhhbmNlZFVzZXJJbnRlcmZhY2VFbmFibGVkRQogX19aTjdXZWJDb3Jl MTNIVFRQSGVhZGVyTWFwQzFFdgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYT2JqZWN0Q2FjaGUuY3BwCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5MCw2 ICsyOTAsMTEgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQVhPYmplY3RDYWNoZTo6cm9vdAogICAg IHJldHVybiBnZXRPckNyZWF0ZShtX2RvY3VtZW50LT52aWV3KCkpOwogfQogCitBY2Nlc3NpYmls aXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpyb290T2JqZWN0Rm9yRnJhbWUoRnJhbWUqIGZyYW1l KQoreworICAgIHJldHVybiBnZXRPckNyZWF0ZShmcmFtZS0+dmlldygpKTsKK30gICAgCisgICAg CiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZShBY2Nlc3Np YmlsaXR5Um9sZSByb2xlKQogewogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBvYmog PSAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hl LmgJKHJldmlzaW9uIDgwMTc1KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDEwIEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1c2VkVUlFbGVtZW50Rm9yUGFnZShj b25zdCBQYWdlKik7CiAKKyAgICAvLyBSZXR1cm5zIHRoZSByb290IG9iamVjdCBmb3IgdGhlIGVu dGlyZSBkb2N1bWVudC4KICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiByb290T2JqZWN0KCk7Cisg ICAgLy8gUmV0dXJucyB0aGUgcm9vdCBvYmplY3QgZm9yIGEgc3BlY2lmaWMgZnJhbWUuCisgICAg QWNjZXNzaWJpbGl0eU9iamVjdCogcm9vdE9iamVjdEZvckZyYW1lKEZyYW1lKik7CiAgICAgCiAg ICAgLy8gRm9yIEFYIG9iamVjdHMgd2l0aCBlbGVtZW50cyB0aGF0IGJhY2sgdGhlbS4KICAgICBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBnZXRPckNyZWF0ZShSZW5kZXJPYmplY3QqKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNj cm9sbFZpZXcuY3BwCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2 ICszMiw3IEBACiAjaW5jbHVkZSAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCiAjaW5jbHVkZSAi UmVuZGVyUGFydC5oIgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKKyNpbmNsdWRlICJXaWRnZXQu aCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIApAQCAtNjMsNiArNjQsMTkgQEAgY29uc3Qg QWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eQogICAgICAgICBhZGRDaGlsZHJlbigp OwogICAgIHJldHVybiBtX2NoaWxkcmVuOwogfQorCisvLyBJZiB0aGlzIGlzIFdlYktpdDEgdGhl biB0aGUgbmF0aXZlIHNjcm9sbCB2aWV3IG5lZWRzIHRvIHJldHVybiB0aGUKKy8vIEFYIGluZm9y bWF0aW9uIChiZWNhdXNlIHRoZXJlIGFyZSBubyBzY3JvbGwgYmFyIGNoaWxkcmVuIGluIHRoZSBT Y3JvbGxWaWV3IG9iamVjdCBpbiBXSzEpLgorLy8gSW4gV2ViS2l0MiwgdGhlIFNjcm9sbFZpZXcg b2JqZWN0IHdpbGwgcmV0dXJuIHRoZSBBWCBpbmZvcm1hdGlvbiAoYmVjYXVzZSB0aGVyZSBhcmUg bm8gcGxhdGZvcm0gd2lkZ2V0cykuCitib29sIEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3Ojppc0F0 dGFjaG1lbnQoKSBjb25zdAoreworICAgIHJldHVybiBtX3Njcm9sbFZpZXctPnBsYXRmb3JtV2lk Z2V0KCk7Cit9CisKK1dpZGdldCogQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OndpZGdldEZvckF0 dGFjaG1lbnRWaWV3KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9zY3JvbGxWaWV3LmdldCgpOwor fQogICAgIAogdm9pZCBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6dXBkYXRlQ2hpbGRyZW5JZk5l Y2Vzc2FyeSgpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlTY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDUsNiArNDUsMTAgQEAgcHJpdmF0ZToKICAgICAKICAgICB2aXJ0dWFsIGJv b2wgYWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg dmlydHVhbCBib29sIGlzQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcoKSBjb25zdCB7IHJldHVybiB0 cnVlOyB9CisgICAgCisgICAgdmlydHVhbCBib29sIGlzQXR0YWNobWVudCgpIGNvbnN0OworICAg IHZpcnR1YWwgV2lkZ2V0KiB3aWRnZXRGb3JBdHRhY2htZW50VmlldygpIGNvbnN0OworICAgIAog ICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlP cmllbnRhdGlvbikgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkcmVuKCk7CiAgICAg dmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBhY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJ bnRQb2ludCYpIGNvbnN0OwpAQCAtNTYsNiArNjAsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwg QWNjZXNzaWJpbGl0eU9iamVjdCogcGFyZW50T2JqZWN0KCkgY29uc3Q7CiAgICAgCiAgICAgQWNj ZXNzaWJpbGl0eU9iamVjdCogd2ViQXJlYU9iamVjdCgpIGNvbnN0OworICAgIHZpcnR1YWwgQWNj ZXNzaWJpbGl0eU9iamVjdCogZmlyc3RDaGlsZCgpIGNvbnN0IHsgcmV0dXJuIHdlYkFyZWFPYmpl Y3QoKTsgfQogICAgIEFjY2Vzc2liaWxpdHlTY3JvbGxiYXIqIGFkZENoaWxkU2Nyb2xsYmFyKFNj cm9sbGJhciopOwogICAgIHZvaWQgcmVtb3ZlQ2hpbGRTY3JvbGxiYXIoQWNjZXNzaWJpbGl0eU9i amVjdCopOwogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9u IDgwMTc1KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTE1NDMsOSArMTU0MywxNSBAQCAt IChpZClhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyCiAgICAgICAgIH0KICAgICAg ICAgCiAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudCA9IG1fb2JqZWN0LT5wYXJl bnRPYmplY3RVbmlnbm9yZWQoKTsKLSAgICAgICAgaWYgKHBhcmVudCkKLSAgICAgICAgICAgIHJl dHVybiBwYXJlbnQtPndyYXBwZXIoKTsKLSAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAgICAgaWYg KCFwYXJlbnQpCisgICAgICAgICAgICByZXR1cm4gbmlsOworCisgICAgICAgIC8vIEluIFdlYktp dDEsIHRoZSBzY3JvbGwgdmlldyBpcyBwcm92aWRlZCBieSB0aGUgc3lzdGVtICh0aGUgYXR0YWNo bWVudCB2aWV3KSwgc28gdGhlIHBhcmVudAorICAgICAgICAvLyBzaG91bGQgYmUgcmVwb3J0ZWQg ZGlyZWN0bHkgYXMgc3VjaC4KKyAgICAgICAgaWYgKG1fb2JqZWN0LT5pc1dlYkFyZWEoKSAmJiBw YXJlbnQtPmlzQXR0YWNobWVudCgpKQorICAgICAgICAgICAgcmV0dXJuIFtwYXJlbnQtPndyYXBw ZXIoKSBhdHRhY2htZW50Vmlld107CisgICAgICAgIAorICAgICAgICByZXR1cm4gcGFyZW50LT53 cmFwcGVyKCk7CiAgICAgfQogCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmlu ZzogTlNBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5BdHRyaWJ1dGVdKSB7CkluZGV4OiBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCShyZXZpc2lvbiA4MDI4NSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTAzLTAzICBDaHJpcyBGbGVpemFjaCAg PGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQVg6IFdLMSBuZWVkcyB0byB1c2UgU2Nyb2xsVmlldyBhdHRhY2htZW50 IGZvciBBWFNjcm9sbEFyZWEsIFdLMiBkb2VzIG5vdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU3MDYKKworICAgICAgICBNYWtlIHN1cmUgV2ViRHlu YW1pY1Njcm9sbEJhcnNWaWV3IGFwcGVhciBpbiB0aGUgQVggdHJlZSBpbiBXSzEgKHNpbmNlIHRo aXMgb2JqZWN0CisgICAgICAgIHJldHVybnMgdGhlIHNjcm9sbCBiYXIgb2JqZWN0cykuCisgICAg ICAgIE1ha2UgdGhlIGFjY2Vzc2liaWxpdHlSb290IG9iamVjdCBiZSB0aGUgd2ViIGFyZWEgaW4g V0sxIGJlY2F1c2UgV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3CisgICAgICAgIHdpbGwgZXhwZWN0 IHRoYXQgYXMgaXRzIGNoaWxkLCBpbnN0ZWFkIG9mIHRoZSBXZWJDb3JlIFNjcm9sbFZpZXcgb2Jq ZWN0LgorCisgICAgICAgICogV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcubW06Cisg ICAgICAgICgtW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVk XSk6CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUg YWNjZXNzaWJpbGl0eVJvb3RdKToKKwogMjAxMS0wMy0wMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJh cnNWaWV3Lm1tCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01NTgsOSArNTU4 LDEwIEBAIC0gKHZvaWQpc2Nyb2xsV2hlZWw6KE5TRXZlbnQgKilldmVudAogICAgIFtzZWxmIHJl bGVhc2VdOwogfQogCisvLyBUaGlzIG9iamVjdCB3aWxsIGJlIHRoZSBwYXJlbnQgb2YgdGhlIHdl YiBhcmVhIGluIFdLMSwgc28gaXQgc2hvdWxkIG5vdCBiZSBpZ25vcmVkLgogLSAoQk9PTClhY2Nl c3NpYmlsaXR5SXNJZ25vcmVkIAogewotICAgIHJldHVybiBZRVM7CisgICAgcmV0dXJuIE5POwog fQogCiAtICh2b2lkKXNldFNjcm9sbE9yaWdpbjooTlNQb2ludClzY3JvbGxPcmlnaW4gdXBkYXRl UG9zaXRpb25BdEFsbDooQk9PTCl1cGRhdGVQb3NpdGlvbkF0QWxsIGltbWVkaWF0ZWx5OihCT09M KXVwZGF0ZVBvc2l0aW9uU3luY2hyb25vdXNseQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJGcmFtZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYkZyYW1lLm1tCShyZXZpc2lvbiA4MDE3NSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViRnJhbWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzNjUsMTAgKzEzNjUsMTYgQEAgLSAo aWQpYWNjZXNzaWJpbGl0eVJvb3QKICAgICBpZiAoIV9wcml2YXRlLT5jb3JlRnJhbWUgfHwgIV9w cml2YXRlLT5jb3JlRnJhbWUtPmRvY3VtZW50KCkpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAg Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcm9vdE9iamVjdCA9IF9wcml2YXRlLT5jb3JlRnJh bWUtPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cm9vdE9iamVjdCgpOwotICAgIGlmIChy b290T2JqZWN0KQotICAgICAgICByZXR1cm4gcm9vdE9iamVjdC0+d3JhcHBlcigpOwotICAgIHJl dHVybiBuaWw7CisgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcm9vdE9iamVjdCA9IF9wcml2YXRl LT5jb3JlRnJhbWUtPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cm9vdE9iamVjdEZvckZy YW1lKF9wcml2YXRlLT5jb3JlRnJhbWUpOworICAgIGlmICghcm9vdE9iamVjdCkKKyAgICAgICAg cmV0dXJuIG5pbDsKKyAgICAKKyAgICAvLyBUaGUgcm9vdCBvYmplY3Qgd2lsbCBiZSBhIFdlYkNv cmUgc2Nyb2xsIHZpZXcgb2JqZWN0LiBJbiBXSzEsIHNjcm9sbCB2aWV3cyBhcmUgaGFuZGxlZAor ICAgIC8vIGJ5IHRoZSBzeXN0ZW0gYW5kIHRoZSByb290IG9iamVjdCBzaG91bGQgYmUgdGhlIHdl YiBhcmVhIChpbnN0ZWFkIG9mIHRoZSBzY3JvbGwgdmlldykuCisgICAgaWYgKHJvb3RPYmplY3Qt PmlzQXR0YWNobWVudCgpICYmIHJvb3RPYmplY3QtPmZpcnN0Q2hpbGQoKSkKKyAgICAgICAgcmV0 dXJuIHJvb3RPYmplY3QtPmZpcnN0Q2hpbGQoKS0+d3JhcHBlcigpOworICAgIAorICAgIHJldHVy biByb290T2JqZWN0LT53cmFwcGVyKCk7CiAjZWxzZQogICAgIHJldHVybiBuaWw7CiAjZW5kaWYK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDgwMjg1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTggQEAKKzIwMTEtMDMtMDMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBWDog V0sxIG5lZWRzIHRvIHVzZSB0aGUgU2Nyb2xsVmlldyBhdHRhY2htZW50IGZvciBBWFNjcm9sbEFy ZWEsIFdLMiBzaG91bGQgbm90IHVzZSB0aGlzIGVsZW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTcwNgorCisgICAgICAgIFRoZSByb290RWxl bWVudCBpbiBEUlQgc2hvdWxkIHBvaW50IHRvIHRoZSBzY3JvbGwgdmlldy4gSW4gV0sxLCB0aGF0 IHdpbGwgYmUgdGhlIHBhcmVudCBvZiB0aGUgcm9vdE9iamVjdC4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlck1hYy5tbToKKyAgICAgICAgKEFj Y2Vzc2liaWxpdHlDb250cm9sbGVyOjpmb2N1c2VkRWxlbWVudCk6CisgICAgICAgICAgIFJlbW92 ZSBGSVhNRSBjb21tZW50IGFib3V0IGNhY2hpbmcgdGhlIGZvY3VzZWRFbGVtZW50LiBJbiBmYWN0 LCB3ZSBzaG91bGRuJ3QgY2FjaGUgdGhpcyAKKyAgICAgICAgICAgYmVjYXVzZSBpdCBjb3VsZCBj aGFuZ2UgYXQgYW55IHRpbWUuCisgICAgICAgIChBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcjo6cm9v dEVsZW1lbnQpOgorCiAyMDExLTAzLTAzICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBUb29scy9E dW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyTWFj Lm1tCShyZXZpc2lvbiA4MDE3NSkKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3Np YmlsaXR5Q29udHJvbGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNiBAQCBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50IEFjY2Vzc2liaWxpdHlDb250CiAKIEFjY2Vzc2liaWxpdHlV SUVsZW1lbnQgQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXI6OmZvY3VzZWRFbGVtZW50KCkKIHsKLSAg ICAvLyBGSVhNRTogd2UgY291bGQgZG8gc29tZSBjYWNoaW5nIGhlcmUuCiAgICAgaWQgYWNjZXNz aWJpbGl0eU9iamVjdCA9IFtbbWFpbkZyYW1lIGFjY2Vzc2liaWxpdHlSb290XSBhY2Nlc3NpYmls aXR5Rm9jdXNlZFVJRWxlbWVudF07CiAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQo YWNjZXNzaWJpbGl0eU9iamVjdCk7CiB9CkBAIC01OCw3ICs1NywxMSBAQCBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50IEFjY2Vzc2liaWxpdHlDb250CiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50IEFjY2Vz c2liaWxpdHlDb250cm9sbGVyOjpyb290RWxlbWVudCgpCiB7CiAgICAgLy8gRklYTUU6IHdlIGNv dWxkIGRvIHNvbWUgY2FjaGluZyBoZXJlLgotICAgIGlkIGFjY2Vzc2liaWxpdHlPYmplY3QgPSBb bWFpbkZyYW1lIGFjY2Vzc2liaWxpdHlSb290XTsKKyAgICAKKyAgICAvLyBMYXlvdXQgdGVzdHMg ZXhwZWN0IHRoYXQgdGhlIHJvb3QgZWxlbWVudCB3aWxsIGJlIHRoZSBzY3JvbGwgYXJlYQorICAg IC8vIGNvbnRhaW5pbmcgdGhlIHdlYiBhcmVhIG9iamVjdC4gVGhhdCB3aWxsIGJlIHRoZSBwYXJl bnQgb2YgdGhlIGFjY2Vzc2liaWxpdHlSb290IG9uIFdLMS4KKyAgICAKKyAgICBpZCBhY2Nlc3Np YmlsaXR5T2JqZWN0ID0gW1ttYWluRnJhbWUgYWNjZXNzaWJpbGl0eVJvb3RdIGFjY2Vzc2liaWxp dHlBdHRyaWJ1dGVWYWx1ZTpOU0FjY2Vzc2liaWxpdHlQYXJlbnRBdHRyaWJ1dGVdOwogICAgIHJl dHVybiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50KGFjY2Vzc2liaWxpdHlPYmplY3QpOwogfQogCklu ZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCShyZXZpc2lvbiA4MDI4NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTAzLTAzICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQVg6IFdLMSBuZWVkcyB0byB1c2UgU2Nyb2xsVmlldyBhdHRhY2htZW50IGZv ciBBWFNjcm9sbEFyZWEsIFdLMiBkb2VzIG5vdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU3MDYKKworICAgICAgICBVcGRhdGUgdGVzdHMgdG8gcmVm bGVjdCBjb3JyZWN0IHNjcm9sbCBhcmVhIGJlaGF2aW9yIGZvciBhY2Nlc3NpYmlsaXR5LiAKKwor ICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3dlYmtpdC1zY3JvbGxhcmVhLWV4 cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS93ZWJraXQt c2Nyb2xsYXJlYS1wb3NpdGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vbWFj L2FjY2Vzc2liaWxpdHkvd2Via2l0LXNjcm9sbGFyZWEtcG9zaXRpb24uaHRtbDoKKyAgICAgICAg KiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS93ZWJraXQtc2Nyb2xsYXJlYS5odG1sOgorCiAy MDExLTAzLTAzICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODAyNzIuCkluZGV4OiBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS93ZWJraXQtc2Nyb2xsYXJlYS1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv d2Via2l0LXNjcm9sbGFyZWEtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA4MDE3NSkKKysrIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3dlYmtpdC1zY3JvbGxhcmVhLWV4cGVj dGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtOCw3ICs4LDcgQEAgT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQQogCiBQQVNTIGJvZHkucm9sZSBpcyAnQVhSb2xlOiBBWFdl YkFyZWEnCiBQQVNTIGJvZHkucGFyZW50RWxlbWVudCgpLnJvbGUgaXMgJ0FYUm9sZTogQVhTY3Jv bGxBcmVhJwotUEFTUyBib2R5LnBhcmVudEVsZW1lbnQoKS5jaGlsZHJlbkNvdW50IGlzIDEKK1BB U1MgYm9keS5wYXJlbnRFbGVtZW50KCkuY2hpbGRyZW5Db3VudCBpcyAzCiBQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3dlYmtpdC1zY3JvbGxhcmVhLXBvc2l0aW9uLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJp bGl0eS93ZWJraXQtc2Nyb2xsYXJlYS1wb3NpdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDgw MTc1KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvd2Via2l0LXNj cm9sbGFyZWEtcG9zaXRpb24tZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC04LDggKzgs OCBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBCiAKIFBBU1Mgc2Ny b2xsLnJvbGUgaXMgJ0FYUm9sZTogQVhTY3JvbGxBcmVhJwogUEFTUyB3ZWIucm9sZSBpcyAnQVhS b2xlOiBBWFdlYkFyZWEnCi1QQVNTIHNjcm9sbC55ID4gd2ViLnkgaXMgdHJ1ZQotUEFTUyBzY3Jv bGwueSA+IGluaXRpYWxTY3JvbGxZIGlzIHRydWUKK1BBU1Mgc2Nyb2xsLnkgPCB3ZWIueSBpcyB0 cnVlCitQQVNTIHdlYi55ID4gaW5pdGlhbFdlYlkgaXMgdHJ1ZQogUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvYWNjZXNzaWJpbGl0eS93ZWJraXQtc2Nyb2xsYXJlYS1wb3NpdGlvbi5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3dlYmtpdC1z Y3JvbGxhcmVhLXBvc2l0aW9uLmh0bWwJKHJldmlzaW9uIDgwMTc1KQorKysgTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvd2Via2l0LXNjcm9sbGFyZWEtcG9zaXRpb24uaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMzEsMTUgKzMxLDE2IEBAIHZhciBzdWNjZXNzZnVsbHlQYXJz ZWQgPSBmYWxzZTsKICAgICAgICAgc2hvdWxkQmUoInNjcm9sbC5yb2xlIiwgIidBWFJvbGU6IEFY U2Nyb2xsQXJlYSciKTsKICAgICAgICAgc2hvdWxkQmUoIndlYi5yb2xlIiwgIidBWFJvbGU6IEFY V2ViQXJlYSciKTsKIAotICAgICAgICB2YXIgaW5pdGlhbFNjcm9sbFkgPSBzY3JvbGwueTsKKyAg ICAgICAgdmFyIGluaXRpYWxXZWJZID0gd2ViLnk7CiAKICAgICAgICAgLy8gQ2F1c2UgZm9jdXMg dG8gc2Nyb2xsIGRvd24uCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXh0MiIp LmZvY3VzKCk7CiAKLSAgICAgICAgLy8gU2luY2UgZm9jdXMoKSBzaG91bGQgaGF2ZSBzY3JvbGxl ZCBkb3duLCB0aGUgc2Nyb2xsLnkgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiB3ZWIueAotICAgICAg ICAvLyBhbmQgaXQgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiB0aGUgaW5pdGlhbCBzY3JvbGwueSBw b3NpdGlvbi4KLSAgICAgICAgc2hvdWxkQmVUcnVlKCJzY3JvbGwueSA+IHdlYi55Iik7Ci0gICAg ICAgIHNob3VsZEJlVHJ1ZSgic2Nyb2xsLnkgPiBpbml0aWFsU2Nyb2xsWSIpOworICAgICAgICAv LyBTaW5jZSBmb2N1cygpIHNob3VsZCBoYXZlIHNjcm9sbGVkIGRvd24sIHRoZSB3ZWIueSBzaG91 bGQgYmUgZ3JlYXRlciB0aGFuIHNjcm9sbC55IHNpbmNlCisgICAgICAgIC8vIHRoZSBjb250ZW50 ICh3ZWIgYXJlYSkgaGFzIG1vdmVkLgorICAgICAgICAvLyBUaGUgd2ViIHBvc2l0aW9uIHNob3Vs ZCBhbHNvIGJlIGdyZWF0ZXIgdGhhbiB3aGVuIGl0IHN0YXJ0ZWQuCisgICAgICAgIHNob3VsZEJl VHJ1ZSgic2Nyb2xsLnkgPCB3ZWIueSIpOworICAgICAgICBzaG91bGRCZVRydWUoIndlYi55ID4g aW5pdGlhbFdlYlkiKTsKICAgICB9CiAKICAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpJ bmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvd2Via2l0LXNjcm9s bGFyZWEuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS93ZWJraXQtc2Nyb2xsYXJlYS5odG1sCShyZXZpc2lvbiA4MDE3NSkKKysrIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3dlYmtpdC1zY3JvbGxhcmVhLmh0bWwJ KHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDcgQEAgdGV4dAogICAgICAgICB2YXIgYm9keSA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OwogICAgICAgICBzaG91bGRC ZSgiYm9keS5yb2xlIiwgIidBWFJvbGU6IEFYV2ViQXJlYSciKTsKICAgICAgICAgc2hvdWxkQmUo ImJvZHkucGFyZW50RWxlbWVudCgpLnJvbGUiLCAiJ0FYUm9sZTogQVhTY3JvbGxBcmVhJyIpOwot ICAgICAgICBzaG91bGRCZSgiYm9keS5wYXJlbnRFbGVtZW50KCkuY2hpbGRyZW5Db3VudCIsICIx Iik7CisgICAgICAgIHNob3VsZEJlKCJib2R5LnBhcmVudEVsZW1lbnQoKS5jaGlsZHJlbkNvdW50 IiwgIjMiKTsKICAgICB9CiAKICAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwo=