197200 2019-04-23 09:07:27 -0700 AX: Provide iOS method for setting focus 2019-04-26 09:36:36 -0700 1 1 1 Unclassified WebKit Accessibility Other All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall achristensen apinheiro commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1529612 0 cfleizach 2019-04-23 09:07:27 -0700 Provide an iOS Accessibility method that can be used to set focus on a specific object 1529613 1 webkit-bug-importer 2019-04-23 09:07:42 -0700 <rdar://problem/50131679> 1529631 2 368037 cfleizach 2019-04-23 09:52:22 -0700 Created attachment 368037 patch 1530586 3 368291 cfleizach 2019-04-25 17:20:03 -0700 Created attachment 368291 patch 1530697 4 368291 commit-queue 2019-04-26 09:36:34 -0700 Comment on attachment 368291 patch Clearing flags on attachment: 368291 Committed r244691: <https://trac.webkit.org/changeset/244691> 1530698 5 commit-queue 2019-04-26 09:36:36 -0700 All reviewed patches have been landed. Closing bug. 368037 2019-04-23 09:52:22 -0700 2019-04-25 17:20:03 -0700 patch patch text/plain 5428 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NDU0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA0LTIzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFByb3ZpZGUgaU9T IG1ldGhvZCBmb3Igc2V0dGluZyBmb2N1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjAwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDEzMTY3 OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQdXQg dGhlIGZvY3VzIHNldHRpbmcgY29kZSBpbiBhIHBsYWNlIHRoYXQgaU9TIGFuZCBtYWNPUyBjYW4g YWNjZXNzLgorICAgICAgICBPdmVycmlkZSBhIHBsYXRmb3JtIGxldmVsIG1ldGhvZCBmb3Igc2V0 dGluZyBmb2N1cyBvbiBpT1MuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIgX2FjY2Vzc2liaWxpdHlTZXRGb2N1czpdKToKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaDoKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2Uu bW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZSBiYXNlQWNj ZXNzaWJpbGl0eVNldEZvY3VzOl0pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNldFZhbHVlOmZvckF0dHJpYnV0ZTpdKToK KwogMjAxOS0wNC0yMyAgUmVteSBEZW1hcmVzdCAgPHJkZW1hcmVzdEBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IGxheW91dCBpc3N1ZXMgb2NjdXJpbmcgd2hlbiBlbnRlcmluZyBmdWxsIHNjcmVl biBtb2RlLgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHJl dmlzaW9uIDI0NDQ1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaW9zL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDI2LDYg KzIwMjYsMTEgQEAKICAgICBbc2VsZiBhY2Nlc3NpYmlsaXR5TW9kaWZ5U2VsZWN0aW9uOmdyYW51 bGFyaXR5IGluY3JlYXNlOllFU107CiB9CiAKKy0gKHZvaWQpX2FjY2Vzc2liaWxpdHlTZXRGb2N1 czooQk9PTClmb2N1cworeworICAgIFtzZWxmIGJhc2VBY2Nlc3NpYmlsaXR5U2V0Rm9jdXM6Zm9j dXNdOworfQorCiAtICh2b2lkKWFjY2Vzc2liaWxpdHlEZWNyZWFzZVNlbGVjdGlvbjooVGV4dEdy YW51bGFyaXR5KWdyYW51bGFyaXR5CiB7CiAgICAgW3NlbGYgYWNjZXNzaWJpbGl0eU1vZGlmeVNl bGVjdGlvbjpncmFudWxhcml0eSBpbmNyZWFzZTpOT107CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlckJhc2UuaAkocmV2aXNpb24gMjQ0NDUwKQorKysgU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAKIC0gKE5TU3RyaW5nICopYmFzZUFjY2Vz c2liaWxpdHlIZWxwVGV4dDsKIC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKiliYXNlQWNjZXNzaWJp bGl0eVNwZWVjaEhpbnQ7CiAKKy0gKHZvaWQpYmFzZUFjY2Vzc2liaWxpdHlTZXRGb2N1czooQk9P TClmb2N1czsKIC0gKE5TU3RyaW5nICopYXJpYUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uOwogCiAt IChpZClhdHRhY2htZW50VmlldzsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlckJhc2UubW0JKHJldmlzaW9uIDI0NDQ1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQkod29ya2luZyBj b3B5KQpAQCAtNTcxLDYgKzU3MSwyNyBAQAogICAgIH0KIH0KIAorLSAodm9pZCliYXNlQWNjZXNz aWJpbGl0eVNldEZvY3VzOihCT09MKWZvY3VzCit7CisgICAgLy8gSWYgZm9jdXMgaXMganVzdCBz ZXQgd2l0aG91dCBtYWtpbmcgdGhlIHZpZXcgdGhlIGZpcnN0IHJlc3BvbmRlciwgdGhlbiBrZXli b2FyZCBmb2N1cyB3b24ndCBtb3ZlIHRvIHRoZSByaWdodCBwbGFjZS4KKyAgICBpZiAoZm9jdXMg JiYgIW1fb2JqZWN0LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS5pc0ZvY3VzZWRB bmRBY3RpdmUoKSkgeworICAgICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fb2JqZWN0LT5k b2N1bWVudEZyYW1lVmlldygpOworICAgICAgICBQYWdlKiBwYWdlID0gbV9vYmplY3QtPnBhZ2Uo KTsKKyAgICAgICAgaWYgKHBhZ2UgJiYgZnJhbWVWaWV3KSB7CisgICAgICAgICAgICBDaHJvbWVD bGllbnQmIGNocm9tZUNsaWVudCA9IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpOworICAgICAgICAg ICAgY2hyb21lQ2xpZW50LmZvY3VzKCk7CisKKyAgICAgICAgICAgIC8vIExlZ2FjeSBXZWJLaXQx IGNhc2UuCisgICAgICAgICAgICBpZiAoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKQorICAg ICAgICAgICAgICAgIGNocm9tZUNsaWVudC5tYWtlRmlyc3RSZXNwb25kZXIoZnJhbWVWaWV3LT5w bGF0Zm9ybVdpZGdldCgpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjaHJv bWVDbGllbnQuYXNzaXN0aXZlVGVjaG5vbG9neU1ha2VGaXJzdFJlc3BvbmRlcigpOworICAgICAg ICB9CisgICAgfQorCisgICAgbV9vYmplY3QtPnNldEZvY3VzZWQoZm9jdXMpOworfQorCiAtIChO U1N0cmluZyAqKWFjY2Vzc2liaWxpdHlQbGF0Zm9ybU1hdGhTdWJzY3JpcHRLZXkKIHsKICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyTWFjLm1tCShyZXZpc2lvbiAyNDQ0NTApCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMzY5OCwyNyArMzY5OCw3IEBACiAgICAgICAgIEFTU0VSVCh0ZXh0TWFya2VyUmFuZ2Up OwogICAgICAgICBtX29iamVjdC0+c2V0U2VsZWN0ZWRWaXNpYmxlUG9zaXRpb25SYW5nZShbc2Vs ZiB2aXNpYmxlUG9zaXRpb25SYW5nZUZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2Vd KTsKICAgICB9IGVsc2UgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzogTlNBY2Nl c3NpYmlsaXR5Rm9jdXNlZEF0dHJpYnV0ZV0pIHsKLSAgICAgICAgQVNTRVJUKG51bWJlcik7Ci0g ICAgICAgIAotICAgICAgICBib29sIGZvY3VzID0gW251bWJlciBib29sVmFsdWVdOwotICAgICAg ICAKLSAgICAgICAgLy8gSWYgZm9jdXMgaXMganVzdCBzZXQgd2l0aG91dCBtYWtpbmcgdGhlIHZp ZXcgdGhlIGZpcnN0IHJlc3BvbmRlciwgdGhlbiBrZXlib2FyZCBmb2N1cyB3b24ndCBtb3ZlIHRv IHRoZSByaWdodCBwbGFjZS4KLSAgICAgICAgaWYgKGZvY3VzICYmICFtX29iamVjdC0+ZG9jdW1l bnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCkuaXNGb2N1c2VkQW5kQWN0aXZlKCkpIHsKLSAgICAg ICAgICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV9vYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3 KCk7Ci0gICAgICAgICAgICBQYWdlKiBwYWdlID0gbV9vYmplY3QtPnBhZ2UoKTsKLSAgICAgICAg ICAgIGlmIChwYWdlICYmIGZyYW1lVmlldykgewotICAgICAgICAgICAgICAgIENocm9tZUNsaWVu dCYgY2hyb21lQ2xpZW50ID0gcGFnZS0+Y2hyb21lKCkuY2xpZW50KCk7Ci0gICAgICAgICAgICAg ICAgY2hyb21lQ2xpZW50LmZvY3VzKCk7Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAg ICAgLy8gTGVnYWN5IFdlYktpdDEgY2FzZS4KLSAgICAgICAgICAgICAgICBpZiAoZnJhbWVWaWV3 LT5wbGF0Zm9ybVdpZGdldCgpKQotICAgICAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQubWFr ZUZpcnN0UmVzcG9uZGVyKGZyYW1lVmlldy0+cGxhdGZvcm1XaWRnZXQoKSk7Ci0gICAgICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQuYXNzaXN0aXZlVGVj aG5vbG9neU1ha2VGaXJzdFJlc3BvbmRlcigpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgICAgIAotICAgICAgICBtX29iamVjdC0+c2V0Rm9jdXNlZChmb2N1cyk7CisgICAgICAgIFtz ZWxmIGJhc2VBY2Nlc3NpYmlsaXR5U2V0Rm9jdXM6W251bWJlciBib29sVmFsdWVdOwogICAgIH0g ZWxzZSBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlW YWx1ZUF0dHJpYnV0ZV0pIHsKICAgICAgICAgaWYgKG51bWJlciAmJiBtX29iamVjdC0+Y2FuU2V0 TnVtZXJpY1ZhbHVlKCkpCiAgICAgICAgICAgICBtX29iamVjdC0+c2V0VmFsdWUoW251bWJlciBm bG9hdFZhbHVlXSk7Cg== 368291 2019-04-25 17:20:03 -0700 2019-04-26 09:36:34 -0700 patch patch text/plain 5411 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NDY2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA0LTI1ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFByb3ZpZGUgaU9T IG1ldGhvZCBmb3Igc2V0dGluZyBmb2N1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjAwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDEzMTY3 OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQdXQg dGhlIGZvY3VzIHNldHRpbmcgY29kZSBpbiBhIHBsYWNlIHRoYXQgaU9TIGFuZCBtYWNPUyBjYW4g YWNjZXNzLgorICAgICAgICBPdmVycmlkZSBhIHBsYXRmb3JtIGxldmVsIG1ldGhvZCBmb3Igc2V0 dGluZyBmb2N1cyBvbiBpT1MuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIgX2FjY2Vzc2liaWxpdHlTZXRGb2N1czpdKToKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaDoKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2Uu bW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZSBiYXNlQWNj ZXNzaWJpbGl0eVNldEZvY3VzOl0pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNldFZhbHVlOmZvckF0dHJpYnV0ZTpdKToK KwogMjAxOS0wNC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAg ICAgICAgRGlzYWJsZSBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgb24gaU9TTWFjLgpJbmRleDogU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3Mv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHJldmlzaW9uIDI0NDY2OSkKKysr IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaW9zL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDA3LDYgKzIwMDcsMTEgQEAKICAgICBb c2VsZiBhY2Nlc3NpYmlsaXR5TW9kaWZ5U2VsZWN0aW9uOmdyYW51bGFyaXR5IGluY3JlYXNlOllF U107CiB9CiAKKy0gKHZvaWQpX2FjY2Vzc2liaWxpdHlTZXRGb2N1czooQk9PTClmb2N1cworewor ICAgIFtzZWxmIGJhc2VBY2Nlc3NpYmlsaXR5U2V0Rm9jdXM6Zm9jdXNdOworfQorCiAtICh2b2lk KWFjY2Vzc2liaWxpdHlEZWNyZWFzZVNlbGVjdGlvbjooVGV4dEdyYW51bGFyaXR5KWdyYW51bGFy aXR5CiB7CiAgICAgW3NlbGYgYWNjZXNzaWJpbGl0eU1vZGlmeVNlbGVjdGlvbjpncmFudWxhcml0 eSBpbmNyZWFzZTpOT107CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJh c2UuaAkocmV2aXNpb24gMjQ0NjY5KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAg LTgxLDYgKzgxLDcgQEAKIC0gKE5TU3RyaW5nICopYmFzZUFjY2Vzc2liaWxpdHlIZWxwVGV4dDsK IC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKiliYXNlQWNjZXNzaWJpbGl0eVNwZWVjaEhpbnQ7CiAK Ky0gKHZvaWQpYmFzZUFjY2Vzc2liaWxpdHlTZXRGb2N1czooQk9PTClmb2N1czsKIC0gKE5TU3Ry aW5nICopYXJpYUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uOwogCiAtIChpZClhdHRhY2htZW50Vmll dzsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQmFzZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0JKHJldmlz aW9uIDI0NDY2OSkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTcxLDYgKzU3 MSwyNyBAQAogICAgIH0KIH0KIAorLSAodm9pZCliYXNlQWNjZXNzaWJpbGl0eVNldEZvY3VzOihC T09MKWZvY3VzCit7CisgICAgLy8gSWYgZm9jdXMgaXMganVzdCBzZXQgd2l0aG91dCBtYWtpbmcg dGhlIHZpZXcgdGhlIGZpcnN0IHJlc3BvbmRlciwgdGhlbiBrZXlib2FyZCBmb2N1cyB3b24ndCBt b3ZlIHRvIHRoZSByaWdodCBwbGFjZS4KKyAgICBpZiAoZm9jdXMgJiYgIW1fb2JqZWN0LT5kb2N1 bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS5pc0ZvY3VzZWRBbmRBY3RpdmUoKSkgeworICAg ICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fb2JqZWN0LT5kb2N1bWVudEZyYW1lVmlldygp OworICAgICAgICBQYWdlKiBwYWdlID0gbV9vYmplY3QtPnBhZ2UoKTsKKyAgICAgICAgaWYgKHBh Z2UgJiYgZnJhbWVWaWV3KSB7CisgICAgICAgICAgICBDaHJvbWVDbGllbnQmIGNocm9tZUNsaWVu dCA9IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpOworICAgICAgICAgICAgY2hyb21lQ2xpZW50LmZv Y3VzKCk7CisKKyAgICAgICAgICAgIC8vIExlZ2FjeSBXZWJLaXQxIGNhc2UuCisgICAgICAgICAg ICBpZiAoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKQorICAgICAgICAgICAgICAgIGNocm9t ZUNsaWVudC5tYWtlRmlyc3RSZXNwb25kZXIoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKTsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQuYXNzaXN0aXZl VGVjaG5vbG9neU1ha2VGaXJzdFJlc3BvbmRlcigpOworICAgICAgICB9CisgICAgfQorCisgICAg bV9vYmplY3QtPnNldEZvY3VzZWQoZm9jdXMpOworfQorCiAtIChOU1N0cmluZyAqKWFjY2Vzc2li aWxpdHlQbGF0Zm9ybU1hdGhTdWJzY3JpcHRLZXkKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCShyZXZpc2lv biAyNDQ2NjkpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzg3MSwyNyArMzg3 MSw3IEBACiAgICAgICAgIEFTU0VSVCh0ZXh0TWFya2VyUmFuZ2UpOwogICAgICAgICBtX29iamVj dC0+c2V0U2VsZWN0ZWRWaXNpYmxlUG9zaXRpb25SYW5nZShbc2VsZiB2aXNpYmxlUG9zaXRpb25S YW5nZUZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2VdKTsKICAgICB9IGVsc2UgaWYg KFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZEF0 dHJpYnV0ZV0pIHsKLSAgICAgICAgQVNTRVJUKG51bWJlcik7Ci0gICAgICAgIAotICAgICAgICBi b29sIGZvY3VzID0gW251bWJlciBib29sVmFsdWVdOwotICAgICAgICAKLSAgICAgICAgLy8gSWYg Zm9jdXMgaXMganVzdCBzZXQgd2l0aG91dCBtYWtpbmcgdGhlIHZpZXcgdGhlIGZpcnN0IHJlc3Bv bmRlciwgdGhlbiBrZXlib2FyZCBmb2N1cyB3b24ndCBtb3ZlIHRvIHRoZSByaWdodCBwbGFjZS4K LSAgICAgICAgaWYgKGZvY3VzICYmICFtX29iamVjdC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2Vs ZWN0aW9uKCkuaXNGb2N1c2VkQW5kQWN0aXZlKCkpIHsKLSAgICAgICAgICAgIEZyYW1lVmlldyog ZnJhbWVWaWV3ID0gbV9vYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7Ci0gICAgICAgICAgICBQ YWdlKiBwYWdlID0gbV9vYmplY3QtPnBhZ2UoKTsKLSAgICAgICAgICAgIGlmIChwYWdlICYmIGZy YW1lVmlldykgewotICAgICAgICAgICAgICAgIENocm9tZUNsaWVudCYgY2hyb21lQ2xpZW50ID0g cGFnZS0+Y2hyb21lKCkuY2xpZW50KCk7Ci0gICAgICAgICAgICAgICAgY2hyb21lQ2xpZW50LmZv Y3VzKCk7Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgLy8gTGVnYWN5IFdlYktp dDEgY2FzZS4KLSAgICAgICAgICAgICAgICBpZiAoZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgp KQotICAgICAgICAgICAgICAgICAgICBjaHJvbWVDbGllbnQubWFrZUZpcnN0UmVzcG9uZGVyKGZy YW1lVmlldy0+cGxhdGZvcm1XaWRnZXQoKSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBjaHJvbWVDbGllbnQuYXNzaXN0aXZlVGVjaG5vbG9neU1ha2VGaXJzdFJl c3BvbmRlcigpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIAotICAgICAgICBt X29iamVjdC0+c2V0Rm9jdXNlZChmb2N1cyk7CisgICAgICAgIFtzZWxmIGJhc2VBY2Nlc3NpYmls aXR5U2V0Rm9jdXM6W251bWJlciBib29sVmFsdWVdXTsKICAgICB9IGVsc2UgaWYgKFthdHRyaWJ1 dGVOYW1lIGlzRXF1YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdKSB7 CiAgICAgICAgIGlmIChudW1iZXIgJiYgbV9vYmplY3QtPmNhblNldE51bWVyaWNWYWx1ZSgpKQog ICAgICAgICAgICAgbV9vYmplY3QtPnNldFZhbHVlKFtudW1iZXIgZmxvYXRWYWx1ZV0pOwo=