232711 2021-11-04 06:48:28 -0700 AX: rename actionVerb() as localizedActionVerb() 2021-11-05 01:23:49 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 230253 1 cgarcia webkit-unassigned aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1811842 0 cgarcia 2021-11-04 06:48:28 -0700 Since it's returning the localized name. In ATSPI there are two methods in the action interface GetName and GetLocalizedName so we need both. 1811843 1 webkit-bug-importer 2021-11-04 06:48:42 -0700 <rdar://problem/85015496> 1811845 2 443301 cgarcia 2021-11-04 06:51:08 -0700 Created attachment 443301 Patch 1811850 3 andresg_22 2021-11-04 07:16:00 -0700 (In reply to Carlos Garcia Campos from comment #2) > Created attachment 443301 [details] > Patch --- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp +++ a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp -String AccessibilityRenderObject::actionVerb() const ... So this was duplicated in the subclass? Thanks for cleaning that up! 1811851 4 cgarcia 2021-11-04 07:21:47 -0700 (In reply to Andres Gonzalez from comment #3) > (In reply to Carlos Garcia Campos from comment #2) > > Created attachment 443301 [details] > > Patch > > --- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp > +++ a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp > > -String AccessibilityRenderObject::actionVerb() const > ... > > So this was duplicated in the subclass? Thanks for cleaning that up! Yes, almost duplicated, the base class handles menu actions too. 1812089 5 cgarcia 2021-11-05 01:23:49 -0700 Committed r285340 (243901@main): <https://commits.webkit.org/243901@main> 443301 2021-11-04 06:51:08 -0700 2021-11-04 07:21:57 -0700 Patch wcore-ax-action-name.diff text/plain 13344 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5OTBlOTljMzViM2QuLjA3OTI5NWJlMjEzNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMzIEBACisyMDIxLTExLTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBBWDogcmVuYW1lIGFjdGlvblZlcmIoKSBhcyBsb2NhbGl6 ZWRBY3Rpb25WZXJiKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjcxMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODUwMTU0OTY+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgaXQncyByZXR1 cm5pbmcgdGhlIGxvY2FsaXplZCBuYW1lLiBJbiBBVFNQSSB0aGVyZSBhcmUgdHdvIG1ldGhvZHMg aW4gdGhlIGFjdGlvbiBpbnRlcmZhY2UgR2V0TmFtZSBhbmQKKyAgICAgICAgR2V0TG9jYWxpemVk TmFtZSwgc28gdGhpcyBwYXRjaCBhbHNvIGFkZHMgYWN0aW9uVmVyYigpIHJldHVybmluZyB0aGUg dW5sb2NhbGl6ZWQgYWN0aW9uIG5hbWUuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVj dDo6bG9jYWxpemVkQWN0aW9uVmVyYiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5T2JqZWN0OjphY3Rpb25WZXJiIGNvbnN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlP YmplY3Q6OmxvY2FsaXplZEFjdGlvblZlcmIgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0YWJDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY3Rpb25WZXJiIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSHlwZXJsaW5rLmNwcDoKKyAg ICAgICAgKHdlYmtpdEFjY2Vzc2libGVIeXBlcmxpbmtBY3Rpb25HZXROYW1lKToKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlQWN0aW9uLmNwcDoK KyAgICAgICAgKHdlYmtpdEFjY2Vzc2libGVBY3Rpb25HZXROYW1lKToKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKToKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0Lmg6CisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKwogMjAy MS0xMS0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bYTExeV0gQWRkIGltcGxlbWVudGF0aW9uIG9mIGh5cGVydGV4dCBpbnRlcmZh Y2Ugd2hlbiBidWlsZGluZyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCAxMzJlZmJjZmZjNDQuLjI3 NmQ5MWExMzhiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xODAwLDcgKzE4MDAsNyBAQCBjb25zdCBTdHJpbmcg QWNjZXNzaWJpbGl0eU9iamVjdDo6ZGVmYXVsdExpdmVSZWdpb25TdGF0dXNGb3JSb2xlKEFjY2Vz c2liaWxpdHlSbwogfQogICAgIAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZKQotU3RyaW5nIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFjdGlvblZlcmIoKSBjb25zdAorU3RyaW5nIEFjY2Vzc2liaWxp dHlPYmplY3Q6OmxvY2FsaXplZEFjdGlvblZlcmIoKSBjb25zdAogewogI2lmICFQTEFURk9STShJ T1NfRkFNSUxZKQogICAgIC8vIEZJWE1FOiBOZWVkIHRvIGFkZCB2ZXJicyBmb3Igc2VsZWN0IGVs ZW1lbnRzLgpAQCAtMTg0Miw2ICsxODQyLDM2IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjphY3Rpb25WZXJiKCkgY29uc3QKICAgICByZXR1cm4gbnVsbEF0b20oKTsKICNlbmRpZgogfQor CitTdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdDo6YWN0aW9uVmVyYigpIGNvbnN0Cit7CisjaWYg IVBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLy8gRklYTUU6IE5lZWQgdG8gYWRkIHZlcmJzIGZv ciBzZWxlY3QgZWxlbWVudHMuCisgICAgc3dpdGNoIChyb2xlVmFsdWUoKSkgeworICAgIGNhc2Ug QWNjZXNzaWJpbGl0eVJvbGU6OkJ1dHRvbjoKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpU b2dnbGVCdXR0b246CisgICAgICAgIHJldHVybiAicHJlc3MiX3M7CisgICAgY2FzZSBBY2Nlc3Np YmlsaXR5Um9sZTo6VGV4dEZpZWxkOgorICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6OlRleHRB cmVhOgorICAgICAgICByZXR1cm4gImFjdGl2YXRlIl9zOworICAgIGNhc2UgQWNjZXNzaWJpbGl0 eVJvbGU6OlJhZGlvQnV0dG9uOgorICAgICAgICByZXR1cm4gInNlbGVjdCJfczsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlSb2xlOjpDaGVja0JveDoKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xl OjpTd2l0Y2g6CisgICAgICAgIHJldHVybiBpc0NoZWNrZWQoKSA/ICJ1bmNoZWNrIl9zIDogImNo ZWNrIl9zOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6Okxpbms6CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5Um9sZTo6V2ViQ29yZUxpbms6CisgICAgICAgIHJldHVybiAianVtcCJfczsKKyAg ICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpQb3BVcEJ1dHRvbjoKKyAgICBjYXNlIEFjY2Vzc2li aWxpdHlSb2xlOjpNZW51TGlzdFBvcHVwOgorICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6Okxp c3RJdGVtOgorICAgICAgICByZXR1cm4gInNlbGVjdCJfczsKKyAgICBkZWZhdWx0OgorICAgICAg ICBicmVhazsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4geyB9OworfQogI2VuZGlmCiAKIGJv b2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJpYUlzTXVsdGlsaW5lKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXgg NGMwNmU2YmI2ZjViLi5kNTYzODE3Yjg0ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCkBAIC00NDEsNiArNDQxLDcgQEAgcHVi bGljOgogICAgIFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gVmlzaWJsZVNlbGVjdGlvbigpOyB9CiAgICAgU3RyaW5nIHNlbGVjdGVkVGV4dCgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgU3RyaW5nIGFjY2Vzc0tleSgp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG51bGxBdG9tKCk7IH0KKyAgICBTdHJpbmcgbG9jYWxp emVkQWN0aW9uVmVyYigpIGNvbnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyBhY3Rpb25WZXJiKCkg Y29uc3Qgb3ZlcnJpZGU7CiAKICAgICBib29sIGlzV2lkZ2V0KCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gZmFsc2U7IH0KQEAgLTgyNyw2ICs4MjgsNyBAQCBwcml2YXRlOgogCiAjaWYgIUVOQUJM RShBQ0NFU1NJQklMSVRZKQogaW5saW5lIGNvbnN0IEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vz c2liaWxpdHlDaGlsZHJlblZlY3RvciYgQWNjZXNzaWJpbGl0eU9iamVjdDo6Y2hpbGRyZW4oYm9v bCkgeyByZXR1cm4gbV9jaGlsZHJlbjsgfQoraW5saW5lIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2Jq ZWN0Ojpsb2NhbGl6ZWRBY3Rpb25WZXJiKCkgY29uc3QgeyByZXR1cm4gZW1wdHlTdHJpbmcoKTsg fQogaW5saW5lIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY3Rpb25WZXJiKCkgY29uc3Qg eyByZXR1cm4gZW1wdHlTdHJpbmcoKTsgfQogaW5saW5lIGludCBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpsaW5lRm9yUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uJikgY29uc3QgeyByZXR1cm4g LTE7IH0KIGlubGluZSB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnVwZGF0ZUJhY2tpbmdTdG9y ZSgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAppbmRleCBlODIxNjgxNDg3OWYuLjY5MjdmODRm MGU5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTExODksNiArMTE4OSw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgU3RyaW5nIHNlbGVjdGVkVGV4dCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFs IFN0cmluZyBhY2Nlc3NLZXkoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCBTdHJpbmcgbG9jYWxp emVkQWN0aW9uVmVyYigpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFN0cmluZyBhY3Rpb25WZXJi KCkgY29uc3QgPSAwOwogCiAgICAgLy8gV2lkZ2V0IHN1cHBvcnQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cAppbmRleCAyNGFjMDE1NGVkZWUuLjI4ZWI5OWVhMGRlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CkBAIC0zNzI4LDQwICszNzI4LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0 YWJDaGlsZHJlbihBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIHJlc3VsdCkKICAgICAgICAg ICAgIHJlc3VsdC5hcHBlbmQoY2hpbGQpOwogICAgIH0KIH0KLSAgICAKLVN0cmluZyBBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjphY3Rpb25WZXJiKCkgY29uc3QKLXsKLSNpZiAhUExBVEZPUk0o SU9TX0ZBTUlMWSkKLSAgICAvLyBGSVhNRTogTmVlZCB0byBhZGQgdmVyYnMgZm9yIHNlbGVjdCBl bGVtZW50cy4KLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBidXR0b25B Y3Rpb24oQVhCdXR0b25BY3Rpb25WZXJiKCkpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxj b25zdCBTdHJpbmc+IHRleHRGaWVsZEFjdGlvbihBWFRleHRGaWVsZEFjdGlvblZlcmIoKSk7Ci0g ICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gcmFkaW9CdXR0b25BY3Rpb24o QVhSYWRpb0J1dHRvbkFjdGlvblZlcmIoKSk7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNv bnN0IFN0cmluZz4gY2hlY2tlZENoZWNrQm94QWN0aW9uKEFYVW5jaGVja2VkQ2hlY2tCb3hBY3Rp b25WZXJiKCkpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IHVuY2hl Y2tlZENoZWNrQm94QWN0aW9uKEFYVW5jaGVja2VkQ2hlY2tCb3hBY3Rpb25WZXJiKCkpOwotICAg IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGxpbmtBY3Rpb24oQVhMaW5rQWN0 aW9uVmVyYigpKTsKIAotICAgIHN3aXRjaCAocm9sZVZhbHVlKCkpIHsKLSAgICBjYXNlIEFjY2Vz c2liaWxpdHlSb2xlOjpCdXR0b246Ci0gICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6VG9nZ2xl QnV0dG9uOgotICAgICAgICByZXR1cm4gYnV0dG9uQWN0aW9uOwotICAgIGNhc2UgQWNjZXNzaWJp bGl0eVJvbGU6OlRleHRGaWVsZDoKLSAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpUZXh0QXJl YToKLSAgICAgICAgcmV0dXJuIHRleHRGaWVsZEFjdGlvbjsKLSAgICBjYXNlIEFjY2Vzc2liaWxp dHlSb2xlOjpSYWRpb0J1dHRvbjoKLSAgICAgICAgcmV0dXJuIHJhZGlvQnV0dG9uQWN0aW9uOwot ICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6OkNoZWNrQm94OgotICAgICAgICByZXR1cm4gaXND aGVja2VkKCkgPyBjaGVja2VkQ2hlY2tCb3hBY3Rpb24gOiB1bmNoZWNrZWRDaGVja0JveEFjdGlv bjsKLSAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpMaW5rOgotICAgIGNhc2UgQWNjZXNzaWJp bGl0eVJvbGU6OldlYkNvcmVMaW5rOgotICAgICAgICByZXR1cm4gbGlua0FjdGlvbjsKLSAgICBk ZWZhdWx0OgotICAgICAgICByZXR1cm4gbnVsbEF0b20oKTsKLSAgICB9Ci0jZWxzZQotICAgIHJl dHVybiBudWxsQXRvbSgpOwotI2VuZGlmCi19Ci0gICAgCiB2b2lkIEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OnNldEFjY2Vzc2libGVOYW1lKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUpCiB7CiAg ICAgLy8gU2V0dGluZyB0aGUgYWNjZXNzaWJsZSBuYW1lIGNhbiBzdG9yZSB0aGUgdmFsdWUgaW4g dGhlIERPTQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuaAppbmRleCBjOWQzMDYyNjE1Y2IuLjdiOTRiNjM0MWE4OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmgKQEAgLTEzNCw3ICsxMzQsNiBAQCBwdWJsaWM6CiAgICAgaW50IHRl eHRMZW5ndGgoKSBjb25zdCBvdmVycmlkZTsKICAgICBTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29u c3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIGFjY2Vzc0tleSgpIGNvbnN0IG92ZXJyaWRlOwotICAg IFN0cmluZyBhY3Rpb25WZXJiKCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICBib29sIGlzV2lkZ2V0 KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgV2lkZ2V0KiB3aWRnZXQoKSBjb25zdCBvdmVycmlkZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vz c2libGVIeXBlcmxpbmsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2Vi S2l0QWNjZXNzaWJsZUh5cGVybGluay5jcHAKaW5kZXggYzQwZjcyYzJjOTczLi44ZGRlNjI0ZGYw YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFj Y2Vzc2libGVIeXBlcmxpbmsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv YXRrL1dlYktpdEFjY2Vzc2libGVIeXBlcmxpbmsuY3BwCkBAIC0xMTEsNyArMTExLDcgQEAgc3Rh dGljIGNvbnN0IGdjaGFyKiB3ZWJraXRBY2Nlc3NpYmxlSHlwZXJsaW5rQWN0aW9uR2V0TmFtZShB dGtBY3Rpb24qIGFjdGlvbiwgZ2kKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBhdXRv JiBjb3JlT2JqZWN0ID0gd2Via2l0QWNjZXNzaWJsZUdldEFjY2Vzc2liaWxpdHlPYmplY3QoYWNj ZXNzaWJsZUh5cGVybGluay0+cHJpdi0+aHlwZXJsaW5rSW1wbCk7Ci0gICAgYWNjZXNzaWJsZUh5 cGVybGluay0+cHJpdi0+YWN0aW9uTmFtZSA9IGNvcmVPYmplY3QuYWN0aW9uVmVyYigpLnV0Zjgo KTsKKyAgICBhY2Nlc3NpYmxlSHlwZXJsaW5rLT5wcml2LT5hY3Rpb25OYW1lID0gY29yZU9iamVj dC5sb2NhbGl6ZWRBY3Rpb25WZXJiKCkudXRmOCgpOwogICAgIHJldHVybiBhY2Nlc3NpYmxlSHlw ZXJsaW5rLT5wcml2LT5hY3Rpb25OYW1lLmRhdGEoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUFjdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxl SW50ZXJmYWNlQWN0aW9uLmNwcAppbmRleCAxNGViNTc5ODg2YTIuLjYzNmU1ODUwMTFhNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJs ZUludGVyZmFjZUFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9h dGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUFjdGlvbi5jcHAKQEAgLTkxLDcgKzkxLDcgQEAg c3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJraXRBY2Nlc3NpYmxlQWN0aW9uR2V0TmFtZShBdGtBY3Rp b24qIGFjdGlvbiwgZ2ludCkKICAgICBhdXRvKiBhY2Nlc3NpYmxlID0gV0VCS0lUX0FDQ0VTU0lC TEUoYWN0aW9uKTsKICAgICByZXR1cm5WYWxJZldlYktpdEFjY2Vzc2libGVJc0ludmFsaWQoYWNj ZXNzaWJsZSwgbnVsbHB0cik7CiAKLSAgICByZXR1cm4gd2Via2l0QWNjZXNzaWJsZUNhY2hlQW5k UmV0dXJuQXRrUHJvcGVydHkoYWNjZXNzaWJsZSwgQXRrQ2FjaGVkQWN0aW9uTmFtZSwgY29yZShh Y3Rpb24pLT5hY3Rpb25WZXJiKCkudXRmOCgpKTsKKyAgICByZXR1cm4gd2Via2l0QWNjZXNzaWJs ZUNhY2hlQW5kUmV0dXJuQXRrUHJvcGVydHkoYWNjZXNzaWJsZSwgQXRrQ2FjaGVkQWN0aW9uTmFt ZSwgY29yZShhY3Rpb24pLT5sb2NhbGl6ZWRBY3Rpb25WZXJiKCkudXRmOCgpKTsKIH0KIAogdm9p ZCB3ZWJraXRBY2Nlc3NpYmxlQWN0aW9uSW50ZXJmYWNlSW5pdChBdGtBY3Rpb25JZmFjZSogaWZh Y2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDczYWVmYWVjNzM0Yi4uNzU1ZDU5 YmQxOTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtMjAxLDYgKzIwMSw3IEBA IHZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEoQVhDb3JlT2Jq ZWN0JiBvYmplY3QsIGJvb2wgaXNSb290CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OlZhbHVlQXV0b2ZpbGxCdXR0b25UeXBlLCBzdGF0aWNfY2FzdDxpbnQ+KG9iamVjdC52YWx1ZUF1 dG9maWxsQnV0dG9uVHlwZSgpKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlVS TCwgb2JqZWN0LnVybCgpLmlzb2xhdGVkQ29weSgpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6QWNjZXNzS2V5LCBvYmplY3QuYWNjZXNzS2V5KCkuaXNvbGF0ZWRDb3B5KCkpOwor ICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpMb2NhbGl6ZWRBY3Rpb25WZXJiLCBvYmpl Y3QubG9jYWxpemVkQWN0aW9uVmVyYigpLmlzb2xhdGVkQ29weSgpKTsKICAgICBzZXRQcm9wZXJ0 eShBWFByb3BlcnR5TmFtZTo6QWN0aW9uVmVyYiwgb2JqZWN0LmFjdGlvblZlcmIoKS5pc29sYXRl ZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlJlYWRPbmx5VmFsdWUs IG9iamVjdC5yZWFkT25seVZhbHVlKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5 KEFYUHJvcGVydHlOYW1lOjpBdXRvQ29tcGxldGVWYWx1ZSwgb2JqZWN0LmF1dG9Db21wbGV0ZVZh bHVlKCkuaXNvbGF0ZWRDb3B5KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDRkN2Ji ODAzZTI0ZS4uMmYyNmJkM2IyMDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCkBAIC0yOTAs NiArMjkwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFyaWFUcmVlSXRlbUNvbnRlbnQoQWNjZXNz aWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjaGlsZHJlbikgb3ZlcnJpZGUgeyBmaWxsQ2hpbGRyZW5W ZWN0b3JGb3JQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVJdGVtQ29udGVudCwgY2hp bGRyZW4pOyB9CiAgICAgVVJMIHVybCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHVybEF0dHJp YnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpVUkwpOyB9CiAgICAgU3RyaW5nIGFjY2Vzc0tleSgp IGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlO YW1lOjpBY2Nlc3NLZXkpOyB9CisgICAgU3RyaW5nIGxvY2FsaXplZEFjdGlvblZlcmIoKSBjb25z dCBvdmVycmlkZSB7IHJldHVybiBzdHJpbmdBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6 TG9jYWxpemVkQWN0aW9uVmVyYik7IH0KICAgICBTdHJpbmcgYWN0aW9uVmVyYigpIGNvbnN0IG92 ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBY3Rp b25WZXJiKTsgfQogICAgIFN0cmluZyByZWFkT25seVZhbHVlKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OlJlYWRPbmx5VmFsdWUp OyB9CiAgICAgU3RyaW5nIGF1dG9Db21wbGV0ZVZhbHVlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkF1dG9Db21wbGV0ZVZhbHVl KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggYmY2Y2VhMTIzY2JmLi42MzBjYWYyOWQ2MGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMjM3LDYgKzIzNyw3IEBAIGVudW0gY2xhc3MgQVhQ cm9wZXJ0eU5hbWUgOiB1aW50MTZfdCB7CiAgICAgTGl2ZVJlZ2lvbkF0b21pYywKICAgICBMaXZl UmVnaW9uUmVsZXZhbnQsCiAgICAgTGl2ZVJlZ2lvblN0YXR1cywKKyAgICBMb2NhbGl6ZWRBY3Rp b25WZXJiLAogICAgIE1hdGhGZW5jZWRPcGVuU3RyaW5nLAogICAgIE1hdGhGZW5jZWRDbG9zZVN0 cmluZywKICAgICBNYXRoTGluZVRoaWNrbmVzcywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvd2luL0FjY2Vzc2libGVCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0Fj Y2Vzc2libGVCYXNlLmNwcAppbmRleCBlZDM3NzZiMGMwMWIuLmFjMDJmNTUyYTEwMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXRMZWdhY3kvd2luL0FjY2Vzc2libGVCYXNlLmNwcApAQCAtNzE3LDcgKzcxNyw3 IEBAIEhSRVNVTFQgQWNjZXNzaWJsZUJhc2U6OmdldF9hY2NEZWZhdWx0QWN0aW9uKFZBUklBTlQg dkNoaWxkLCBfX2RlcmVmX29wdF9vdXQgQlNUCiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAg IHJldHVybiBocjsKIAotICAgIGlmICgqYWN0aW9uID0gQlN0cmluZyhjaGlsZE9iai0+YWN0aW9u VmVyYigpKS5yZWxlYXNlKCkpCisgICAgaWYgKCphY3Rpb24gPSBCU3RyaW5nKGNoaWxkT2JqLT5s b2NhbGl6ZWRBY3Rpb25WZXJiKCkpLnJlbGVhc2UoKSkKICAgICAgICAgcmV0dXJuIFNfT0s7CiAg ICAgcmV0dXJuIFNfRkFMU0U7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggNDgy ZjdiMTczZDNlLi41MzMxOGJlNGUyMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv d2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAyMS0xMS0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CisKKyAgICAgICAgQVg6IHJlbmFtZSBhY3Rpb25WZXJiKCkgYXMgbG9jYWxp emVkQWN0aW9uVmVyYigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzI3MTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg1MDE1NDk2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQWNjZXNzaWJsZUJh c2UuY3BwOgorICAgICAgICAoQWNjZXNzaWJsZUJhc2U6OmdldF9hY2NEZWZhdWx0QWN0aW9uKTog VXNlIGxvY2FsaXplZEFjdGlvblZlcmIoKS4KKwogMjAyMS0xMC0xMSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERPTVRpbWVTdGFtcCBpcyBub3cgRXBvY2hUaW1l U3RhbXAK