185085 2018-04-27 13:06:10 -0700 AX: Accessibility needs to know which part of the content view is visible on iOS 2018-04-27 14:58:41 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 n_wang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1418590 0 n_wang 2018-04-27 13:06:10 -0700 We should expose the unobscuredContentRect() on iOS accessibility. 1418593 1 webkit-bug-importer 2018-04-27 13:06:34 -0700 <rdar://problem/39801363> 1418594 2 339017 n_wang 2018-04-27 13:18:42 -0700 Created attachment 339017 patch 1418595 3 339017 cfleizach 2018-04-27 13:24:36 -0700 Comment on attachment 339017 patch View in context: https://bugs.webkit.org/attachment.cgi?id=339017&action=review > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:1676 > + return CGRectZero; Does this account for objects in an iframe and various states of scroll offset and embedded iframes 1418596 4 n_wang 2018-04-27 13:31:30 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 339017 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=339017&action=review > > > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:1676 > > + return CGRectZero; > > Does this account for objects in an iframe and various states of scroll > offset and embedded iframes I think so, this is per frameview. 1418598 5 cfleizach 2018-04-27 13:32:38 -0700 Ok probably good to test that 1418604 6 339021 n_wang 2018-04-27 13:58:06 -0700 Created attachment 339021 patch added iframe test case 1418638 7 339021 commit-queue 2018-04-27 14:58:39 -0700 Comment on attachment 339021 patch Clearing flags on attachment: 339021 Committed r231113: <https://trac.webkit.org/changeset/231113> 1418639 8 commit-queue 2018-04-27 14:58:41 -0700 All reviewed patches have been landed. Closing bug. 339017 2018-04-27 13:18:42 -0700 2018-04-27 13:58:06 -0700 patch patch.txt text/plain 7144 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTAyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTI3ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxpdHkgbmVlZHMg dG8ga25vdyB3aGljaCBwYXJ0IG9mIHRoZSBjb250ZW50IHZpZXcgaXMgdmlzaWJsZSBvbiBpT1MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTA4NQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk4MDEzNjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlZCB1bm9ic2N1cmVkQ29udGVudFJlY3Qo KSB0byBpT1MgYWNjZXNzaWJpbGl0eSBvYmplY3Qgd3JhcHBlci4KKworICAgICAgICBUZXN0OiBh Y2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1jb250ZW50LXJlY3QuaHRtbAor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJJT1MubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vz c2liaWxpdHlWaXNpYmxlQ29udGVudFJlY3RdKToKKwogMjAxOC0wNC0yNSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQU09OOiBEb24ndCBjcmVhdGUgYSBuZXcg cHJvY2VzcyB3aGVuIG5hdmlnYXRpbmcgdG8gYSBibG9iIFVSTCwgZGF0YSBVUkwsIGFuZCBhYm91 dDpibGFuawpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHJl dmlzaW9uIDIzMTAyMikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaW9zL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjY2LDYg KzE2NjYsMTggQEAgLSAoQ0dSZWN0KWFjY2Vzc2liaWxpdHlFbGVtZW50UmVjdAogICAgIHJldHVy biBDR1JlY3RNYWtlKHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdo dCgpKTsKIH0KIAorLSAoQ0dSZWN0KWFjY2Vzc2liaWxpdHlWaXNpYmxlQ29udGVudFJlY3QKK3sK KyAgICBpZiAoIVtzZWxmIF9wcmVwYXJlQWNjZXNzaWJpbGl0eUNhbGxdKQorICAgICAgICByZXR1 cm4gQ0dSZWN0WmVybzsKKyAgICAKKyAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX29iamVjdC0+ ZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+dmlldygpKQorICAg ICAgICByZXR1cm4gQ0dSZWN0WmVybzsKKyAgICBJbnRSZWN0IHJlY3QgPSBzbmFwcGVkSW50UmVj dChkb2N1bWVudC0+dmlldygpLT51bm9ic2N1cmVkQ29udGVudFJlY3QoKSk7CisgICAgcmV0dXJu IFtzZWxmIGNvbnZlcnRSZWN0VG9TY3JlZW5TcGFjZTpyZWN0XTsKK30KKwogLy8gVGhlICJjZW50 ZXIgcG9pbnQiIGlzIHdoZXJlIFZvaWNlT3ZlciB3aWxsICJwcmVzcyIgYW4gb2JqZWN0LiBUaGlz IG1heSBub3QgYmUgdGhlIGFjdHVhbAogLy8gY2VudGVyIG9mIHRoZSBhY2Nlc3NpYmlsaXR5RnJh bWUKIC0gKENHUG9pbnQpYWNjZXNzaWJpbGl0eUFjdGl2YXRpb25Qb2ludApJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxMTEw KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTgtMDQtMjcgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogQWNj ZXNzaWJpbGl0eSBuZWVkcyB0byBrbm93IHdoaWNoIHBhcnQgb2YgdGhlIGNvbnRlbnQgdmlldyBp cyB2aXNpYmxlIG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1MDg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTgwMTM2Mz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvaW9zL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW06Cisg ICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ0F0dHJpYnV0ZVZhbHVl KToKKwogMjAxOC0wNC0yNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZGQgYSBtZWNoYW5pc20gdG8gb3ZlcnJpZGUg ZGVmYXVsdCB2aWV3cG9ydCBiZWhhdmlvcnMgaW4gZXh0cmEgem9vbSBtb2RlCkluZGV4OiBUb29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2lvcy9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50SU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvaW9zL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW0JKHJldmlzaW9uIDIzMTAyMikK KysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvaW9zL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnRJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAgLSAoTlNV SW50ZWdlcilhY2Nlc3NpYmlsaXR5QmxvY2txdW90ZUxldgogLSAoTlNBcnJheSAqKWFjY2Vzc2li aWxpdHlGaW5kTWF0Y2hpbmdPYmplY3RzOihOU0RpY3Rpb25hcnkgKilwYXJhbWV0ZXJzOwogLSAo TlNBcnJheTxOU1N0cmluZyAqPiAqKWFjY2Vzc2liaWxpdHlTcGVlY2hIaW50OwogLSAoQk9PTClf YWNjZXNzaWJpbGl0eUlzU3Ryb25nUGFzc3dvcmRGaWVsZDsKKy0gKENHUmVjdClhY2Nlc3NpYmls aXR5VmlzaWJsZUNvbnRlbnRSZWN0OwogCiAvLyBUZXh0TWFya2VyIHJlbGF0ZWQKIC0gKE5TQXJy YXkgKil0ZXh0TWFya2VyUmFuZ2U7CkBAIC0zNTYsNiArMzU3LDEyIEBAIEpTUmV0YWluUHRyPEpT U3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUkKICAgICAKICAgICBpZiAoSlNTdHJpbmdJc0VxdWFs VG9VVEY4Q1N0cmluZyhhdHRyaWJ1dGUsICJBWFNvcnREaXJlY3Rpb24iKSkKICAgICAgICAgcmV0 dXJuIFtbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlTb3J0RGlyZWN0aW9uXSBjcmVhdGVKU1N0cmlu Z1JlZl07CisgICAgCisgICAgaWYgKEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoYXR0cmli dXRlLCAiQVhWaXNpYmxlQ29udGVudFJlY3QiKSkgeworICAgICAgICBDR1JlY3Qgc2NyZWVuUmVj dCA9IFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eVZpc2libGVDb250ZW50UmVjdF07CisgICAgICAg IE5TU3RyaW5nICpyZWN0U3RyID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJ7JS4yZiwg JS4yZiwgJS4yZiwgJS4yZn0iLCBzY3JlZW5SZWN0Lm9yaWdpbi54LCBzY3JlZW5SZWN0Lm9yaWdp bi55LCBzY3JlZW5SZWN0LnNpemUud2lkdGgsIHNjcmVlblJlY3Quc2l6ZS5oZWlnaHRdOworICAg ICAgICByZXR1cm4gW3JlY3RTdHIgY3JlYXRlSlNTdHJpbmdSZWZdOworICAgIH0KIAogICAgIHJl dHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIDApOwogfQpJbmRleDogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2 aXNpb24gMjMxMDIyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTgtMDQtMjcgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4K KworICAgICAgICBBWDogQWNjZXNzaWJpbGl0eSBuZWVkcyB0byBrbm93IHdoaWNoIHBhcnQgb2Yg dGhlIGNvbnRlbnQgdmlldyBpcyB2aXNpYmxlIG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1MDg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zOTgwMTM2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVj dC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVs YXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVjdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0 Zm9ybS9pb3Mtd2sxL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTgtMDQtMjUgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20gbW9kZV0g VGhlIHNlYXJjaCBmaWVsZCBvbiB3d3cuYmluZy5jb20gaXMgbWlzc2luZyBsYWJlbCB0ZXh0Cklu ZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1j b250ZW50LXJlY3QtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvaW9zLXNpbXVsYXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVjdC1leHBlY3RlZC50 eHQJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxh dG9yL3Vub2JzY3VyZWQtY29udGVudC1yZWN0LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDExIEBACit0ZXN0CitUaGlzIHRlc3RzIHRoYXQgdW5vYnNjdXJlZCBjb250ZW50 IHJlY3QgaXMgZXhwb3NlZCB0byBhY2Nlc3NpYmlsaXR5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCisKKworUEFTUyBidXR0b24uc3RyaW5nQXR0cmlidXRlVmFsdWUoJ0FYVmlzaWJsZUNv bnRlbnRSZWN0JykgaXMgJ3swLjAwLCAwLjAwLCA4MDAuMDAsIDYwMC4wMH0nCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL3Vub2JzY3VyZWQtY29udGVudC1yZWN0Lmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9y L3Vub2JzY3VyZWQtY29udGVudC1yZWN0Lmh0bWwJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL3Vub2JzY3VyZWQtY29udGVudC1yZWN0Lmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyNyBAQAorCis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGJvZHkgaWQ9ImJvZHkiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10 ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8ZGl2IGlkPSJjb250ZW50Ij4KKzxidXR0b24gaWQ9ImJ1 dHRvbiI+dGVzdDwvYnV0dG9uPgorPC9kaXY+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgor PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigi VGhpcyB0ZXN0cyB0aGF0IHVub2JzY3VyZWQgY29udGVudCByZWN0IGlzIGV4cG9zZWQgdG8gYWNj ZXNzaWJpbGl0eS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIp IHsKKworICAgICAgICB2YXIgYnV0dG9uID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNz aWJsZUVsZW1lbnRCeUlkKCJidXR0b24iKTsKKyAgICAgICAgc2hvdWxkQmUoImJ1dHRvbi5zdHJp bmdBdHRyaWJ1dGVWYWx1ZSgnQVhWaXNpYmxlQ29udGVudFJlY3QnKSIsICInezAuMDAsIDAuMDAs IDgwMC4wMCwgNjAwLjAwfSciKTsKKyAgICB9Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4u Ly4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s PgorCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2sxL1Rlc3RFeHBlY3RhdGlvbnMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMS9UZXN0RXhwZWN0YXRp b25zCShyZXZpc2lvbiAyMzEwMjIpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2sxL1Rl c3RFeHBlY3RhdGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsNyBAQCBmYXN0L3pv b21pbmcvdWlzY3JpcHQtem9vbWluZy5odG1sIFsgRmFpCiAjIE5vdCBzdXBwb3J0ZWQgb24gV0sx CiBhY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3Ivc3BlYWstc2VsZWN0aW9uLWNvbnRlbnQuaHRt bCBbIFNraXAgXQogYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2FjY2Vzc2liaWxpdHktZXZl bnRzLXNldHRpbmcuaHRtbCBbIFNraXAgXQorYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL3Vu b2JzY3VyZWQtY29udGVudC1yZWN0Lmh0bWwgWyBTa2lwIF0KIAogIyBGSVhNRTogVGVzdHMgdGhh dCBmYWlsIGR1ZSB0byBsYWNrIG9mIHRleHRJbnB1dENvbnRyb2xsZXIgPHJkYXI6Ly9wcm9ibGVt LzUxMDYyODc+CiBlZGl0aW5nL2luc2VydGluZy9pbnNlcnQtY29tcG9zaXRpb24td2hpdGVzcGFj ZS5odG1sIFsgRmFpbHVyZSBdCg== 339021 2018-04-27 13:58:06 -0700 2018-04-27 14:58:39 -0700 patch patch.txt text/plain 7856 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTAyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTI3ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxpdHkgbmVlZHMg dG8ga25vdyB3aGljaCBwYXJ0IG9mIHRoZSBjb250ZW50IHZpZXcgaXMgdmlzaWJsZSBvbiBpT1MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTA4NQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk4MDEzNjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlZCB1bm9ic2N1cmVkQ29udGVudFJlY3Qo KSB0byBpT1MgYWNjZXNzaWJpbGl0eSBvYmplY3Qgd3JhcHBlci4KKworICAgICAgICBUZXN0OiBh Y2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1jb250ZW50LXJlY3QuaHRtbAor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJJT1MubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vz c2liaWxpdHlWaXNpYmxlQ29udGVudFJlY3RdKToKKwogMjAxOC0wNC0yNSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQU09OOiBEb24ndCBjcmVhdGUgYSBuZXcg cHJvY2VzcyB3aGVuIG5hdmlnYXRpbmcgdG8gYSBibG9iIFVSTCwgZGF0YSBVUkwsIGFuZCBhYm91 dDpibGFuawpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHJl dmlzaW9uIDIzMTAyMikKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaW9zL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjY2LDYg KzE2NjYsMTggQEAgLSAoQ0dSZWN0KWFjY2Vzc2liaWxpdHlFbGVtZW50UmVjdAogICAgIHJldHVy biBDR1JlY3RNYWtlKHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdo dCgpKTsKIH0KIAorLSAoQ0dSZWN0KWFjY2Vzc2liaWxpdHlWaXNpYmxlQ29udGVudFJlY3QKK3sK KyAgICBpZiAoIVtzZWxmIF9wcmVwYXJlQWNjZXNzaWJpbGl0eUNhbGxdKQorICAgICAgICByZXR1 cm4gQ0dSZWN0WmVybzsKKyAgICAKKyAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX29iamVjdC0+ ZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+dmlldygpKQorICAg ICAgICByZXR1cm4gQ0dSZWN0WmVybzsKKyAgICBJbnRSZWN0IHJlY3QgPSBzbmFwcGVkSW50UmVj dChkb2N1bWVudC0+dmlldygpLT51bm9ic2N1cmVkQ29udGVudFJlY3QoKSk7CisgICAgcmV0dXJu IFtzZWxmIGNvbnZlcnRSZWN0VG9TY3JlZW5TcGFjZTpyZWN0XTsKK30KKwogLy8gVGhlICJjZW50 ZXIgcG9pbnQiIGlzIHdoZXJlIFZvaWNlT3ZlciB3aWxsICJwcmVzcyIgYW4gb2JqZWN0LiBUaGlz IG1heSBub3QgYmUgdGhlIGFjdHVhbAogLy8gY2VudGVyIG9mIHRoZSBhY2Nlc3NpYmlsaXR5RnJh bWUKIC0gKENHUG9pbnQpYWNjZXNzaWJpbGl0eUFjdGl2YXRpb25Qb2ludApJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxMTEw KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTgtMDQtMjcgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogQWNj ZXNzaWJpbGl0eSBuZWVkcyB0byBrbm93IHdoaWNoIHBhcnQgb2YgdGhlIGNvbnRlbnQgdmlldyBp cyB2aXNpYmxlIG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1MDg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTgwMTM2Mz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvaW9zL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW06Cisg ICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ0F0dHJpYnV0ZVZhbHVl KToKKwogMjAxOC0wNC0yNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZGQgYSBtZWNoYW5pc20gdG8gb3ZlcnJpZGUg ZGVmYXVsdCB2aWV3cG9ydCBiZWhhdmlvcnMgaW4gZXh0cmEgem9vbSBtb2RlCkluZGV4OiBUb29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2lvcy9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50SU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvaW9zL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW0JKHJldmlzaW9uIDIzMTAyMikK KysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvaW9zL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnRJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAgLSAoTlNV SW50ZWdlcilhY2Nlc3NpYmlsaXR5QmxvY2txdW90ZUxldgogLSAoTlNBcnJheSAqKWFjY2Vzc2li aWxpdHlGaW5kTWF0Y2hpbmdPYmplY3RzOihOU0RpY3Rpb25hcnkgKilwYXJhbWV0ZXJzOwogLSAo TlNBcnJheTxOU1N0cmluZyAqPiAqKWFjY2Vzc2liaWxpdHlTcGVlY2hIaW50OwogLSAoQk9PTClf YWNjZXNzaWJpbGl0eUlzU3Ryb25nUGFzc3dvcmRGaWVsZDsKKy0gKENHUmVjdClhY2Nlc3NpYmls aXR5VmlzaWJsZUNvbnRlbnRSZWN0OwogCiAvLyBUZXh0TWFya2VyIHJlbGF0ZWQKIC0gKE5TQXJy YXkgKil0ZXh0TWFya2VyUmFuZ2U7CkBAIC0zNTYsNiArMzU3LDEyIEBAIEpTUmV0YWluUHRyPEpT U3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUkKICAgICAKICAgICBpZiAoSlNTdHJpbmdJc0VxdWFs VG9VVEY4Q1N0cmluZyhhdHRyaWJ1dGUsICJBWFNvcnREaXJlY3Rpb24iKSkKICAgICAgICAgcmV0 dXJuIFtbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlTb3J0RGlyZWN0aW9uXSBjcmVhdGVKU1N0cmlu Z1JlZl07CisgICAgCisgICAgaWYgKEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoYXR0cmli dXRlLCAiQVhWaXNpYmxlQ29udGVudFJlY3QiKSkgeworICAgICAgICBDR1JlY3Qgc2NyZWVuUmVj dCA9IFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eVZpc2libGVDb250ZW50UmVjdF07CisgICAgICAg IE5TU3RyaW5nICpyZWN0U3RyID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJ7JS4yZiwg JS4yZiwgJS4yZiwgJS4yZn0iLCBzY3JlZW5SZWN0Lm9yaWdpbi54LCBzY3JlZW5SZWN0Lm9yaWdp bi55LCBzY3JlZW5SZWN0LnNpemUud2lkdGgsIHNjcmVlblJlY3Quc2l6ZS5oZWlnaHRdOworICAg ICAgICByZXR1cm4gW3JlY3RTdHIgY3JlYXRlSlNTdHJpbmdSZWZdOworICAgIH0KIAogICAgIHJl dHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIDApOwogfQpJbmRleDogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2 aXNpb24gMjMxMDIyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTgtMDQtMjcgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4K KworICAgICAgICBBWDogQWNjZXNzaWJpbGl0eSBuZWVkcyB0byBrbm93IHdoaWNoIHBhcnQgb2Yg dGhlIGNvbnRlbnQgdmlldyBpcyB2aXNpYmxlIG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1MDg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zOTgwMTM2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVj dC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVs YXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVjdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0 Zm9ybS9pb3Mtd2sxL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTgtMDQtMjUgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20gbW9kZV0g VGhlIHNlYXJjaCBmaWVsZCBvbiB3d3cuYmluZy5jb20gaXMgbWlzc2luZyBsYWJlbCB0ZXh0Cklu ZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1j b250ZW50LXJlY3QtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvaW9zLXNpbXVsYXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVjdC1leHBlY3RlZC50 eHQJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxh dG9yL3Vub2JzY3VyZWQtY29udGVudC1yZWN0LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDEyIEBACit0ZXN0ICAKK1RoaXMgdGVzdHMgdGhhdCB1bm9ic2N1cmVkIGNvbnRl bnQgcmVjdCBpcyBleHBvc2VkIHRvIGFjY2Vzc2liaWxpdHkuCisKK09uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KKworCitQQVNTIGJ1dHRvbi5zdHJpbmdBdHRyaWJ1dGVWYWx1ZSgnQVhWaXNpYmxl Q29udGVudFJlY3QnKSBpcyAnezAuMDAsIDAuMDAsIDgwMC4wMCwgNjAwLjAwfScKK1BBU1MgZnJh bWVCdXR0b24uc3RyaW5nQXR0cmlidXRlVmFsdWUoJ0FYVmlzaWJsZUNvbnRlbnRSZWN0JykgaXMg J3s2MC4wMCwgMTAuMDAsIDIwMC4wMCwgMjAwLjAwfScKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1jb250ZW50LXJlY3QuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1j b250ZW50LXJlY3QuaHRtbAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2lvcy1zaW11bGF0b3IvdW5vYnNjdXJlZC1jb250ZW50LXJlY3QuaHRtbAkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDM4IEBACisKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keSBp ZD0iYm9keSI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48 L3NjcmlwdD4KKzxkaXYgaWQ9ImNvbnRlbnQiPgorPGJ1dHRvbiBpZD0iYnV0dG9uIj50ZXN0PC9i dXR0b24+CisKKzxpZnJhbWUgaWQ9ImlmcmFtZSIgb25sb2FkPSJzdGFydFRlc3QoKTsiIHdpZHRo PSIyMDAiIGhlaWdodD0iMjAwIiBzcmM9ImRhdGE6dGV4dC9odG1sLDxib2R5PjxidXR0b24gaWQ9 J2ZyYW1lLWJ1dHRvbic+Q2xpY2sgbWU8L2J1dHRvbj48YSBocmVmPScjJyBpZD0nZnJhbWUtbGlu ayc+YTwvYT48L2JvZHk+Ij48L2lmcmFtZT4KKworPC9kaXY+CisKKzxwIGlkPSJkZXNjcmlwdGlv biI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNj cmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IHVub2JzY3VyZWQgY29udGVudCByZWN0IGlzIGV4cG9z ZWQgdG8gYWNjZXNzaWJpbGl0eS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIpIHsKKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworICAgICAg ICB2YXIgYnV0dG9uID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRC eUlkKCJidXR0b24iKTsKKyAgICAgICAgc2hvdWxkQmUoImJ1dHRvbi5zdHJpbmdBdHRyaWJ1dGVW YWx1ZSgnQVhWaXNpYmxlQ29udGVudFJlY3QnKSIsICInezAuMDAsIDAuMDAsIDgwMC4wMCwgNjAw LjAwfSciKTsKKworICAgICAgICB2YXIgZnJhbWVCdXR0b247CisgICAgICAgIGZ1bmN0aW9uIHN0 YXJ0VGVzdCgpIHsKKyAgICAgICAgCXZhciBpZnJhbWUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiaWZyYW1lIik7CisgICAgICAgIAlmcmFtZUJ1dHRvbiA9IGlmcmFtZS5jb250ZW50V2luZG93 LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiZnJhbWUtYnV0 dG9uIik7CisgICAgICAgICAgICBzaG91bGRCZSgiZnJhbWVCdXR0b24uc3RyaW5nQXR0cmlidXRl VmFsdWUoJ0FYVmlzaWJsZUNvbnRlbnRSZWN0JykiLCAiJ3s2MC4wMCwgMTAuMDAsIDIwMC4wMCwg MjAwLjAwfSciKTsKKyAgICAgICAgCWZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisgICAgfQor PC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zLXdrMS9UZXN0RXhwZWN0YXRpb25zCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3Bs YXRmb3JtL2lvcy13azEvVGVzdEV4cGVjdGF0aW9ucwkocmV2aXNpb24gMjMxMDIyKQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMS9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkp CkBAIC0xMDUsNiArMTA1LDcgQEAgZmFzdC96b29taW5nL3Vpc2NyaXB0LXpvb21pbmcuaHRtbCBb IEZhaQogIyBOb3Qgc3VwcG9ydGVkIG9uIFdLMQogYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9y L3NwZWFrLXNlbGVjdGlvbi1jb250ZW50Lmh0bWwgWyBTa2lwIF0KIGFjY2Vzc2liaWxpdHkvaW9z LXNpbXVsYXRvci9hY2Nlc3NpYmlsaXR5LWV2ZW50cy1zZXR0aW5nLmh0bWwgWyBTa2lwIF0KK2Fj Y2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci91bm9ic2N1cmVkLWNvbnRlbnQtcmVjdC5odG1sIFsg U2tpcCBdCiAKICMgRklYTUU6IFRlc3RzIHRoYXQgZmFpbCBkdWUgdG8gbGFjayBvZiB0ZXh0SW5w dXRDb250cm9sbGVyIDxyZGFyOi8vcHJvYmxlbS81MTA2Mjg3PgogZWRpdGluZy9pbnNlcnRpbmcv aW5zZXJ0LWNvbXBvc2l0aW9uLXdoaXRlc3BhY2UuaHRtbCBbIEZhaWx1cmUgXQo=