231231 2021-10-05 07:18:59 -0700 AX: Move handling of AXContents from platform wrapper to AX core 2021-10-06 08:05:00 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=231289 InRadar P2 Normal --- 1 tyler_w webkit-unassigned aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1800546 0 tyler_w 2021-10-05 07:18:59 -0700 Moving this means we'll be able to use this logic in core. 1800547 1 webkit-bug-importer 2021-10-05 07:19:09 -0700 <rdar://problem/83884806> 1800757 2 440266 tyler_w 2021-10-05 14:16:51 -0700 Created attachment 440266 Patch 1800758 3 440266 tyler_w 2021-10-05 14:20:13 -0700 Comment on attachment 440266 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440266&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:-2384 > - // The contents of a tab list are all the children except the tabs. The comment says this, but then the code that follows does the exact opposite thing. I elected to copy the current behavior when I moved this logic to AccessibilityObject.cpp. 1800950 4 ews-feeder 2021-10-05 22:40:14 -0700 Committed r283601 (242553@main): <https://commits.webkit.org/242553@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440266. 1801042 5 andresg_22 2021-10-06 07:00:47 -0700 (In reply to Tyler Wilcock from comment #2) > Created attachment 440266 [details] > Patch --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ a/Source/WebCore/accessibility/AccessibilityObjectInterface.h + virtual void contents(AccessibilityChildrenVector&) = 0; Should be virtual AccessibilityChildrenVector contents() = 0; No need to pass an out parameter. Out parameters are bad and make client code less clear unnecessarily. Also, can we make this method const: virtual AccessibilityChildrenVector contents() const = 0; or some of the function calls in the implementation cannot be const. 1801049 6 andresg_22 2021-10-06 07:17:17 -0700 (In reply to Tyler Wilcock from comment #2) > Created attachment 440266 [details] > Patch --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ a/Source/WebCore/accessibility/AccessibilityObject.cpp + for (RefPtr<AccessibilityObject> child = firstChild(); child; child = child->nextSibling()) { Change RefPtr<AccessibilityObject> to auto* 1801058 7 tyler_w 2021-10-06 07:32:35 -0700 Handling review comments in: https://bugs.webkit.org/show_bug.cgi?id=231289 1801061 8 tyler_w 2021-10-06 07:38:46 -0700 > Also, can we make this method const: Unfortunately not, because tabChildren is not const. 440266 2021-10-05 14:16:51 -0700 2021-10-05 22:40:15 -0700 Patch bug-231231-20211005161650.patch text/plain 8783 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVlODA2ODIxODIzY2Yw YzRhZDlkZjI1MGJlZjkxYzc1MDU5NGI1NS4uYTE4MTg2ODU2YmNmODVhZTc0NmE2YjEzMjNhMjc0 YjM0MmZjZjZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEwLTA1ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IE1vdmUgaGFuZGxp bmcgb2YgQVhDb250ZW50cyBmcm9tIHBsYXRmb3JtIHdyYXBwZXIgdG8gQVggY29yZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMjMxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlZCBmdW5j dGlvbmFsaXR5LgorCisgICAgICAgIE1vdmVkIGhhbmRsaW5nIG9mIHRoZSBBWENvbnRlbnRzIChO U0FjY2Vzc2liaWxpdHlDb250ZW50c0F0dHJpYnV0ZSkgZnJvbSB0aGUKKyAgICAgICAgTWFjIHdy YXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlIGhhbmRsZXIgdG8gQVhDb3JlT2JqZWN0 Ojpjb250ZW50cy4KKyAgICAgICAgVGhpcyBtYWtlcyBpdCBwb3NzaWJsZSB0byBzaGFyZSB0aGlz IGNvZGUgYWNyb3NzIG11bHRpcGxlIHBsYXRmb3Jtcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls aXR5T2JqZWN0Ojpjb250ZW50cyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 SW50ZXJmYWNlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0 aWFsaXplQXR0cmlidXRlRGF0YSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwogMjAyMS0x MC0wNSAgR2FicmllbCBOYXZhIE1hcmlubyAgPGduYXZhbWFyaW5vQGFwcGxlLmNvbT4KIAogICAg ICAgICBJbmNvcnJlY3QgTGVuZ3RoIGNvbnN0cnVjdG9yIHVzZWQgYWZ0ZXIgYmxlbmRpbmcgbmVn YXRpdmUgTGVuZ3RoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCBlZjdkMjc2NTRkOTcwZDczZmY1MmUyODVhZmJkOTM3 YzYwOTI0Y2ZlLi44NjBhMmNmMzJkZmEwZjNmOGRiYzY3NzQ4ZjQxZGQyYjBiN2ZkNTgyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHAKQEAgLTMxNDksNiArMzE0OSwyMCBAQCBJbnRSZWN0IEFjY2Vzc2liaWxpdHlPYmplY3Q6 OnNjcm9sbFZpc2libGVDb250ZW50UmVjdCgpIGNvbnN0CiAgICAgCiAgICAgcmV0dXJuIEludFJl Y3QoKTsKIH0KKwordm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpjb250ZW50cyhBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0b3ImIHJlc3VsdCkKK3sKKyAgICBpZiAoaXNUYWJMaXN0KCkpCisgICAg ICAgIHRhYkNoaWxkcmVuKHJlc3VsdCk7CisgICAgZWxzZSBpZiAoaXNTY3JvbGxWaWV3KCkpIHsK KyAgICAgICAgLy8gQSBzY3JvbGwgdmlldydzIGNvbnRlbnRzIGFyZSBldmVyeXRoaW5nIGV4Y2Vw dCB0aGUgc2Nyb2xsIGJhcnMuCisgICAgICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBu b25TY3JvbGxiYXJDaGlsZHJlbjsKKyAgICAgICAgZm9yIChSZWZQdHI8QWNjZXNzaWJpbGl0eU9i amVjdD4gY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2li bGluZygpKSB7CisgICAgICAgICAgICBpZiAoY2hpbGQgJiYgIWNoaWxkLT5pc1Njcm9sbGJhcigp KQorICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoY2hpbGQpOworICAgICAgICB9CisgICAg fQorfQogICAgIAogSW50U2l6ZSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzY3JvbGxDb250ZW50c1Np emUoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAppbmRleCA2NTQ0MTZhMTdiNDk1YzMyNTcyYWZkMjc2NDg1Y2I2NTQw OTZmZjZlLi41M2EyZjMzODZkZDFiZDU4NzM2ZWQzY2I0MzQ1MDViZjRhNGNmOGRhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApA QCAtNjQwLDYgKzY0MCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc2Nyb2xsQnlQYWdlKFNjcm9s bEJ5UGFnZURpcmVjdGlvbikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgSW50UG9pbnQgc2Nyb2xsUG9z aXRpb24oKSBjb25zdCBvdmVycmlkZTsKKyAgICB2b2lkIGNvbnRlbnRzKEFjY2Vzc2liaWxpdHlD aGlsZHJlblZlY3RvciYpIG92ZXJyaWRlOwogICAgIEludFNpemUgc2Nyb2xsQ29udGVudHNTaXpl KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgSW50UmVjdCBzY3JvbGxWaXNpYmxlQ29udGVudFJlY3Qo KSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIHNjcm9sbFRvTWFrZVZpc2libGUoY29uc3QgU2Ny b2xsUmVjdFRvVmlzaWJsZU9wdGlvbnMmKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5o IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmgKaW5kZXggM2Q4NmYyZWEzZjBiZWU3NmI4Yzc2YmMwZWZiYzA2MTlhMTBiMTQzNS4uYjcz MThmZmExODlkOGM2NDNkOWJlMjUyZDExZTQ1ZjAxZTQ1MWU1NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmgKQEAgLTEzNzQsNiArMTM3NCw3IEBAIHB1YmxpYzoKICAgICBlbnVtIGNsYXNzIFNjcm9s bEJ5UGFnZURpcmVjdGlvbiB7IFVwLCBEb3duLCBMZWZ0LCBSaWdodCB9OwogICAgIHZpcnR1YWwg Ym9vbCBzY3JvbGxCeVBhZ2UoU2Nyb2xsQnlQYWdlRGlyZWN0aW9uKSBjb25zdCA9IDA7CiAgICAg dmlydHVhbCBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFs IHZvaWQgY29udGVudHMoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJikgPSAwOwogICAgIHZp cnR1YWwgSW50U2l6ZSBzY3JvbGxDb250ZW50c1NpemUoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCBJbnRSZWN0IHNjcm9sbFZpc2libGVDb250ZW50UmVjdCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgc2Nyb2xsVG9NYWtlVmlzaWJsZShjb25zdCBTY3JvbGxSZWN0VG9WaXNpYmxlT3B0 aW9ucyYpIGNvbnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggZWJhNTE5 MjcyNjJkY2I0NTNjYzIzNDg4MGIzN2U5Nzk0MDE2ZmZjMC4uZDIyOTg0YjJjZmQ2NzcwMDhiYTgy YzlhZTU2MjY1YzhkMGFhMWQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTI5 OCw2ICsyOTgsMTAgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRl RGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QKICAgICBpZiAob2JqZWN0Lmlz SW1hZ2UoKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkVtYmVkZGVkSW1h Z2VEZXNjcmlwdGlvbiwgb2JqZWN0LmVtYmVkZGVkSW1hZ2VEZXNjcmlwdGlvbigpLmlzb2xhdGVk Q29weSgpKTsKIAorICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBjb250ZW50czsKKyAg ICBvYmplY3QuY29udGVudHMoY29udGVudHMpOworICAgIHNldE9iamVjdFZlY3RvclByb3BlcnR5 KEFYUHJvcGVydHlOYW1lOjpDb250ZW50cywgY29udGVudHMpOworCiAgICAgQWNjZXNzaWJpbGl0 eUNoaWxkcmVuVmVjdG9yIHZpc2libGVDaGlsZHJlbjsKICAgICBvYmplY3QudmlzaWJsZUNoaWxk cmVuKHZpc2libGVDaGlsZHJlbik7CiAgICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9w ZXJ0eU5hbWU6OlZpc2libGVDaGlsZHJlbiwgdmlzaWJsZUNoaWxkcmVuKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuaAppbmRleCBhMDZjYmFjNjhkNDk4NzQ1OTlmZTA0YjVjYzY4MTllODZkZjBjOTVi Li4yYjAzYWVhMDMyNmNiMzY2MDFkMTQ4ZmFlOGNlODFiMzJkMzAyZjUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZE9iamVjdC5oCkBAIC0zNDgsNiArMzQ4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFNl bGVjdGVkQ2hpbGRyZW4oY29uc3QgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJikgb3ZlcnJp ZGU7CiAgICAgdm9pZCB2aXNpYmxlQ2hpbGRyZW4oQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9y JiBjaGlsZHJlbikgb3ZlcnJpZGUgeyBmaWxsQ2hpbGRyZW5WZWN0b3JGb3JQcm9wZXJ0eShBWFBy b3BlcnR5TmFtZTo6VmlzaWJsZUNoaWxkcmVuLCBjaGlsZHJlbik7IH0KICAgICB2b2lkIHRhYkNo aWxkcmVuKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgY2hpbGRyZW4pIG92ZXJyaWRlIHsg ZmlsbENoaWxkcmVuVmVjdG9yRm9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlRhYkNoaWxkcmVu LCBjaGlsZHJlbik7IH0KKyAgICB2b2lkIGNvbnRlbnRzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZl Y3RvciYgY2hpbGRyZW4pIG92ZXJyaWRlIHsgZmlsbENoaWxkcmVuVmVjdG9yRm9yUHJvcGVydHko QVhQcm9wZXJ0eU5hbWU6OkNvbnRlbnRzLCBjaGlsZHJlbik7IH0KICAgICBib29sIGhhc0FSSUFW YWx1ZU5vdygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGJvb2xBdHRyaWJ1dGVWYWx1ZShBWFBy b3BlcnR5TmFtZTo6SGFzQVJJQVZhbHVlTm93KTsgfQogICAgIFN0cmluZyB0YWdOYW1lKCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6 OlRhZ05hbWUpOyB9CiAgICAgY29uc3QgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGls ZHJlbihib29sIHVwZGF0ZUNoaWxkcmVuSWZOZWVkZWQgPSB0cnVlKSBvdmVycmlkZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5oCmluZGV4IDY1ZmU2ZDUwM2Q1ODk4NmU2MmUzZGEwZGEyOGE0OTEwOGFjYzIz ODUuLjcwY2E2MDc2YmJiYzU0ZTQyMDRjMGU1M2MzNGMxMzJlMzgxOWRjNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuaApAQCAtOTYsNiArOTYsNyBAQCBlbnVtIGNsYXNzIEFYUHJvcGVydHlOYW1lIDog dWludDE2X3QgewogICAgIENvbHVtbkluZGV4UmFuZ2UsCiAgICAgQ29tcHV0ZWRMYWJlbCwKICAg ICBDb21wdXRlZFJvbGVTdHJpbmcsCisgICAgQ29udGVudHMsCiAgICAgQ3VycmVudFN0YXRlLAog ICAgIEN1cnJlbnRWYWx1ZSwKICAgICBEYXRldGltZUF0dHJpYnV0ZVZhbHVlLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCBmZjhhMjlkYTRjYmY3YWY2ZTMxNThl MWY4NjYwYTY0NmY0MTExZWNiLi4wOGRlZWEwMWRkYWNkZGViN2E0NDY4MTE4MjU2N2Y0NWFhNTJi NWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjM4MSwz NCArMjM4MSw5IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogICAgIH0K IAogICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5 Q29udGVudHNBdHRyaWJ1dGVdKSB7Ci0gICAgICAgIC8vIFRoZSBjb250ZW50cyBvZiBhIHRhYiBs aXN0IGFyZSBhbGwgdGhlIGNoaWxkcmVuIGV4Y2VwdCB0aGUgdGFicy4KLSAgICAgICAgaWYgKGJh Y2tpbmdPYmplY3QtPmlzVGFiTGlzdCgpKSB7Ci0gICAgICAgICAgICBhdXRvIGNoaWxkcmVuID0g c2VsZi5jaGlsZHJlblZlY3RvckFycmF5OwotICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVj dDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHRhYnM7Ci0gICAgICAgICAgICBiYWNraW5n T2JqZWN0LT50YWJDaGlsZHJlbih0YWJzKTsKLSAgICAgICAgICAgIGF1dG8gdGFic0NoaWxkcmVu ID0gY29udmVydFRvTlNBcnJheSh0YWJzKTsKLQotICAgICAgICAgICAgTlNNdXRhYmxlQXJyYXkg KmNvbnRlbnRzID0gW05TTXV0YWJsZUFycmF5IGFycmF5XTsKLSAgICAgICAgICAgIGZvciAoaWQg Y2hpbGRXcmFwcGVyIGluIGNoaWxkcmVuKSB7Ci0gICAgICAgICAgICAgICAgaWYgKFt0YWJzQ2hp bGRyZW4gY29udGFpbnNPYmplY3Q6Y2hpbGRXcmFwcGVyXSkKLSAgICAgICAgICAgICAgICAgICAg W2NvbnRlbnRzIGFkZE9iamVjdDpjaGlsZFdyYXBwZXJdOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgcmV0dXJuIGNvbnRlbnRzOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGJhY2tpbmdP YmplY3QtPmlzU2Nyb2xsVmlldygpKSB7Ci0gICAgICAgICAgICAvLyBBIHNjcm9sbFZpZXcncyBj b250ZW50cyBhcmUgZXZlcnl0aGluZyBleGNlcHQgdGhlIHNjcm9sbCBiYXJzLgotICAgICAgICAg ICAgYXV0byBjaGlsZHJlbiA9IHNlbGYuY2hpbGRyZW5WZWN0b3JBcnJheTsKLSAgICAgICAgICAg IE5TTXV0YWJsZUFycmF5ICpjb250ZW50cyA9IFtOU011dGFibGVBcnJheSBhcnJheV07Ci0KLSAg ICAgICAgICAgIGZvciAoV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgKmNoaWxkV3JhcHBl ciBpbiBjaGlsZHJlbikgewotICAgICAgICAgICAgICAgIGlmIChhdXRvIGJhY2tpbmdPYmplY3Qg PSBbY2hpbGRXcmFwcGVyIGF4QmFja2luZ09iamVjdF0pIHsKLSAgICAgICAgICAgICAgICAgICAg aWYgKCFiYWNraW5nT2JqZWN0LT5pc1Njcm9sbGJhcigpKQotICAgICAgICAgICAgICAgICAgICAg ICAgW2NvbnRlbnRzIGFkZE9iamVjdDpjaGlsZFdyYXBwZXJdOwotICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBjb250ZW50czsKLSAgICAgICAgfQor ICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Ig Y29udGVudHM7CisgICAgICAgIGJhY2tpbmdPYmplY3QtPmNvbnRlbnRzKGNvbnRlbnRzKTsKKyAg ICAgICAgcmV0dXJuIGNvbnZlcnRUb05TQXJyYXkoY29udGVudHMpOwogICAgIH0KIAogICAgIGlm IChiYWNraW5nT2JqZWN0LT5pc1RhYmxlKCkgJiYgYmFja2luZ09iamVjdC0+aXNFeHBvc2FibGUo KSkgewo=