236276 2022-02-07 17:51:42 -0800 Initialize the AXIsolatedObject AccessibilityText property lazily. 2022-02-08 14:15:34 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1838462 0 andresg_22 2022-02-07 17:51:42 -0800 Initialize the AXIsolatedObject AccessibilityText property lazily. 1838463 1 webkit-bug-importer 2022-02-07 17:52:06 -0800 <rdar://problem/88604453> 1838465 2 451186 andresg_22 2022-02-07 18:00:05 -0800 Created attachment 451186 Patch 1838485 3 451186 cfleizach 2022-02-07 19:00:54 -0800 Comment on attachment 451186 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451186&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:1011 > + Accessibility::performFunctionOnMainThread([&propertyName, this] () { Can these methods return a variant so we only need one method? 1838707 4 451258 andresg_22 2022-02-08 09:10:33 -0800 Created attachment 451258 Patch 1838712 5 andresg_22 2022-02-08 09:16:13 -0800 (In reply to chris fleizach from comment #3) > Comment on attachment 451186 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=451186&action=review > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:1011 > > + Accessibility::performFunctionOnMainThread([&propertyName, this] () { > > Can these methods return a variant so we only need one method? Done. 1838833 6 451294 andresg_22 2022-02-08 12:28:10 -0800 Created attachment 451294 Patch 1838872 7 ews-feeder 2022-02-08 14:15:30 -0800 Committed r289427 (246987@main): <https://commits.webkit.org/246987@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451294. 451186 2022-02-07 18:00:05 -0800 2022-02-08 09:10:29 -0800 Patch bug-236276-20220207210004.patch text/plain 5353 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmMmQxMTcxN2RhZTg0 YTVjYmI3NWRmM2Y4NmIxODMzYmE3ZjIxOS4uNjMwZmFhYmFlYjIxYzAyZGIzMzBlYjRkNGMyMzI1 NzZlYmE4NGFlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTA3ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbml0aWFsaXpl IHRoZSBBWElzb2xhdGVkT2JqZWN0IEFjY2Vzc2liaWxpdHlUZXh0IHByb3BlcnR5IGxhemlseS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjI3Ngor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg2MDQ0NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tcHV0YXRpb24gb2YgdGhlIEFjY2Vzc2liaWxp dHl0VGV4dCBwcm9wZXJ0eSBtYXkgYmUgdmVyeSBleHBlbnNpdmUgYW5kCisgICAgICAgIGlmIHBl cmZvcm1lZCBkdXJpbmcgdGhlIGNyZWF0aW9uIG9mIElzb2xhdGVkT2JqZWN0cyBtYXkgY2F1c2Ug Y3Jhc2hlcyBzaW5jZQorICAgICAgICBwYWdlIGxheW91dCBtYXkgYmUgaW4gcHJvZ3Jlc3MuIEZv ciB0aGVzZSByZWFzb25zLCB3ZSBhcmUgY29tcHV0aW5nIGFuZAorICAgICAgICBjYWNoaW5nIHRo aXMgcHJvcGVydHkgb24gZmlyc3QgcmVxdWVzdC4KKyAgICAgICAgVGhpcyBwYXRjaCBpcyBzZXF1 ZWwgdG8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjExNS4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0 ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6YWNjZXNzaWJpbGl0 eVRleHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6Z2V0T3JS ZXRyaWV2ZVZlY3RvclByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoKKwogMjAyMi0wMi0wNCAgQW5kcmVzIEdvbnph bGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FjaGUgc29tZSBleHBlbnNp dmUgQVhJc29sYXRlZE9iamVjdCBwcm9wZXJ0aWVzIGxhemlseS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5jcHAKaW5kZXggNWM2YjExNmI2MTBjOWE0MjFkNjYzZjcyMWU4N2Q4ZGM1MDk5OTQzMy4u Mjc5YTc1NzM0OGNhZmYwYmFlNDU3ZTBhMzJiZjJhNTMxNTI2OGY5MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZE9iamVjdC5jcHAKQEAgLTM0NCwxNiArMzQ0LDYgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0 Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wg aXMKICAgICBvYmplY3QuYXJpYU93bnNFbGVtZW50cyhhcmlhT3duc0VsZW1lbnRzKTsKICAgICBz ZXRPYmplY3RWZWN0b3JQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQU93bnNFbGVtZW50cywg YXJpYU93bnNFbGVtZW50cyk7CiAKLSAgICBWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+IHRleHRz OwotICAgIG9iamVjdC5hY2Nlc3NpYmlsaXR5VGV4dCh0ZXh0cyk7Ci0gICAgVmVjdG9yPEFjY2Vz c2liaWxpdHlUZXh0PiBpc29sYXRlZFRleHRzOwotICAgIGlzb2xhdGVkVGV4dHMucmVzZXJ2ZUNh cGFjaXR5KHRleHRzLnNpemUoKSk7Ci0gICAgZm9yIChjb25zdCBhdXRvJiB0ZXh0IDogdGV4dHMp IHsKLSAgICAgICAgQWNjZXNzaWJpbGl0eVRleHQgaXNvbGF0ZWRUZXh0KHRleHQudGV4dC5pc29s YXRlZENvcHkoKSwgdGV4dC50ZXh0U291cmNlKTsKLSAgICAgICAgaXNvbGF0ZWRUZXh0cy51bmNo ZWNrZWRBcHBlbmQoaXNvbGF0ZWRUZXh0KTsKLSAgICB9Ci0gICAgc2V0UHJvcGVydHkoQVhQcm9w ZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0LCBpc29sYXRlZFRleHRzKTsKLQogICAgIC8vIFNw aW4gYnV0dG9uIHN1cHBvcnQuCiAgICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OkRlY3JlbWVudEJ1dHRvbiwgb2JqZWN0LmRlY3JlbWVudEJ1dHRvbigpKTsKICAgICBzZXRPYmpl Y3RQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SW5jcmVtZW50QnV0dG9uLCBvYmplY3QuaW5jcmVt ZW50QnV0dG9uKCkpOwpAQCAtNjA0LDcgKzU5NCw3IEBAIEFYQ29yZU9iamVjdCogQVhJc29sYXRl ZE9iamVjdDo6Y2VsbEZvckNvbHVtbkFuZFJvdyh1bnNpZ25lZCBjb2x1bW5JbmRleCwgdW5zaWdu CiAKIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6YWNjZXNzaWJpbGl0eVRleHQoVmVjdG9yPEFjY2Vz c2liaWxpdHlUZXh0PiYgdGV4dHMpIGNvbnN0CiB7Ci0gICAgdGV4dHMgPSB2ZWN0b3JBdHRyaWJ1 dGVWYWx1ZTxBY2Nlc3NpYmlsaXR5VGV4dD4oQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlU ZXh0KTsKKyAgICB0ZXh0cyA9IGNvbnN0X2Nhc3Q8QVhJc29sYXRlZE9iamVjdCo+KHRoaXMpLT5n ZXRPclJldHJpZXZlVmVjdG9yUHJvcGVydHlWYWx1ZTxBY2Nlc3NpYmlsaXR5VGV4dD4oQVhQcm9w ZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0KTsKIH0KIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0 OjpjbGFzc0xpc3QoVmVjdG9yPFN0cmluZz4mIGxpc3QpIGNvbnN0CkBAIC0xMDEyLDYgKzEwMDIs MzggQEAgU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OmdldE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0 eVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnQKICAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRl VmFsdWUocHJvcGVydHlOYW1lKTsKIH0KIAordGVtcGxhdGU8dHlwZW5hbWUgVD4KK1ZlY3RvcjxU PiBBWElzb2xhdGVkT2JqZWN0OjpnZXRPclJldHJpZXZlVmVjdG9yUHJvcGVydHlWYWx1ZShBWFBy b3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCit7CisgICAgaWYgKG1fcHJvcGVydHlNYXAuY29udGFp bnMocHJvcGVydHlOYW1lKSkKKyAgICAgICAgcmV0dXJuIHZlY3RvckF0dHJpYnV0ZVZhbHVlPFQ+ KHByb3BlcnR5TmFtZSk7CisKKyAgICBBY2Nlc3NpYmlsaXR5OjpwZXJmb3JtRnVuY3Rpb25Pbk1h aW5UaHJlYWQoWyZwcm9wZXJ0eU5hbWUsIHRoaXNdICgpIHsKKyAgICAgICAgYXV0byogYXhPYmpl Y3QgPSBhc3NvY2lhdGVkQVhPYmplY3QoKTsKKyAgICAgICAgaWYgKCFheE9iamVjdCkKKyAgICAg ICAgICAgIHJldHVybjsKKworICAgICAgICBWZWN0b3I8VD4gdmFsdWU7CisgICAgICAgIHN3aXRj aCAocHJvcGVydHlOYW1lKSB7CisgICAgICAgIGNhc2UgQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2li aWxpdHlUZXh0OiB7CisgICAgICAgICAgICBWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+IHRleHRz OworICAgICAgICAgICAgYXhPYmplY3QtPmFjY2Vzc2liaWxpdHlUZXh0KHRleHRzKTsKKyAgICAg ICAgICAgIHZhbHVlID0gdGV4dHMubWFwKFtdIChjb25zdCBhdXRvJiB0ZXh0KSAtPiBBY2Nlc3Np YmlsaXR5VGV4dCB7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgdGV4dC50ZXh0Lmlzb2xhdGVk Q29weSgpLCB0ZXh0LnRleHRTb3VyY2UgfTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CisKKyAgICAgICAgLy8gQ2FjaGUgdmFsdWUgc28gdGhhdCB0aGVyZSBpcyBubyBu ZWVkIHRvIGFjY2VzcyB0aGUgbWFpbiB0aHJlYWQgaW4gc3Vic2VxdWVudCBjYWxscy4KKyAgICAg ICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0LCB2YWx1ZSk7 CisgICAgfSk7CisKKyAgICByZXR1cm4gdmVjdG9yQXR0cmlidXRlVmFsdWU8VD4ocHJvcGVydHlO YW1lKTsKK30KKwogdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpmaWxsQ2hpbGRyZW5WZWN0b3JGb3JQ cm9wZXJ0eShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgY2hpbGRyZW4pIGNvbnN0CiB7CiAgICAgVmVjdG9yPEFYSUQ+IGNoaWxkSURzID0g dmVjdG9yQXR0cmlidXRlVmFsdWU8QVhJRD4ocHJvcGVydHlOYW1lKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRP YmplY3QuaAppbmRleCAyNmQ1MDM3OGFkMGE5Yzk0MzViZjhhNjMzNmJmYjVmNzRkYThjNjlmLi4z OWJmYjczODAzYzEyYmQ2Nzc3NDI0ZGNmYTc4ZmFjN2Y5MjI4NDAyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5oCkBAIC0xMDIsNiArMTAyLDcgQEAgcHJpdmF0ZToKICAgICAvLyBJZiB0aGUgcHJv cGVydHkgaXMgYWxyZWFkeSBpbiBtX3Byb3BlcnR5TWFwLCByZXR1cm5zIHRoZSBleGlzdGluZyB2 YWx1ZS4KICAgICAvLyBJZiBub3QsIHJldHJpZXZlcyB0aGUgcHJvcGVydHkgZnJvbSB0aGUgbWFp biB0aHJlYWQgYW5kIGNhY2hlIGl0IGZvciBsYXRlciB1c2UuCiAgICAgU3RyaW5nIGdldE9yUmV0 cmlldmVTdHJpbmdQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlOYW1lKTsKKyAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBWZWN0b3I8VD4gZ2V0T3JSZXRyaWV2ZVZlY3RvclByb3BlcnR5VmFsdWUoQVhQ cm9wZXJ0eU5hbWUpOwogCiAgICAgdm9pZCBmaWxsQ2hpbGRyZW5WZWN0b3JGb3JQcm9wZXJ0eShB WFByb3BlcnR5TmFtZSwgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJikgY29uc3Q7CiAgICAg dm9pZCBzZXRNYXRoc2NyaXB0cyhBWFByb3BlcnR5TmFtZSwgQVhDb3JlT2JqZWN0Jik7Cg== 451258 2022-02-08 09:10:33 -0800 2022-02-08 12:28:07 -0800 Patch bug-236276-20220208121032.patch text/plain 8897 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmMmQxMTcxN2RhZTg0 YTVjYmI3NWRmM2Y4NmIxODMzYmE3ZjIxOS4uOWVmYTg2ZDY5NjI4NWJlYzQxMjkzYmEyNzcwZmVi NWQ4YmIxYzRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAyLTA4ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbml0aWFsaXpl IHRoZSBBWElzb2xhdGVkT2JqZWN0IEFjY2Vzc2liaWxpdHlUZXh0IHByb3BlcnR5IGxhemlseS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjI3Ngor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg2MDQ0NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgQ29tcHV0YXRpb24gb2YgdGhlIEFjY2Vzc2liaWxp dHl0VGV4dCBwcm9wZXJ0eSBtYXkgYmUgdmVyeSBleHBlbnNpdmUgYW5kCisgICAgICAgIGlmIHBl cmZvcm1lZCBkdXJpbmcgdGhlIGNyZWF0aW9uIG9mIElzb2xhdGVkT2JqZWN0cyBtYXkgY2F1c2Ug Y3Jhc2hlcworICAgICAgICBzaW5jZSBpdCBtYXkgaW52b2tlIHRleHRVbmRlckVsZW1lbnQgd2hp bGUgcGFnZSBsYXlvdXQgaXMgaW4gcHJvZ3Jlc3MuCisgICAgICAgIEZvciB0aGVzZSByZWFzb25z LCB3ZSBhcmUgY29tcHV0aW5nIGFuZCBjYWNoaW5nIHRoaXMgcHJvcGVydHkgb24gZmlyc3QKKyAg ICAgICAgcmVxdWVzdC4KKyAgICAgICAgVGhpcyBwYXRjaCBpcyBzZXF1ZWwgdG8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjExNS4KKworICAgICAgICAqIGFjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6YWNjZXNzaWJpbGl0eVRleHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6Z2V0T3JSZXRyaWV2ZVByb3BlcnR5 VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6aW5uZXJIVE1MIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6Om91dGVySFRNTCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpnZXRPclJldHJpZXZlU3Ry aW5nUHJvcGVydHlWYWx1ZSk6CisgICAgICAgIFJlcGxhY2VkIGJ5IGdldE9yUmV0cmlldmVQcm9w ZXJ0eVZhbHVlPFN0cmluZz4uCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L21hYy9BWElzb2xhdGVkT2JqZWN0TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRl ZE9iamVjdDo6ZGVzY3JpcHRpb25BdHRyaWJ1dGVWYWx1ZSBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpBWElzb2xhdGVkT2JqZWN0Ojp0aXRsZUF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKwogMjAy Mi0wMi0wNCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAg ICAgQ2FjaGUgc29tZSBleHBlbnNpdmUgQVhJc29sYXRlZE9iamVjdCBwcm9wZXJ0aWVzIGxhemls eS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggNWM2YjExNmI2MTBjOWE0MjFkNjYz ZjcyMWU4N2Q4ZGM1MDk5OTQzMy4uMjUwNjQ0MDM2MjQ3ZWQxYjg2MTBjYzNkNDFiMGEwOTlmZTA2 ZDgyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTM0NCwxNiArMzQ0LDYgQEAg dm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmpl Y3QmIGNvcmVPYmplY3QsIGJvb2wgaXMKICAgICBvYmplY3QuYXJpYU93bnNFbGVtZW50cyhhcmlh T3duc0VsZW1lbnRzKTsKICAgICBzZXRPYmplY3RWZWN0b3JQcm9wZXJ0eShBWFByb3BlcnR5TmFt ZTo6QVJJQU93bnNFbGVtZW50cywgYXJpYU93bnNFbGVtZW50cyk7CiAKLSAgICBWZWN0b3I8QWNj ZXNzaWJpbGl0eVRleHQ+IHRleHRzOwotICAgIG9iamVjdC5hY2Nlc3NpYmlsaXR5VGV4dCh0ZXh0 cyk7Ci0gICAgVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiBpc29sYXRlZFRleHRzOwotICAgIGlz b2xhdGVkVGV4dHMucmVzZXJ2ZUNhcGFjaXR5KHRleHRzLnNpemUoKSk7Ci0gICAgZm9yIChjb25z dCBhdXRvJiB0ZXh0IDogdGV4dHMpIHsKLSAgICAgICAgQWNjZXNzaWJpbGl0eVRleHQgaXNvbGF0 ZWRUZXh0KHRleHQudGV4dC5pc29sYXRlZENvcHkoKSwgdGV4dC50ZXh0U291cmNlKTsKLSAgICAg ICAgaXNvbGF0ZWRUZXh0cy51bmNoZWNrZWRBcHBlbmQoaXNvbGF0ZWRUZXh0KTsKLSAgICB9Ci0g ICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0LCBpc29sYXRl ZFRleHRzKTsKLQogICAgIC8vIFNwaW4gYnV0dG9uIHN1cHBvcnQuCiAgICAgc2V0T2JqZWN0UHJv cGVydHkoQVhQcm9wZXJ0eU5hbWU6OkRlY3JlbWVudEJ1dHRvbiwgb2JqZWN0LmRlY3JlbWVudEJ1 dHRvbigpKTsKICAgICBzZXRPYmplY3RQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SW5jcmVtZW50 QnV0dG9uLCBvYmplY3QuaW5jcmVtZW50QnV0dG9uKCkpOwpAQCAtNjA0LDcgKzU5NCw3IEBAIEFY Q29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6Y2VsbEZvckNvbHVtbkFuZFJvdyh1bnNpZ25l ZCBjb2x1bW5JbmRleCwgdW5zaWduCiAKIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6YWNjZXNzaWJp bGl0eVRleHQoVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiYgdGV4dHMpIGNvbnN0CiB7Ci0gICAg dGV4dHMgPSB2ZWN0b3JBdHRyaWJ1dGVWYWx1ZTxBY2Nlc3NpYmlsaXR5VGV4dD4oQVhQcm9wZXJ0 eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0KTsKKyAgICB0ZXh0cyA9IGNvbnN0X2Nhc3Q8QVhJc29s YXRlZE9iamVjdCo+KHRoaXMpLT5nZXRPclJldHJpZXZlUHJvcGVydHlWYWx1ZTxWZWN0b3I8QWNj ZXNzaWJpbGl0eVRleHQ+PihBWFByb3BlcnR5TmFtZTo6QWNjZXNzaWJpbGl0eVRleHQpOwogfQog CiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmNsYXNzTGlzdChWZWN0b3I8U3RyaW5nPiYgbGlzdCkg Y29uc3QKQEAgLTk3NSw0MSArOTY1LDU5IEBAIGludCBBWElzb2xhdGVkT2JqZWN0OjppbnRBdHRy aWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiAgICAgKTsKIH0K IAotU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OmdldE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0eVZh bHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKLXsKLSAgICBpZiAobV9wcm9wZXJ0eU1h cC5jb250YWlucyhwcm9wZXJ0eU5hbWUpKQotICAgICAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRl VmFsdWUocHJvcGVydHlOYW1lKTsKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+CitUIEFYSXNvbGF0ZWRP YmplY3Q6OmdldE9yUmV0cmlldmVQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5 TmFtZSkKK3sKKyAgICBpZiAobV9wcm9wZXJ0eU1hcC5jb250YWlucyhwcm9wZXJ0eU5hbWUpKSB7 CisgICAgICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOwor ICAgICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKKyAgICAgICAgICAgIFtdIChUJiB0 eXBlZFZhbHVlKSAtPiBUIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCisgICAgICAgICAgICBbXSAo YXV0byYpIHsgcmV0dXJuIFQoKTsgfQorICAgICAgICApOworICAgIH0KIAogICAgIEFjY2Vzc2li aWxpdHk6OnBlcmZvcm1GdW5jdGlvbk9uTWFpblRocmVhZChbJnByb3BlcnR5TmFtZSwgdGhpc10g KCkgewogICAgICAgICBhdXRvKiBheE9iamVjdCA9IGFzc29jaWF0ZWRBWE9iamVjdCgpOwogICAg ICAgICBpZiAoIWF4T2JqZWN0KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIFN0cmlu ZyB2YWx1ZTsKKyAgICAgICAgQVhQcm9wZXJ0eVZhbHVlVmFyaWFudCB2YWx1ZTsKICAgICAgICAg c3dpdGNoIChwcm9wZXJ0eU5hbWUpIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAgY2Fz ZSBBWFByb3BlcnR5TmFtZTo6RGVzY3JpcHRpb246Ci0gICAgICAgICAgICB2YWx1ZSA9IGF4T2Jq ZWN0LT5kZXNjcmlwdGlvbkF0dHJpYnV0ZVZhbHVlKCk7CisgICAgICAgICAgICB2YWx1ZSA9IGF4 T2JqZWN0LT5kZXNjcmlwdGlvbkF0dHJpYnV0ZVZhbHVlKCkuaXNvbGF0ZWRDb3B5KCk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBWFByb3BlcnR5TmFtZTo6VGl0bGVBdHRyaWJ1 dGVWYWx1ZToKLSAgICAgICAgICAgIHZhbHVlID0gYXhPYmplY3QtPnRpdGxlQXR0cmlidXRlVmFs dWUoKTsKKyAgICAgICAgICAgIHZhbHVlID0gYXhPYmplY3QtPnRpdGxlQXR0cmlidXRlVmFsdWUo KS5pc29sYXRlZENvcHkoKTsKICAgICAgICAgICAgIGJyZWFrOwogI2VuZGlmCisgICAgICAgIGNh c2UgQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0OiB7CisgICAgICAgICAgICBWZWN0 b3I8QWNjZXNzaWJpbGl0eVRleHQ+IHRleHRzOworICAgICAgICAgICAgYXhPYmplY3QtPmFjY2Vz c2liaWxpdHlUZXh0KHRleHRzKTsKKyAgICAgICAgICAgIHZhbHVlID0gdGV4dHMubWFwKFtdIChj b25zdCBhdXRvJiB0ZXh0KSAtPiBBY2Nlc3NpYmlsaXR5VGV4dCB7CisgICAgICAgICAgICAgICAg cmV0dXJuIHsgdGV4dC50ZXh0Lmlzb2xhdGVkQ29weSgpLCB0ZXh0LnRleHRTb3VyY2UgfTsKKyAg ICAgICAgICAgIH0pOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAgY2Fz ZSBBWFByb3BlcnR5TmFtZTo6SW5uZXJIVE1MOgotICAgICAgICAgICAgdmFsdWUgPSBheE9iamVj dC0+aW5uZXJIVE1MKCk7CisgICAgICAgICAgICB2YWx1ZSA9IGF4T2JqZWN0LT5pbm5lckhUTUwo KS5pc29sYXRlZENvcHkoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFYUHJv cGVydHlOYW1lOjpPdXRlckhUTUw6Ci0gICAgICAgICAgICB2YWx1ZSA9IGF4T2JqZWN0LT5vdXRl ckhUTUwoKTsKKyAgICAgICAgICAgIHZhbHVlID0gYXhPYmplY3QtPm91dGVySFRNTCgpLmlzb2xh dGVkQ29weSgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQogCiAgICAgICAgIC8vIENhY2hlIHZhbHVlIHNvIHRoYXQg dGhlcmUgaXMgbm8gbmVlZCB0byBhY2Nlc3MgdGhlIG1haW4gdGhyZWFkIGluIHN1YnNlcXVlbnQg Y2FsbHMuCi0gICAgICAgIHNldFByb3BlcnR5KHByb3BlcnR5TmFtZSwgdmFsdWUuaXNvbGF0ZWRD b3B5KCkpOworICAgICAgICBzZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsIFdURk1vdmUodmFsdWUp KTsKICAgICB9KTsKIAotICAgIHJldHVybiBzdHJpbmdBdHRyaWJ1dGVWYWx1ZShwcm9wZXJ0eU5h bWUpOworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOwor ICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHZhbHVlLAorICAgICAgICBbXSAoVCYgdHlwZWRWYWx1 ZSkgLT4gVCB7IHJldHVybiB0eXBlZFZhbHVlOyB9LAorICAgICAgICBbXSAoYXV0byYpIHsgcmV0 dXJuIFQoKTsgfQorICAgICk7CiB9CiAKIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6ZmlsbENoaWxk cmVuVmVjdG9yRm9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBBY2Nlc3Np YmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGNoaWxkcmVuKSBjb25zdApAQCAtMjQ3MywxMiArMjQ4MSwx MiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldElzSWdub3JlZEZyb21QYXJlbnREYXRhRm9y Q2hpbGQoQVhDb3JlT2JqZWN0KikKIAogU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OmlubmVySFRN TCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbnN0X2Nhc3Q8QVhJc29sYXRlZE9iamVjdCo+KHRo aXMpLT5nZXRPclJldHJpZXZlU3RyaW5nUHJvcGVydHlWYWx1ZShBWFByb3BlcnR5TmFtZTo6SW5u ZXJIVE1MKTsKKyAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcykt PmdldE9yUmV0cmlldmVQcm9wZXJ0eVZhbHVlPFN0cmluZz4oQVhQcm9wZXJ0eU5hbWU6OklubmVy SFRNTCk7CiB9CiAKIFN0cmluZyBBWElzb2xhdGVkT2JqZWN0OjpvdXRlckhUTUwoKSBjb25zdAog ewotICAgIHJldHVybiBjb25zdF9jYXN0PEFYSXNvbGF0ZWRPYmplY3QqPih0aGlzKS0+Z2V0T3JS ZXRyaWV2ZVN0cmluZ1Byb3BlcnR5VmFsdWUoQVhQcm9wZXJ0eU5hbWU6Ok91dGVySFRNTCk7Cisg ICAgcmV0dXJuIGNvbnN0X2Nhc3Q8QVhJc29sYXRlZE9iamVjdCo+KHRoaXMpLT5nZXRPclJldHJp ZXZlUHJvcGVydHlWYWx1ZTxTdHJpbmc+KEFYUHJvcGVydHlOYW1lOjpPdXRlckhUTUwpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKaW5kZXggMjZk NTAzNzhhZDBhOWM5NDM1YmY4YTYzMzZiZmI1Zjc0ZGE4YzY5Zi4uM2Q3ZDAyNzUzYWQyZDNhY2Ey YTcyNWEyM2ZjNGU3MTlkODU0NGI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaApAQCAtMTAx LDcgKzEwMSw3IEBAIHByaXZhdGU6CiAgICAgLy8gVGhlIGZvbGxvd2luZyBtZXRob2QgcGVyZm9y bXMgYSBsYXp5IGNhY2hpbmcgb2YgdGhlIGdpdmVuIHByb3BlcnR5LgogICAgIC8vIElmIHRoZSBw cm9wZXJ0eSBpcyBhbHJlYWR5IGluIG1fcHJvcGVydHlNYXAsIHJldHVybnMgdGhlIGV4aXN0aW5n IHZhbHVlLgogICAgIC8vIElmIG5vdCwgcmV0cmlldmVzIHRoZSBwcm9wZXJ0eSBmcm9tIHRoZSBt YWluIHRocmVhZCBhbmQgY2FjaGUgaXQgZm9yIGxhdGVyIHVzZS4KLSAgICBTdHJpbmcgZ2V0T3JS ZXRyaWV2ZVN0cmluZ1Byb3BlcnR5VmFsdWUoQVhQcm9wZXJ0eU5hbWUpOworICAgIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IFQgZ2V0T3JSZXRyaWV2ZVByb3BlcnR5VmFsdWUoQVhQcm9wZXJ0eU5hbWUp OwogCiAgICAgdm9pZCBmaWxsQ2hpbGRyZW5WZWN0b3JGb3JQcm9wZXJ0eShBWFByb3BlcnR5TmFt ZSwgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJikgY29uc3Q7CiAgICAgdm9pZCBzZXRNYXRo c2NyaXB0cyhBWFByb3BlcnR5TmFtZSwgQVhDb3JlT2JqZWN0Jik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9tYWMvQVhJc29sYXRlZE9iamVj dE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9B WElzb2xhdGVkT2JqZWN0TWFjLm1tCmluZGV4IDNjODViODBlZTNhODA1YmVlODViNTA0NDQ5OGNi MjUxYTQyZjhlYmUuLmJlYmFmNjE1ZmU2MGZkODQxNzdmYjZhNDMzYjBkMGY0YmViZTVlZTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9B WElzb2xhdGVkT2JqZWN0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL21hYy9BWElzb2xhdGVkT2JqZWN0TWFjLm1tCkBAIC0xMDAsMTIgKzEwMCwx MiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldFByZXZlbnRLZXlib2FyZERPTUV2ZW50RGlz cGF0Y2goYm9vbCB2YWx1ZSkKIAogU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OmRlc2NyaXB0aW9u QXR0cmlidXRlVmFsdWUoKSBjb25zdAogewotICAgIHJldHVybiBjb25zdF9jYXN0PEFYSXNvbGF0 ZWRPYmplY3QqPih0aGlzKS0+Z2V0T3JSZXRyaWV2ZVN0cmluZ1Byb3BlcnR5VmFsdWUoQVhQcm9w ZXJ0eU5hbWU6OkRlc2NyaXB0aW9uKTsKKyAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xhdGVk T2JqZWN0Kj4odGhpcyktPmdldE9yUmV0cmlldmVQcm9wZXJ0eVZhbHVlPFN0cmluZz4oQVhQcm9w ZXJ0eU5hbWU6OkRlc2NyaXB0aW9uKTsKIH0KIAogU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OnRp dGxlQXR0cmlidXRlVmFsdWUoKSBjb25zdAogewotICAgIHJldHVybiBjb25zdF9jYXN0PEFYSXNv bGF0ZWRPYmplY3QqPih0aGlzKS0+Z2V0T3JSZXRyaWV2ZVN0cmluZ1Byb3BlcnR5VmFsdWUoQVhQ cm9wZXJ0eU5hbWU6OlRpdGxlQXR0cmlidXRlVmFsdWUpOworICAgIHJldHVybiBjb25zdF9jYXN0 PEFYSXNvbGF0ZWRPYmplY3QqPih0aGlzKS0+Z2V0T3JSZXRyaWV2ZVByb3BlcnR5VmFsdWU8U3Ry aW5nPihBWFByb3BlcnR5TmFtZTo6VGl0bGVBdHRyaWJ1dGVWYWx1ZSk7CiB9CiAKIH0gLy8gV2Vi Q29yZQo= 451294 2022-02-08 12:28:10 -0800 2022-02-08 14:15:32 -0800 Patch bug-236276-20220208152809.patch text/plain 8787 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDU4ZjRlYTJkNzY2ZDJl NGZiNmMzMWM3NjdjN2YyODcxYTA4Y2EyOS4uNTBkMzM0MGZjMGQ3ODQzZjY5Yjg0ODdlZDdkMDFl OGFlNTUxMmY4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAyLTA4ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbml0aWFsaXpl IHRoZSBBWElzb2xhdGVkT2JqZWN0IEFjY2Vzc2liaWxpdHlUZXh0IHByb3BlcnR5IGxhemlseS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjI3Ngor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg2MDQ0NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgQ29tcHV0YXRpb24gb2YgdGhlIEFjY2Vzc2liaWxp dHl0VGV4dCBwcm9wZXJ0eSBtYXkgYmUgdmVyeSBleHBlbnNpdmUgYW5kCisgICAgICAgIGlmIHBl cmZvcm1lZCBkdXJpbmcgdGhlIGNyZWF0aW9uIG9mIElzb2xhdGVkT2JqZWN0cyBtYXkgY2F1c2Ug Y3Jhc2hlcworICAgICAgICBzaW5jZSBpdCBtYXkgaW52b2tlIHRleHRVbmRlckVsZW1lbnQgd2hp bGUgcGFnZSBsYXlvdXQgaXMgaW4gcHJvZ3Jlc3MuCisgICAgICAgIEZvciB0aGVzZSByZWFzb25z LCB3ZSBhcmUgY29tcHV0aW5nIGFuZCBjYWNoaW5nIHRoaXMgcHJvcGVydHkgb24gZmlyc3QKKyAg ICAgICAgcmVxdWVzdC4KKyAgICAgICAgVGhpcyBwYXRjaCBpcyBhIHNlcXVlbCB0byBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MTE1LgorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjphY2Nlc3NpYmlsaXR5VGV4dCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpnZXRPclJldHJpZXZlUHJvcGVy dHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbm5lckhUTUwg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6b3V0ZXJIVE1MIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmdldE9yUmV0cmlldmVT dHJpbmdQcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgUmVwbGFjZWQgYnkgZ2V0T3JSZXRyaWV2ZVBy b3BlcnR5VmFsdWU8U3RyaW5nPi4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkT2JqZWN0OjpkZXNjcmlwdGlvbkF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnRpdGxlQXR0cmlidXRlVmFsdWUgY29uc3QpOgorCiAy MDIyLTAyLTA4ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CiAKICAgICAg ICAgUmV0dXJuICdub25lJyBmb3IgdGhlIGNvbXB1dGVkIHN0eWxlIG9mIG1hc2sgd2hlbiB0aGVy ZSBhcmUgbm8gbWFzayBpbWFnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggYmQw NGM5ZTIzMWE1ODg0ZTRmZDdjNDQ4OGQ2ODA1N2YyNTUxOTE2OC4uMmQ5NjczOTU1ZWJiNzUyNTY3 YTMyOWNkNGM0NjVkNDc2ZGRiNWE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAg LTM0NCwxNiArMzQ0LDYgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmli dXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wgaXMKICAgICBvYmplY3QuYXJp YU93bnNFbGVtZW50cyhhcmlhT3duc0VsZW1lbnRzKTsKICAgICBzZXRPYmplY3RWZWN0b3JQcm9w ZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQU93bnNFbGVtZW50cywgYXJpYU93bnNFbGVtZW50cyk7 CiAKLSAgICBWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+IHRleHRzOwotICAgIG9iamVjdC5hY2Nl c3NpYmlsaXR5VGV4dCh0ZXh0cyk7Ci0gICAgVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiBpc29s YXRlZFRleHRzOwotICAgIGlzb2xhdGVkVGV4dHMucmVzZXJ2ZUNhcGFjaXR5KHRleHRzLnNpemUo KSk7Ci0gICAgZm9yIChjb25zdCBhdXRvJiB0ZXh0IDogdGV4dHMpIHsKLSAgICAgICAgQWNjZXNz aWJpbGl0eVRleHQgaXNvbGF0ZWRUZXh0KHRleHQudGV4dC5pc29sYXRlZENvcHkoKSwgdGV4dC50 ZXh0U291cmNlKTsKLSAgICAgICAgaXNvbGF0ZWRUZXh0cy51bmNoZWNrZWRBcHBlbmQoaXNvbGF0 ZWRUZXh0KTsKLSAgICB9Ci0gICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2li aWxpdHlUZXh0LCBpc29sYXRlZFRleHRzKTsKLQogICAgIC8vIFNwaW4gYnV0dG9uIHN1cHBvcnQu CiAgICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkRlY3JlbWVudEJ1dHRvbiwg b2JqZWN0LmRlY3JlbWVudEJ1dHRvbigpKTsKICAgICBzZXRPYmplY3RQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6SW5jcmVtZW50QnV0dG9uLCBvYmplY3QuaW5jcmVtZW50QnV0dG9uKCkpOwpAQCAt NjA2LDcgKzU5Niw3IEBAIEFYQ29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6Y2VsbEZvckNv bHVtbkFuZFJvdyh1bnNpZ25lZCBjb2x1bW5JbmRleCwgdW5zaWduCiAKIHZvaWQgQVhJc29sYXRl ZE9iamVjdDo6YWNjZXNzaWJpbGl0eVRleHQoVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiYgdGV4 dHMpIGNvbnN0CiB7Ci0gICAgdGV4dHMgPSB2ZWN0b3JBdHRyaWJ1dGVWYWx1ZTxBY2Nlc3NpYmls aXR5VGV4dD4oQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlUZXh0KTsKKyAgICB0ZXh0cyA9 IGNvbnN0X2Nhc3Q8QVhJc29sYXRlZE9iamVjdCo+KHRoaXMpLT5nZXRPclJldHJpZXZlUHJvcGVy dHlWYWx1ZTxWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+PihBWFByb3BlcnR5TmFtZTo6QWNjZXNz aWJpbGl0eVRleHQpOwogfQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmNsYXNzTGlzdChWZWN0 b3I8U3RyaW5nPiYgbGlzdCkgY29uc3QKQEAgLTk3Nyw0MSArOTY3LDU4IEBAIGludCBBWElzb2xh dGVkT2JqZWN0OjppbnRBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUp IGNvbnN0CiAgICAgKTsKIH0KIAotU3RyaW5nIEFYSXNvbGF0ZWRPYmplY3Q6OmdldE9yUmV0cmll dmVTdHJpbmdQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKK3RlbXBs YXRlPHR5cGVuYW1lIFQ+CitUIEFYSXNvbGF0ZWRPYmplY3Q6OmdldE9yUmV0cmlldmVQcm9wZXJ0 eVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKIHsKKyAgICBhdXRvIHR5cGVkVmFs dWUgPSBbJnByb3BlcnR5TmFtZSwgdGhpc10gKCkgeworICAgICAgICBhdXRvIHZhbHVlID0gbV9w cm9wZXJ0eU1hcC5nZXQocHJvcGVydHlOYW1lKTsKKyAgICAgICAgcmV0dXJuIFdURjo6c3dpdGNo T24odmFsdWUsCisgICAgICAgICAgICBbXSAoVCYgdHlwZWRWYWx1ZSkgLT4gVCB7IHJldHVybiB0 eXBlZFZhbHVlOyB9LAorICAgICAgICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBUKCk7IH0KKyAg ICAgICAgKTsKKyAgICB9OworCiAgICAgaWYgKG1fcHJvcGVydHlNYXAuY29udGFpbnMocHJvcGVy dHlOYW1lKSkKLSAgICAgICAgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKHByb3BlcnR5TmFt ZSk7CisgICAgICAgIHJldHVybiB0eXBlZFZhbHVlKCk7CiAKICAgICBBY2Nlc3NpYmlsaXR5Ojpw ZXJmb3JtRnVuY3Rpb25Pbk1haW5UaHJlYWQoWyZwcm9wZXJ0eU5hbWUsIHRoaXNdICgpIHsKICAg ICAgICAgYXV0byogYXhPYmplY3QgPSBhc3NvY2lhdGVkQVhPYmplY3QoKTsKICAgICAgICAgaWYg KCFheE9iamVjdCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBTdHJpbmcgdmFsdWU7 CisgICAgICAgIEFYUHJvcGVydHlWYWx1ZVZhcmlhbnQgdmFsdWU7CiAgICAgICAgIHN3aXRjaCAo cHJvcGVydHlOYW1lKSB7CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgICAgIGNhc2UgQVhQcm9w ZXJ0eU5hbWU6OkRlc2NyaXB0aW9uOgotICAgICAgICAgICAgdmFsdWUgPSBheE9iamVjdC0+ZGVz Y3JpcHRpb25BdHRyaWJ1dGVWYWx1ZSgpOworICAgICAgICAgICAgdmFsdWUgPSBheE9iamVjdC0+ ZGVzY3JpcHRpb25BdHRyaWJ1dGVWYWx1ZSgpLmlzb2xhdGVkQ29weSgpOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgQVhQcm9wZXJ0eU5hbWU6OlRpdGxlQXR0cmlidXRlVmFsdWU6 Ci0gICAgICAgICAgICB2YWx1ZSA9IGF4T2JqZWN0LT50aXRsZUF0dHJpYnV0ZVZhbHVlKCk7Cisg ICAgICAgICAgICB2YWx1ZSA9IGF4T2JqZWN0LT50aXRsZUF0dHJpYnV0ZVZhbHVlKCkuaXNvbGF0 ZWRDb3B5KCk7CiAgICAgICAgICAgICBicmVhazsKICNlbmRpZgorICAgICAgICBjYXNlIEFYUHJv cGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5VGV4dDogeworICAgICAgICAgICAgVmVjdG9yPEFjY2Vz c2liaWxpdHlUZXh0PiB0ZXh0czsKKyAgICAgICAgICAgIGF4T2JqZWN0LT5hY2Nlc3NpYmlsaXR5 VGV4dCh0ZXh0cyk7CisgICAgICAgICAgICB2YWx1ZSA9IHRleHRzLm1hcChbXSAoY29uc3QgYXV0 byYgdGV4dCkgLT4gQWNjZXNzaWJpbGl0eVRleHQgeworICAgICAgICAgICAgICAgIHJldHVybiB7 IHRleHQudGV4dC5pc29sYXRlZENvcHkoKSwgdGV4dC50ZXh0U291cmNlIH07CisgICAgICAgICAg ICB9KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAgIGNhc2UgQVhQcm9w ZXJ0eU5hbWU6OklubmVySFRNTDoKLSAgICAgICAgICAgIHZhbHVlID0gYXhPYmplY3QtPmlubmVy SFRNTCgpOworICAgICAgICAgICAgdmFsdWUgPSBheE9iamVjdC0+aW5uZXJIVE1MKCkuaXNvbGF0 ZWRDb3B5KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBWFByb3BlcnR5TmFt ZTo6T3V0ZXJIVE1MOgotICAgICAgICAgICAgdmFsdWUgPSBheE9iamVjdC0+b3V0ZXJIVE1MKCk7 CisgICAgICAgICAgICB2YWx1ZSA9IGF4T2JqZWN0LT5vdXRlckhUTUwoKS5pc29sYXRlZENvcHko KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBDYWNoZSB2YWx1ZSBzbyB0aGF0IHRoZXJlIGlz IG5vIG5lZWQgdG8gYWNjZXNzIHRoZSBtYWluIHRocmVhZCBpbiBzdWJzZXF1ZW50IGNhbGxzLgot ICAgICAgICBzZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsIHZhbHVlLmlzb2xhdGVkQ29weSgpKTsK KyAgICAgICAgc2V0UHJvcGVydHkocHJvcGVydHlOYW1lLCBXVEZNb3ZlKHZhbHVlKSk7CiAgICAg fSk7CiAKLSAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUocHJvcGVydHlOYW1lKTsKKyAg ICByZXR1cm4gdHlwZWRWYWx1ZSgpOwogfQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmZpbGxD aGlsZHJlblZlY3RvckZvclByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGlsZHJlbikgY29uc3QKQEAgLTI0NzUsMTIgKzI0 ODIsMTIgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpzZXRJc0lnbm9yZWRGcm9tUGFyZW50RGF0 YUZvckNoaWxkKEFYQ29yZU9iamVjdCopCiAKIFN0cmluZyBBWElzb2xhdGVkT2JqZWN0Ojppbm5l ckhUTUwoKSBjb25zdAogewotICAgIHJldHVybiBjb25zdF9jYXN0PEFYSXNvbGF0ZWRPYmplY3Qq Pih0aGlzKS0+Z2V0T3JSZXRyaWV2ZVN0cmluZ1Byb3BlcnR5VmFsdWUoQVhQcm9wZXJ0eU5hbWU6 OklubmVySFRNTCk7CisgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8QVhJc29sYXRlZE9iamVjdCo+KHRo aXMpLT5nZXRPclJldHJpZXZlUHJvcGVydHlWYWx1ZTxTdHJpbmc+KEFYUHJvcGVydHlOYW1lOjpJ bm5lckhUTUwpOwogfQogCiBTdHJpbmcgQVhJc29sYXRlZE9iamVjdDo6b3V0ZXJIVE1MKCkgY29u c3QKIHsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcyktPmdl dE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlOYW1lOjpPdXRlckhUTUwp OworICAgIHJldHVybiBjb25zdF9jYXN0PEFYSXNvbGF0ZWRPYmplY3QqPih0aGlzKS0+Z2V0T3JS ZXRyaWV2ZVByb3BlcnR5VmFsdWU8U3RyaW5nPihBWFByb3BlcnR5TmFtZTo6T3V0ZXJIVE1MKTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4 IDI2ZDUwMzc4YWQwYTljOTQzNWJmOGE2MzM2YmZiNWY3NGRhOGM2OWYuLjNkN2QwMjc1M2FkMmQz YWNhMmE3MjVhMjNmYzRlNzE5ZDg1NDRiOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAg LTEwMSw3ICsxMDEsNyBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBmb2xsb3dpbmcgbWV0aG9kIHBl cmZvcm1zIGEgbGF6eSBjYWNoaW5nIG9mIHRoZSBnaXZlbiBwcm9wZXJ0eS4KICAgICAvLyBJZiB0 aGUgcHJvcGVydHkgaXMgYWxyZWFkeSBpbiBtX3Byb3BlcnR5TWFwLCByZXR1cm5zIHRoZSBleGlz dGluZyB2YWx1ZS4KICAgICAvLyBJZiBub3QsIHJldHJpZXZlcyB0aGUgcHJvcGVydHkgZnJvbSB0 aGUgbWFpbiB0aHJlYWQgYW5kIGNhY2hlIGl0IGZvciBsYXRlciB1c2UuCi0gICAgU3RyaW5nIGdl dE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlOYW1lKTsKKyAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBUPiBUIGdldE9yUmV0cmlldmVQcm9wZXJ0eVZhbHVlKEFYUHJvcGVydHlO YW1lKTsKIAogICAgIHZvaWQgZmlsbENoaWxkcmVuVmVjdG9yRm9yUHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWUsIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpIGNvbnN0OwogICAgIHZvaWQgc2V0 TWF0aHNjcmlwdHMoQVhQcm9wZXJ0eU5hbWUsIEFYQ29yZU9iamVjdCYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRP YmplY3RNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9t YWMvQVhJc29sYXRlZE9iamVjdE1hYy5tbQppbmRleCA4ODE3YzgzYTc4MzcwODYzOTIyZjZlZDI3 YTQzYmJhMDk1MmVjMjA4Li5iYjgyM2VkZDJjZTQ5MTllZmJmZTUxMGRkMmRmZGNlOGIyYWI0ODk3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9t YWMvQVhJc29sYXRlZE9iamVjdE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9tYWMvQVhJc29sYXRlZE9iamVjdE1hYy5tbQpAQCAtMTA1LDEyICsx MDUsMTIgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpzZXRQcmV2ZW50S2V5Ym9hcmRET01FdmVu dERpc3BhdGNoKGJvb2wgdmFsdWUpCiAKIFN0cmluZyBBWElzb2xhdGVkT2JqZWN0OjpkZXNjcmlw dGlvbkF0dHJpYnV0ZVZhbHVlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxBWElz b2xhdGVkT2JqZWN0Kj4odGhpcyktPmdldE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0eVZhbHVlKEFY UHJvcGVydHlOYW1lOjpEZXNjcmlwdGlvbik7CisgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8QVhJc29s YXRlZE9iamVjdCo+KHRoaXMpLT5nZXRPclJldHJpZXZlUHJvcGVydHlWYWx1ZTxTdHJpbmc+KEFY UHJvcGVydHlOYW1lOjpEZXNjcmlwdGlvbik7CiB9CiAKIFN0cmluZyBBWElzb2xhdGVkT2JqZWN0 Ojp0aXRsZUF0dHJpYnV0ZVZhbHVlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxB WElzb2xhdGVkT2JqZWN0Kj4odGhpcyktPmdldE9yUmV0cmlldmVTdHJpbmdQcm9wZXJ0eVZhbHVl KEFYUHJvcGVydHlOYW1lOjpUaXRsZUF0dHJpYnV0ZVZhbHVlKTsKKyAgICByZXR1cm4gY29uc3Rf Y2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcyktPmdldE9yUmV0cmlldmVQcm9wZXJ0eVZhbHVl PFN0cmluZz4oQVhQcm9wZXJ0eU5hbWU6OlRpdGxlQXR0cmlidXRlVmFsdWUpOwogfQogCiB9IC8v IFdlYkNvcmUK